Author: cbrisson
Date: Fri Apr 26 14:37:25 2019
New Revision: 1858208
URL: http://svn.apache.org/viewvc?rev=1858208&view=rev
Log:
[tools/view] Review last commit
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
Modified:
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java?rev=1858208&r1=1858207&r2=1858208&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
(original)
+++
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
Fri Apr 26 14:37:25 2019
@@ -405,7 +405,7 @@ public class VelocityView extends ViewTo
// add all available default tools
getLog().trace("Loading default tools configuration...");
// give a chance for subclasses to define their own default tools
- addDefaultToolsConfiguration(factoryConfig);
+ factoryConfig.addConfiguration(getDefaultToolsConfiguration());
}
// check for application-wide user config in the context init params
@@ -461,9 +461,9 @@ public class VelocityView extends ViewTo
configure(factoryConfig);
}
- protected void addDefaultToolsConfiguration(FactoryConfiguration
factoryConfig)
+ protected FactoryConfiguration getDefaultToolsConfiguration()
{
- factoryConfig.addConfiguration(ConfigurationUtils.getDefaultTools());
+ return ConfigurationUtils.getDefaultTools();
}
private boolean setConfig(FactoryConfiguration factory, String path,
boolean require)
