Changeset 150

Timestamp:

02/14/08 15:28:42 (6 months ago)

Author:

callan

Message:

Updating with Curtis' new template:

• Adds missing CData setters
  
• Fixes extraneous whitespace
  
• Signatures to access *Ref node types directly
  
• Fixes inconsistency between forward and back reference count method names
  

Files:

• Xml/xsd-fu/trunk/templates/Class.template (modified) (8 diffs)

Xml/xsd-fu/trunk/templates/Class.template

@@ -50 +50 @@
 {
         // -- Constructors --
-        
+
         /** Constructs a ${klass.name} node with an associated DOM element. */
         public ${klass.name}Node(Element element)
@@ -81 +81 @@
     {% when prop.isReference %}
         // Virtual, inferred back reference ${prop.name}
+        public int get${prop.javaType}Count()
+        {
+                return getReferringCount("${prop.javaType}");
+        }
+
         public List get${prop.javaType}List()
         {
                 return getReferringNodes("${prop.javaType}");
-        }
-        
-        public int count${prop.javaType}List()
-        {
-                return getReferringCount("${prop.javaType}");
         }
     {% end %}\
@@ -96 +96 @@
         public ${prop.javaType} get${prop.name}()
         {
-                return (${prop.javaType}) 
+                return (${prop.javaType})
                         getAttrReferencedNode("${prop.type[:-2]}", "${prop.name}");
         }
@@ -123 +123 @@
                 return getReferencedNodes("${prop.name[:-3]}", "${prop.name}");
         }
+
+        public Vector get${prop.name}List()
+        {
+                return getChildNodes("${prop.name}");
+        }
     {% end %}\
     {% when not prop.isAttribute and prop.maxOccurs > 1 %}
@@ -142 +147 @@
                 return get${prop.javaType}CData("${prop.name}");
         }
+
+        public void set${prop.name}(${prop.javaType} ${prop.javaArgumentName})
+        {
+                setCData("${prop.name}", ${prop.javaArgumentName});
+        }
     {% end %}\
     {% when not prop.isAttribute and prop.isComplex() and prop.name[-3:] == "Ref" %}
@@ -147 +157 @@
         public ${prop.javaType.replace("Ref", "")} get${prop.name[:-3]}()
         {
-                return (${prop.javaType.replace("Ref", "")}) 
+                return (${prop.javaType.replace("Ref", "")})
                         getReferencedNode("${prop.name[:-3]}", "${prop.name}");
+        }
+
+        public ${prop.javaType} get${prop.name}()
+        {
+                return (${prop.javaType})
+                        getChildNode("${prop.javaType[:-4]}", "${prop.name}");
         }
     {% end %}\
@@ -155 +171 @@
         public ${prop.javaType} get${prop.name}()
         {
-                return (${prop.javaType}) 
+                return (${prop.javaType})
                         getChildNode("${prop.javaType[:-4]}", "${prop.name}");
         }
@@ -166 +182 @@
 
         // -- OMEXMLNode API methods --
-        
+
         public boolean hasID()
         {