Author: nbubna
Date: Mon Jul 9 12:04:36 2007
New Revision: 554737
URL: http://svn.apache.org/viewvc?view=rev&rev=554737
Log:
add some accessors for config stuff
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/Configuration.java
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/FactoryConfiguration.java
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolboxConfiguration.java
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/Configuration.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/Configuration.java?view=diff&rev=554737&r1=554736&r2=554737
==============================================================================
---
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/Configuration.java
(original)
+++
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/Configuration.java
Mon Jul 9 12:04:36 2007
@@ -90,6 +90,23 @@
return simpleProperties;
}
+ public Object getProperty(String name)
+ {
+ Object value = simpleProperties.get(name);
+ if (value != null)
+ {
+ return value;
+ }
+ for (Property prop : getConvertableProperties())
+ {
+ if (name.equals(prop.getName()))
+ {
+ return prop;
+ }
+ }
+ return null;
+ }
+
public Map<String,Object> getProperties()
{
Map<String,Object> all = new HashMap<String,Object>(simpleProperties);
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/FactoryConfiguration.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/FactoryConfiguration.java?view=diff&rev=554737&r1=554736&r2=554737
==============================================================================
---
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/FactoryConfiguration.java
(original)
+++
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/FactoryConfiguration.java
Mon Jul 9 12:04:36 2007
@@ -68,6 +68,18 @@
return data.remove(datum);
}
+ public Data getData(String key)
+ {
+ for (Data datum : getData())
+ {
+ if (key.equals(datum.getKey()))
+ {
+ return datum;
+ }
+ }
+ return null;
+ }
+
public List<Data> getData()
{
return data;
@@ -81,6 +93,18 @@
public void removeToolbox(ToolboxConfiguration toolbox)
{
removeChild(toolbox);
+ }
+
+ public ToolboxConfiguration getToolbox(String scope)
+ {
+ for (ToolboxConfiguration toolbox : getToolboxes())
+ {
+ if (scope.equals(toolbox.getScope()))
+ {
+ return toolbox;
+ }
+ }
+ return null;
}
public List<ToolboxConfiguration> getToolboxes()
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolboxConfiguration.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolboxConfiguration.java?view=diff&rev=554737&r1=554736&r2=554737
==============================================================================
---
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolboxConfiguration.java
(original)
+++
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolboxConfiguration.java
Mon Jul 9 12:04:36 2007
@@ -33,6 +33,11 @@
{
private String scope = ToolboxFactory.DEFAULT_SCOPE;
+ public ToolboxConfiguration()
+ {
+ // ensure that even the default scope is set as a property
+ setProperty("scope", this.scope);
+ }
protected ToolConfiguration findMatchingChild(ToolConfiguration newTool)
{
@@ -101,6 +106,18 @@
public void removeTool(ToolConfiguration tool)
{
removeChild(tool);
+ }
+
+ public ToolConfiguration getTool(String key)
+ {
+ for (ToolConfiguration tool : getTools())
+ {
+ if (key.equals(tool.getKey()))
+ {
+ return tool;
+ }
+ }
+ return null;
}
public List<ToolConfiguration> getTools()
