You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by nb...@apache.org on 2007/05/18 07:42:28 UTC
svn commit: r539262 - in
/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config:
CompoundConfiguration.java Configuration.java FactoryConfiguration.java
ToolboxConfiguration.java
Author: nbubna
Date: Thu May 17 22:42:27 2007
New Revision: 539262
URL: http://svn.apache.org/viewvc?view=rev&rev=539262
Log:
add remove*() configuration methods
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/CompoundConfiguration.java
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/CompoundConfiguration.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/CompoundConfiguration.java?view=diff&rev=539262&r1=539261&r2=539262
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/CompoundConfiguration.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/CompoundConfiguration.java Thu May 17 22:42:27 2007
@@ -38,6 +38,11 @@
children.add(config);
}
+ protected boolean removeChild(C config)
+ {
+ return children.remove(config);
+ }
+
protected boolean hasChildren()
{
return !children.isEmpty();
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=539262&r1=539261&r2=539262
==============================================================================
--- 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 Thu May 17 22:42:27 2007
@@ -40,6 +40,11 @@
convertableProperties.add(property);
}
+ public boolean removeProperty(Property property)
+ {
+ return convertableProperties.remove(property);
+ }
+
public List<Property> getConvertableProperties()
{
return convertableProperties;
@@ -68,6 +73,11 @@
public void setProperty(String name, Object value)
{
simpleProperties.put(name, value);
+ }
+
+ public Object removeProperty(String name)
+ {
+ return simpleProperties.remove(name);
}
public boolean hasProperties()
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=539262&r1=539261&r2=539262
==============================================================================
--- 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 Thu May 17 22:42:27 2007
@@ -58,9 +58,14 @@
}
- public void addData(Data config)
+ public void addData(Data datum)
{
- data.add(config);
+ data.add(datum);
+ }
+
+ public boolean removeData(Data datum)
+ {
+ return data.remove(datum);
}
public List<Data> getData()
@@ -71,6 +76,11 @@
public void addToolbox(ToolboxConfiguration toolbox)
{
addChild(toolbox);
+ }
+
+ public void removeToolbox(ToolboxConfiguration toolbox)
+ {
+ removeChild(toolbox);
}
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=539262&r1=539261&r2=539262
==============================================================================
--- 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 Thu May 17 22:42:27 2007
@@ -95,6 +95,11 @@
addChild(tool);
}
+ public void removeTool(ToolConfiguration tool)
+ {
+ removeChild(tool);
+ }
+
public List<ToolConfiguration> getTools()
{
return getChildren();