velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nbu...@apache.org
Subject svn commit: r551637 - /velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolInfo.java
Date Thu, 28 Jun 2007 17:53:27 GMT
Author: nbubna
Date: Thu Jun 28 10:53:27 2007
New Revision: 551637

URL: http://svn.apache.org/viewvc?view=rev&rev=551637
Log:
call configure() after specific setters (more reflective of configuration overriding convention

Modified:
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolInfo.java

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolInfo.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolInfo.java?view=diff&rev=551637&r1=551636&r2=551637
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolInfo.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolInfo.java Thu
Jun 28 10:53:27 2007
@@ -222,16 +222,16 @@
             combine(this.properties, dynamicProperties);
         if (combinedProps != null)
         {
-            if (hasConfigure())
-            {
-                invoke(getConfigure(), tool, combinedProps);
-            }
-
             //TODO: make this step optional?
             // look for specific setters
             for (String name : combinedProps.keySet())
             {
                 setProperty(tool, name, combinedProps.get(name));
+            }
+
+            if (hasConfigure())
+            {
+                invoke(getConfigure(), tool, combinedProps);
             }
         }
         return tool;



Mime
View raw message