svn commit: r1769843 - in /velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view: IncludeTool.java UiDependencyTool.java

[cbrisson]

Author: cbrisson
Date: Tue Nov 15 14:47:10 2016
New Revision: 1769843

URL: http://svn.apache.org/viewvc?rev=1769843&view=rev
Log:
[tools] debugging last commit: standard tools should not override the public 
configure(Map) method, but all use the protected configure(ValueParser) one

Modified:
    
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/IncludeTool.java
    
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/UiDependencyTool.java

Modified: 
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/IncludeTool.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/IncludeTool.java?rev=1769843&r1=1769842&r2=1769843&view=diff
==============================================================================
--- 
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/IncludeTool.java
 (original)
+++ 
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/IncludeTool.java
 Tue Nov 15 14:47:10 2016
@@ -29,6 +29,7 @@ import org.apache.velocity.tools.Scope;
 import org.apache.velocity.tools.config.DefaultKey;
 import org.apache.velocity.tools.config.InvalidScope;
 import org.apache.velocity.tools.generic.SafeConfig;
+import org.apache.velocity.tools.generic.ValueParser;
 
 /**
  * Allows for transparent content negotiation in a manner mimicking
@@ -79,7 +80,7 @@ public class IncludeTool extends SafeCon
      * @param params the {@link Map} of configuration parameters
      * @throws IllegalArgumentException if the param is not a ViewContext
      */
-    public void configure(Map params)
+    protected void configure(ValueParser params)
     {
         configure((ViewToolContext)params.get(ViewToolContext.CONTEXT_KEY));
     }

Modified: 
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/UiDependencyTool.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/UiDependencyTool.java?rev=1769843&r1=1769842&r2=1769843&view=diff
==============================================================================
--- 
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/UiDependencyTool.java
 (original)
+++ 
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/UiDependencyTool.java
 Tue Nov 15 14:47:10 2016
@@ -30,6 +30,7 @@ import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.velocity.tools.generic.SafeConfig;
+import org.apache.velocity.tools.generic.ValueParser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -138,7 +139,7 @@ public class UiDependencyTool extends Sa
     private static Logger LOG = 
LoggerFactory.getLogger(UiDependencyTool.class);
     private String context = "";
 
-    public void configure(Map params) {
+    protected void configure(ValueParser params) {
         ServletContext app = 
(ServletContext)params.get(ViewContext.SERVLET_CONTEXT_KEY);
 
         HttpServletRequest request = 
(HttpServletRequest)params.get(ViewContext.REQUEST);