[Sandev-cvs] sand/apps/basics/build/generate/org/sandev/generator/tags AbstractSandBaseTag.java, 1.1.1.1, 1.2 NodeTagCall.java, 1.3, 1.4 NodeTagSubscribe.java, 1.1.1.1, 1.2

[Eric P. <th...@us...>]

Update of /cvsroot/sandev/sand/apps/basics/build/generate/org/sandev/generator/tags
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv12478

Modified Files:
	AbstractSandBaseTag.java NodeTagCall.java 
	NodeTagSubscribe.java 
Log Message:
Removed call linkage to GeneratorCommon so the javadoc taglet processing
works.  The taglets can't reference that far.  See the comments in 
AbstractSandBaseTag.capitalize for details.


Index: NodeTagCall.java
===================================================================
RCS file: /cvsroot/sandev/sand/apps/basics/build/generate/org/sandev/generator/tags/NodeTagCall.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NodeTagCall.java	8 Aug 2006 18:52:01 -0000	1.3
--- NodeTagCall.java	7 Sep 2010 22:46:45 -0000	1.4
***************
*** 1,5 ****
  /* 
   * SAND development/deployment environment
!  * Copyright (C) 2003,2006  SAND Services Inc.
   * 
   * This library is free software; you can redistribute it and/or
--- 1,5 ----
  /* 
   * SAND development/deployment environment
!  * Copyright (C) 2003,2006,2010  SAND Services Inc.
   * 
   * This library is free software; you can redistribute it and/or
***************
*** 136,139 ****
--- 136,144 ----
       * for this tag.  If shortNames is true, then use the unqualified 
       * names of the message parameters. 
+      *
+      * Fragile javadoc calling through to here via toString can't handle
+      * the linkage to SandGeneratorException.  So don't bring in 
+      * GeneratorCommon into that call resolution chain.  Sorry for the
+      * ugly docs.
       */
      public String getCoreMethodSig(boolean shortNames) {
***************
*** 146,150 ****
          sb.append(" ");
          sb.append(CORENAME);
!         sb.append(GeneratorCommon.capitalize(getConfigParam()));
          sb.append("(");
          dotIndex=getOutboundMessage().lastIndexOf(".");
--- 151,155 ----
          sb.append(" ");
          sb.append(CORENAME);
!         sb.append(capitalize(getConfigParam()));
          sb.append("(");
          dotIndex=getOutboundMessage().lastIndexOf(".");
***************
*** 163,167 ****
       */
      public String getInstanceConfigParam() {
!         return "outgoingSync" + GeneratorCommon.capitalize(getConfigParam());
      }
  
--- 168,172 ----
       */
      public String getInstanceConfigParam() {
!         return "outgoingSync" + capitalize(getConfigParam());
      }
  

Index: AbstractSandBaseTag.java
===================================================================
RCS file: /cvsroot/sandev/sand/apps/basics/build/generate/org/sandev/generator/tags/AbstractSandBaseTag.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** AbstractSandBaseTag.java	30 Nov 2005 04:10:13 -0000	1.1.1.1
--- AbstractSandBaseTag.java	7 Sep 2010 22:46:45 -0000	1.2
***************
*** 138,141 ****
--- 138,162 ----
  
      /**
+      * Capitalize the first letter of the given string and return it.
+      * This is basically the same thing as GeneratorCommon.capitalize
+      * but it is cut and paste here to avoid some tempermental javadoc
+      * taglet linkage issues where using a call to GeneratorCommon
+      * results in SandGeneratorException not being found.  Basically
+      * the taglet interface is pretty weak and doesn't load all the
+      * supporting libraries.  It's not worth the effort to battle the
+      * javadoc taglet interface linkage just to get a couple of
+      * strings capitalized, so hence this method.
+      */
+     public static String capitalize(String str)
+     {
+         if((str==null)||(str.equals(""))) {
+             return str; }
+         if(str.length()==1) {
+             return str.toUpperCase(); }
+         return str.substring(0,1).toUpperCase() + str.substring(1);
+     }
+ 
+ 
+     /**
       * Given the <code>Tag</code> representation of this custom
       * tag, return its string representation.

Index: NodeTagSubscribe.java
===================================================================
RCS file: /cvsroot/sandev/sand/apps/basics/build/generate/org/sandev/generator/tags/NodeTagSubscribe.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** NodeTagSubscribe.java	30 Nov 2005 04:10:16 -0000	1.1.1.1
--- NodeTagSubscribe.java	7 Sep 2010 22:46:45 -0000	1.2
***************
*** 1,5 ****
  /* 
   * SAND development/deployment environment
!  * Copyright (C) 2003  SAND Services Inc.
   * 
   * This library is free software; you can redistribute it and/or
--- 1,5 ----
  /* 
   * SAND development/deployment environment
!  * Copyright (C) 2003,2010  SAND Services Inc.
   * 
   * This library is free software; you can redistribute it and/or
***************
*** 158,164 ****
       * Return the name of the NodeInstance data member which will hold
       * the messaging configuration for this declaration.
       */
      public String getInstanceConfigParam() {
!         return "incomingAsync" + GeneratorCommon.capitalize(getConfigParam());
      }
  
--- 158,169 ----
       * Return the name of the NodeInstance data member which will hold
       * the messaging configuration for this declaration.
+      *
+      * Fragile javadoc calling through to here via toString can't handle
+      * the linkage to SandGeneratorException.  So don't bring in 
+      * GeneratorCommon into that call resolution chain.  Sorry for the
+      * ugly docs.
       */
      public String getInstanceConfigParam() {
!         return "incomingAsync" + capitalize(getConfigParam());
      }