Changeset 64

Timestamp:

08/05/06 17:29:33 (2 years ago)

Author:

schst

Message:

Added possibility to use a factory method for creating objects. This feature is still under development and subject to change

Files:

• trunk/src/main/java/net/schst/XJConf/DefinitionParser.java (modified) (3 diffs)
• trunk/src/main/java/net/schst/XJConf/FactoryMethodDefinition.java (added)
• trunk/src/main/java/net/schst/XJConf/FactoryMethodValueConverter.java (added)
• trunk/src/main/java/net/schst/XJConf/TagDefinition.java (modified) (8 diffs)
• trunk/src/test/java/net/schst/XJConf/tests/FactoryMethodTestCase.java (added)
• trunk/src/test/java/net/schst/XJConf/tests/helpers/FactoryMethodClass.java (added)
• trunk/src/test/resources/tests/defines/FactoryMethodTestCase.xml (added)
• trunk/src/test/resources/tests/xml/FactoryMethodTestCase-1.xml (added)
• trunk/src/test/resources/tests/xml/FactoryMethodTestCase-2.xml (added)

trunk/src/main/java/net/schst/XJConf/DefinitionParser.java

@@ -23 +23 @@
-public class DefinitionParser extends DefaultHandler {
-    
-
+
+
+
-     * Stack for currently open definitions
-     */
@@ -174 +176 @@
-            this.defStack.push(def);
-        }
+        
+        // define the constructor
+        if (qName.equals(TAG_FACTORY_METHOD)) {
+            // TODO: check, whether name has been specified
+            FactoryMethodDefinition def = new FactoryMethodDefinition(atts.getValue("name"));
+            this.defStack.push(def);
+        }
+
-
-        // define the character data
@@ -266 +276 @@
-        }
-
+        // set the factory method
+        if (qName.equals(TAG_FACTORY_METHOD)) {
+            FactoryMethodDefinition factoryDef = (FactoryMethodDefinition)this.defStack.pop();
+            TagDefinition tagDef = (TagDefinition)this.defStack.peek();
+            try {
+                tagDef.addChildDefinition(factoryDef);
+            } catch (Exception e) {
+                throw new InvalidTagDefinitionException("Could not register the factory method.", e);
+            }
+        }
+
+        
-        // set the cdata handling
-        if (qName.equals("cdata")) {

trunk/src/main/java/net/schst/XJConf/TagDefinition.java

@@ -23 +23 @@
-    private String nameAttribute = null;
-    private ConstructorDefinition constructor = null;
-
-
+
+
+
-    
-    // TODO: Eventually call the setter method for the cdata
@@ -59 +60 @@
-    public void setType(String type) {
-        this.type    = type;
-        if (this.type.indexOf(".") == -1) {
-            this.vConverter = new PrimitiveValueConverter(type);
-        } else {
-            this.vConverter = new ObjectValueConverter(type);
-        }
-    }
-    
@@ -75 +71 @@
-     */
-    public void addChildDefinition(Definition def) throws Exception {
+                
-        if (def instanceof AttributeDefinition) {
-            this.addAttribute((AttributeDefinition)def);
-            return;
-        }
+        if (def instanceof FactoryMethodDefinition) {
+            this.factoryMethod = (FactoryMethodDefinition)def;
+            return;
+        }
-        if (def instanceof ConstructorDefinition) {
-            this.constructor = (ConstructorDefinition)def;
@@ -173 +174 @@
-    public Class getValueType(Tag tag, ClassLoader loader) {
-        try {
-vConverter
+getValueConverter()
-        } catch (Exception e) {
-            throw new RuntimeException("Could not return type.");
@@ -203 +204 @@
-        return "set" + this.name.substring(0,1).toUpperCase() + this.name.substring(1);
-    }
-
+
-    /**
-     * Convert the value of the tag.
@@ -232 +233 @@
-        }
-        
-
+
+
+
+
+
+
-        Definition paramDef;
-        
@@ -244 +250 @@
-            cParamTypes[i] = paramDef.getValueType(tag, loader);
-        }
-vConverter
+getValueConverter()
-        
-        // add attributes and child elements
@@ -434 +440 @@
-        return copy;
-    }
+
+    /**
+     * Get the value converter for this tag
+     * 
+     * @return
+     */
+    private ValueConverter getValueConverter() {
+        
+        if (this.valueConverter == null) {
+            if (this.type.indexOf(".") == -1) {
+                this.valueConverter = new PrimitiveValueConverter(this.type);
+            } else {
+                if (this.factoryMethod != null) {
+                    this.valueConverter = new FactoryMethodValueConverter(this.type, this.factoryMethod.getName());
+                } else {
+                    this.valueConverter = new ObjectValueConverter(this.type);
+                }
+            }
+        }
+        return this.valueConverter;
+    }
-}