Author: oheger
Date: Fri Jul 11 20:31:03 2014
New Revision: 1609814
URL: http://svn.apache.org/r1609814
Log:
Reworked handling of event listeners in DynamicCombinedConfiguration.
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=1609814&r1=1609813&r2=1609814&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
Fri Jul 11 20:31:03 2014
@@ -31,7 +31,6 @@ import java.util.concurrent.ConcurrentHa
import java.util.concurrent.ConcurrentMap;
import org.apache.commons.configuration.event.ConfigurationErrorListener;
-import org.apache.commons.configuration.event.ConfigurationListener;
import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
import org.apache.commons.configuration.interpol.Lookup;
import org.apache.commons.configuration.tree.ExpressionEngine;
@@ -738,40 +737,13 @@ public class DynamicCombinedConfiguratio
}
@Override
- public void addConfigurationListener(ConfigurationListener l)
+ public void clearEventListeners()
{
- super.addConfigurationListener(l);
-
for (CombinedConfiguration cc : configs.values())
{
- cc.addConfigurationListener(l);
+ cc.clearEventListeners();
}
- }
-
- @Override
- public boolean removeConfigurationListener(ConfigurationListener l)
- {
- for (CombinedConfiguration cc : configs.values())
- {
- cc.removeConfigurationListener(l);
- }
- return super.removeConfigurationListener(l);
- }
-
- @Override
- public Collection<ConfigurationListener> getConfigurationListeners()
- {
- return super.getConfigurationListeners();
- }
-
- @Override
- public void clearConfigurationListeners()
- {
- for (CombinedConfiguration cc : configs.values())
- {
- cc.clearConfigurationListeners();
- }
- super.clearConfigurationListeners();
+ super.clearEventListeners();
}
@Override
@@ -987,10 +959,7 @@ public class DynamicCombinedConfiguratio
{
config.addErrorListener(listener);
}
- for (ConfigurationListener listener : getConfigurationListeners())
- {
- config.addConfigurationListener(listener);
- }
+ copyEventListeners(config);
for (ConfigData data : configurations)
{
config.addConfiguration(data.getConfiguration(), data.getName(),
