Author: nbubna
Date: Thu May 3 20:17:46 2007
New Revision: 535069
URL: http://svn.apache.org/viewvc?view=rev&rev=535069
Log:
make it easy to include default config in easy config
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/EasyFactoryConfiguration.java
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/EasyFactoryConfiguration.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/EasyFactoryConfiguration.java?view=diff&rev=535069&r1=535068&r2=535069
==============================================================================
---
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/EasyFactoryConfiguration.java
(original)
+++
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/EasyFactoryConfiguration.java
Thu May 3 20:17:46 2007
@@ -82,8 +82,40 @@
*/
public class EasyFactoryConfiguration extends FactoryConfiguration
{
+ private boolean addedDefault = false;
private EasyWrap<ToolboxConfiguration> toolbox;
+ public EasyFactoryConfiguration()
+ {
+ this(false);
+ }
+
+ /**
+ * @param startWithDefault Sets whether this instance should start with the
+ * [EMAIL PROTECTED] FactoryConfiguration#getDefault()}
configuration or not.
+ */
+ public EasyFactoryConfiguration(boolean startWithDefault)
+ {
+ if (startWithDefault)
+ {
+ addDefault();
+ }
+ }
+
+ /**
+ * Adds the [EMAIL PROTECTED] FactoryConfiguration#getDefault()}
configuration to this
+ * the current configuration.
+ */
+ public EasyFactoryConfiguration addDefault()
+ {
+ if (!addedDefault)
+ {
+ addConfiguration(getDefault());
+ addedDefault = true;
+ }
+ return this;
+ }
+
public EasyWrap<ToolboxConfiguration> toolbox(String scope)
{
ToolboxConfiguration toolbox = new ToolboxConfiguration();
@@ -169,6 +201,12 @@
}
}
throw new IllegalStateException("Wrapping unknown
"+Configuration.class.getName()+": "+getConfiguration());
+ }
+
+ public EasyWrap addDefault()
+ {
+ EasyFactoryConfiguration.this.addDefault();
+ return this;
}
public EasyWrap tool(Class clazz)
