svn commit: r554739 - in /velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config: PropertiesFactoryConfiguration.java ToolConfiguration.java

[nbubna]

Author: nbubna
Date: Mon Jul  9 12:08:02 2007
New Revision: 554739

URL: http://svn.apache.org/viewvc?view=rev&rev=554739
Log:
never set default keys as tool config props

Modified:
    
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/PropertiesFactoryConfiguration.java
    
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolConfiguration.java

Modified: 
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/PropertiesFactoryConfiguration.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/PropertiesFactoryConfiguration.java?view=diff&rev=554739&r1=554738&r2=554739
==============================================================================
--- 
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/PropertiesFactoryConfiguration.java
 (original)
+++ 
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/PropertiesFactoryConfiguration.java
 Mon Jul  9 12:08:02 2007
@@ -144,11 +144,7 @@
             String classname = tools.getString(key);
             ToolConfiguration tool = new ToolConfiguration();
             tool.setClassname(classname);
-            // only manually set the key when necessary
-            if (!key.equals(tool.getDefaultKey()))
-            {
-                tool.setKey(key);
-            }
+            tool.setKey(key);
             toolbox.addTool(tool);
 
             // get tool properties prefixed by 'property'
@@ -192,6 +188,8 @@
                 // get/set the type/converter properties
                 ExtendedProperties props = dataset.subset(key);
                 setProperties(props, data);
+
+                addData(data);
             }
         }
     }

Modified: 
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolConfiguration.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolConfiguration.java?view=diff&rev=554739&r1=554738&r2=554739
==============================================================================
--- 
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolConfiguration.java
 (original)
+++ 
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolConfiguration.java
 Mon Jul  9 12:08:02 2007
@@ -47,14 +47,13 @@
     {
         this.key = key;
 
-        // ensure any manually set key is also set as a property
-        setProperty("key", key);
+        // ensure any non-default key is also set as a property
+        if (key != null && !key.equals(getDefaultKey()))
+        {
+            setProperty("key", key);
+        }
     }
 
-    /**
-     * This doesn't take a [EMAIL PROTECTED] Class} parameter because
-     * this class was not created for all-java configuration.
-     */
     public void setClass(Class clazz)
     {
         setClassname(clazz.getName());