You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2014/07/22 21:59:15 UTC
svn commit: r1612665 - in /commons/proper/configuration/trunk/src:
main/java/org/apache/commons/configuration/builder/
main/java/org/apache/commons/configuration/builder/combined/
test/java/org/apache/commons/configuration/builder/
Author: oheger
Date: Tue Jul 22 19:59:14 2014
New Revision: 1612665
URL: http://svn.apache.org/r1612665
Log:
Changed return type of ConfigurationBuilder.removeEventListener().
The method signature is now in-line with other event listener methods.
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/BasicConfigurationBuilder.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/ConfigurationBuilder.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/MultiFileConfigurationBuilderProvider.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestBasicConfigurationBuilderEvents.java
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/BasicConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/BasicConfigurationBuilder.java?rev=1612665&r1=1612664&r2=1612665&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/BasicConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/BasicConfigurationBuilder.java Tue Jul 22 19:59:14 2014
@@ -350,10 +350,10 @@ public class BasicConfigurationBuilder<T
}
@Override
- public final <E extends ConfigurationBuilderEvent> void removeEventListener(
+ public final <E extends ConfigurationBuilderEvent> boolean removeEventListener(
EventType<E> eventType, EventListener<? super E> listener)
{
- eventListeners.removeEventListener(eventType, listener);
+ return eventListeners.removeEventListener(eventType, listener);
}
/**
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/ConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/ConfigurationBuilder.java?rev=1612665&r1=1612664&r2=1612665&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/ConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/ConfigurationBuilder.java Tue Jul 22 19:59:14 2014
@@ -66,6 +66,6 @@ public interface ConfigurationBuilder<T
* @param eventType the event type
* @param listener the listener to be removed
*/
- <E extends ConfigurationBuilderEvent> void removeEventListener(
+ <E extends ConfigurationBuilderEvent> boolean removeEventListener(
EventType<E> eventType, EventListener<? super E> listener);
}
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=1612665&r1=1612664&r2=1612665&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 Tue Jul 22 19:59:14 2014
@@ -190,10 +190,10 @@ public class MultiFileConfigurationBuild
}
@Override
- public <T extends ConfigurationBuilderEvent> void removeEventListener(
+ public <T extends ConfigurationBuilderEvent> boolean removeEventListener(
EventType<T> eventType, EventListener<? super T> listener)
{
- builder.removeEventListener(eventType, listener);
+ return builder.removeEventListener(eventType, listener);
}
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestBasicConfigurationBuilderEvents.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestBasicConfigurationBuilderEvents.java?rev=1612665&r1=1612664&r2=1612665&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestBasicConfigurationBuilderEvents.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestBasicConfigurationBuilderEvents.java Tue Jul 22 19:59:14 2014
@@ -17,8 +17,10 @@
package org.apache.commons.configuration.builder;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.PropertiesConfiguration;
@@ -95,13 +97,29 @@ public class TestBasicConfigurationBuild
builder.addEventListener(ConfigurationBuilderEvent.RESET, listener);
builder.reset();
- builder.removeEventListener(ConfigurationBuilderEvent.RESET, listener);
+ assertTrue("Wrong result", builder.removeEventListener(
+ ConfigurationBuilderEvent.RESET, listener));
builder.resetResult();
listener.nextEvent(ConfigurationBuilderEvent.RESET);
listener.assertNoMoreEvents();
}
/**
+ * Tests removeEventListener() for a non-existing listener.
+ */
+ @Test
+ public void testRemoveEventListenerNotExisting()
+ {
+ BasicConfigurationBuilder<PropertiesConfiguration> builder =
+ new BasicConfigurationBuilder<PropertiesConfiguration>(
+ PropertiesConfiguration.class);
+ BuilderEventListenerImpl listener = new BuilderEventListenerImpl();
+ builder.addEventListener(ConfigurationBuilderEvent.RESET, listener);
+ assertFalse("Wrong result", builder.removeEventListener(
+ ConfigurationBuilderEvent.CONFIGURATION_REQUEST, listener));
+ }
+
+ /**
* Tests whether the configuration request event type is correctly
* configured.
*/