Author: oheger
Date: Sun Jul 13 20:07:59 2014
New Revision: 1610301
URL: http://svn.apache.org/r1610301
Log:
Removed methods for adding and removing error listeners.
Instead, addEventListener() and removeEventListener() have been overridden.
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java?rev=1610301&r1=1610300&r2=1610301&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
Sun Jul 13 20:07:59 2014
@@ -30,7 +30,9 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.apache.commons.configuration.event.ConfigurationErrorListener;
+import org.apache.commons.configuration.event.Event;
+import org.apache.commons.configuration.event.EventListener;
+import org.apache.commons.configuration.event.EventType;
import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
import org.apache.commons.configuration.interpol.Lookup;
import org.apache.commons.configuration.tree.ExpressionEngine;
@@ -747,23 +749,25 @@ public class DynamicCombinedConfiguratio
}
@Override
- public void addErrorListener(ConfigurationErrorListener l)
+ public <T extends Event> void addEventListener(EventType<T> eventType,
+ EventListener<? super T> listener)
{
for (CombinedConfiguration cc : configs.values())
{
- cc.addErrorListener(l);
+ cc.addEventListener(eventType, listener);
}
- super.addErrorListener(l);
+ super.addEventListener(eventType, listener);
}
@Override
- public boolean removeErrorListener(ConfigurationErrorListener l)
+ public <T extends Event> boolean removeEventListener(
+ EventType<T> eventType, EventListener<? super T> listener)
{
for (CombinedConfiguration cc : configs.values())
{
- cc.removeErrorListener(l);
+ cc.removeEventListener(eventType, listener);
}
- return super.removeErrorListener(l);
+ return super.removeEventListener(eventType, listener);
}
@Override
@@ -776,12 +780,6 @@ public class DynamicCombinedConfiguratio
super.clearErrorListeners();
}
- @Override
- public Collection<ConfigurationErrorListener> getErrorListeners()
- {
- return super.getErrorListeners();
- }
-
/**
* Returns a copy of this object. This implementation performs a deep
clone,
* i.e. all contained configurations will be cloned, too. For this to work,
@@ -955,10 +953,6 @@ public class DynamicCombinedConfiguratio
config.setExpressionEngine(this.getExpressionEngine());
config.setConversionExpressionEngine(getConversionExpressionEngine());
config.setListDelimiterHandler(getListDelimiterHandler());
- for (ConfigurationErrorListener listener : getErrorListeners())
- {
- config.addErrorListener(listener);
- }
copyEventListeners(config);
for (ConfigData data : configurations)
{
