Changeset 151

Timestamp:

02/14/08 16:28:25 (6 months ago)

Author:

callan

Message:

Additions for Curtis that allow access to the actual node elements that reference nodes "reference".

Location:

Xml/xsd-fu/trunk

Files:

• fu.py (modified) (1 diff)
• templates/Class.template (modified) (1 diff)
• xsd-fu (modified) (3 diffs)

Xml/xsd-fu/trunk/fu.py

@@ -277 +277 @@
         javaBase = property(_get_javaBase, 
                 doc="""The model object's Java base class.""")
+                
+        def _get_refNodeName(self):
+                if self.base == "Reference":
+                        return self.properties["ID"].javaType
+                return None
+                
+        refNodeName = property(_get_refNodeName,
+                doc="""The name of this node's reference node; None otherwise.""")
         
         def __str__(self):

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

@@ -75 +75 @@
                                           "${klass.name}", attach));
         }
+{% if klass.base == "Reference" %}
+        /** 
+         * Returns the <code>${klass.refNodeName}</code> which this reference
+         * links to.
+         */
+        public ${klass.refNodeName} get${klass.refNodeName[:-4]}()
+        {
+                return (${klass.refNodeName})
+                        getAttrReferencedNode("${klass.refNodeName[:-4]}", "ID");
+        }
+
+        /**
+         * Sets the active reference node on this node.
+         * @param node The <code>${klass.refNodeName}</code> to set as a
+         * reference.
+         */
+        public void set${klass.refNodeName}(${klass.refNodeName} node)
+        {
+                setNodeID(node.getNodeID());
+        }
+{% end %}\
 
         // -- ${klass.name} API methods --

Xml/xsd-fu/trunk/xsd-fu

@@ -66 +66 @@
 
         if len(args) != 1:
-            usage("Expecting single ome.xsd file path!")
+                usage("Expecting single ome.xsd file path!")
 
         outputDirectory = None
@@ -78 +78 @@
                 usage("Output directory must be specified!")
         if not os.path.exists(outputDirectory):
-            print "Output directory '%s' does not exist!" % outputDirectory
-            sys.exit(1)
+                print "Output directory '%s' does not exist!" % outputDirectory
+                sys.exit(1)
 
         model = parseXmlSchema(args[0])
@@ -103 +103 @@
         for obj in model.objects.values():
                 if obj.name == "Laser":
-                        print " +--", obj.name
+                        print " +-- %s(%s)" % (obj.name, obj.base)
                         for prop in obj.properties.values():
                                 print " +---- %s(%s) [%d:%d]" % \