Author: oheger
Date: Sun Jul 13 20:04:52 2014
New Revision: 1610294
URL: http://svn.apache.org/r1610294
Log:
Fixed some warnings, e.g. regarding raw type access.
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationUtils.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestConfigurationUtils.java
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationUtils.java?rev=1610294&r1=1610293&r2=1610294&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationUtils.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationUtils.java
Sun Jul 13 20:04:52 2014
@@ -49,12 +49,6 @@ import org.apache.commons.logging.LogFac
*/
public final class ConfigurationUtils
{
- /** Constant for the file URL protocol.*/
- static final String PROTOCOL_FILE = "file";
-
- /** Constant for the resource path separator.*/
- static final String RESOURCE_PATH_SEPARATOR = "/";
-
/** Constant for the name of the clone() method.*/
private static final String METHOD_CLONE = "clone";
@@ -223,7 +217,7 @@ public final class ConfigurationUtils
* and only if the passed in configuration is <b>null</b>)
* @since 1.3
*/
- public static HierarchicalConfiguration convertToHierarchical(
+ public static HierarchicalConfiguration<?> convertToHierarchical(
Configuration conf)
{
return convertToHierarchical(conf, null);
@@ -252,7 +246,7 @@ public final class ConfigurationUtils
* and only if the passed in configuration is <b>null</b>)
* @since 1.6
*/
- public static HierarchicalConfiguration convertToHierarchical(
+ public static HierarchicalConfiguration<?> convertToHierarchical(
Configuration conf, ExpressionEngine engine)
{
if (conf == null)
@@ -262,7 +256,7 @@ public final class ConfigurationUtils
if (conf instanceof HierarchicalConfiguration)
{
- HierarchicalConfiguration hc = (HierarchicalConfiguration) conf;
+ HierarchicalConfiguration<?> hc = (HierarchicalConfiguration<?>)
conf;
if (engine != null)
{
hc.setExpressionEngine(engine);
@@ -566,7 +560,7 @@ public final class ConfigurationUtils
* @since 2.0
*/
public static ImmutableHierarchicalConfiguration unmodifiableConfiguration(
- HierarchicalConfiguration c)
+ HierarchicalConfiguration<?> c)
{
return (ImmutableHierarchicalConfiguration)
createUnmodifiableConfiguration(
IMMUTABLE_HIERARCHICAL_CONFIG_IFCS, c);
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestConfigurationUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestConfigurationUtils.java?rev=1610294&r1=1610293&r2=1610294&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestConfigurationUtils.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestConfigurationUtils.java
Sun Jul 13 20:04:52 2014
@@ -34,7 +34,6 @@ import junitx.framework.ListAssert;
import org.apache.commons.configuration.builder.XMLBuilderParametersImpl;
import org.apache.commons.configuration.convert.DefaultListDelimiterHandler;
import org.apache.commons.configuration.event.ConfigurationErrorEvent;
-import org.apache.commons.configuration.event.ConfigurationErrorListener;
import org.apache.commons.configuration.event.ConfigurationEvent;
import org.apache.commons.configuration.event.EventListener;
import org.apache.commons.configuration.event.EventSource;
@@ -202,7 +201,7 @@ public class TestConfigurationUtils
conf.addProperty("test.key", "1\\,2\\,3");
assertEquals("Wrong property value", "1,2,3", conf
.getString("test.key"));
- HierarchicalConfiguration hc = ConfigurationUtils
+ HierarchicalConfiguration<?> hc = ConfigurationUtils
.convertToHierarchical(conf);
assertEquals("Escaped list delimiters not correctly handled", "1,2,3",
hc.getString("test.key"));
@@ -223,7 +222,7 @@ public class TestConfigurationUtils
new DefaultExpressionEngineSymbols.Builder(
DefaultExpressionEngineSymbols.DEFAULT_SYMBOLS)
.setIndexStart("[").setIndexEnd("]").create());
- HierarchicalConfiguration hc = ConfigurationUtils
+ HierarchicalConfiguration<?> hc = ConfigurationUtils
.convertToHierarchical(conf, engine);
assertTrue("Wrong value for test(a)", hc.getBoolean("test(a)"));
assertFalse("Wrong value for test(b)", hc.getBoolean("test(b)"));
@@ -274,7 +273,7 @@ public class TestConfigurationUtils
BaseConfiguration config = new BaseConfiguration();
config.setListDelimiterHandler(new DefaultListDelimiterHandler(','));
config.addProperty("test", "1,2,3");
- HierarchicalConfiguration hc = ConfigurationUtils
+ HierarchicalConfiguration<?> hc = ConfigurationUtils
.convertToHierarchical(config);
assertEquals("Wrong value 1", 1, hc.getInt("test(0)"));
assertEquals("Wrong value 2", 2, hc.getInt("test(1)"));
@@ -519,13 +518,10 @@ public class TestConfigurationUtils
{
@SuppressWarnings("unchecked")
EventListener<ConfigurationEvent> cl =
EasyMock.createMock(EventListener.class);
- ConfigurationErrorListener el =
EasyMock.createMock(ConfigurationErrorListener.class);
- EasyMock.replay(cl, el);
+ EasyMock.replay(cl);
EventSource source = ConfigurationUtils.asEventSource(this, true);
source.addEventListener(ConfigurationEvent.ANY, cl);
- source.addErrorListener(el);
assertFalse("Wrong result (1)",
source.removeEventListener(ConfigurationEvent.ANY, cl));
- assertFalse("Wrong result (2)", source.removeErrorListener(el));
source.addEventListener(ConfigurationEvent.ANY, null);
}
