Author: oheger
Date: Mon May 19 19:57:14 2014
New Revision: 1596022

URL: http://svn.apache.org/r1596022
Log:
Adapted MultiFileConfigurationBuilderProvider to changes on builder interface.

The methods for adding and removing event listeners have changed. The internal
WrapperBuilder class now implements the new methods.

Modified:
    
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/MultiFileConfigurationBuilderProvider.java

Modified: 
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/MultiFileConfigurationBuilderProvider.java
URL: 
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/MultiFileConfigurationBuilderProvider.java?rev=1596022&r1=1596021&r2=1596022&view=diff
==============================================================================
--- 
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/MultiFileConfigurationBuilderProvider.java
 (original)
+++ 
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/MultiFileConfigurationBuilderProvider.java
 Mon May 19 19:57:14 2014
@@ -23,8 +23,10 @@ import org.apache.commons.configuration.
 import org.apache.commons.configuration.HierarchicalConfiguration;
 import 
org.apache.commons.configuration.builder.BuilderConfigurationWrapperFactory;
 import 
org.apache.commons.configuration.builder.BuilderConfigurationWrapperFactory.EventSourceSupport;
-import org.apache.commons.configuration.builder.BuilderListener;
 import org.apache.commons.configuration.builder.ConfigurationBuilder;
+import org.apache.commons.configuration.builder.ConfigurationBuilderEvent;
+import org.apache.commons.configuration.event.EventListener;
+import org.apache.commons.configuration.event.EventType;
 import org.apache.commons.configuration.ex.ConfigurationException;
 import org.apache.commons.configuration.reloading.ReloadingController;
 import org.apache.commons.configuration.reloading.ReloadingControllerSupport;
@@ -181,15 +183,17 @@ public class MultiFileConfigurationBuild
         }
 
         @Override
-        public void addBuilderListener(BuilderListener l)
+        public <T extends ConfigurationBuilderEvent> void addEventListener(
+                EventType<T> eventType, EventListener<? super T> listener)
         {
-            builder.addBuilderListener(l);
+            builder.addEventListener(eventType, listener);
         }
 
         @Override
-        public void removeBuilderListener(BuilderListener l)
+        public <T extends ConfigurationBuilderEvent> void removeEventListener(
+                EventType<T> eventType, EventListener<? super T> listener)
         {
-            builder.removeBuilderListener(l);
+            builder.removeEventListener(eventType, listener);
         }
     }
 


Reply via email to