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 2010/02/06 16:48:41 UTC
svn commit: r907236 -
/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
Author: oheger
Date: Sat Feb 6 15:48:40 2010
New Revision: 907236
URL: http://svn.apache.org/viewvc?rev=907236&view=rev
Log:
Removed reference to HierarchicalConfiguration and fixed some raw type warnings.
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
Modified: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java?rev=907236&r1=907235&r2=907236&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java Sat Feb 6 15:48:40 2010
@@ -1120,7 +1120,7 @@
array[0] = interpolate((String) value);
}
- else if (value instanceof List)
+ else if (value instanceof List<?>)
{
List<?> list = (List<?>) value;
array = new String[list.size()];
@@ -1202,7 +1202,7 @@
Object value = getProperty(key);
if (value != null)
{
- if (value instanceof Collection)
+ if (value instanceof Collection<?>)
{
Collection<?> collection = (Collection<?>) value;
value = collection.isEmpty() ? null : collection.iterator().next();
@@ -1224,8 +1224,7 @@
* hierarchical configurations because it is not able to copy information
* about the properties' structure (i.e. the parent-child-relationships will
* get lost). So when dealing with hierarchical configuration objects their
- * <code>{@link HierarchicalConfiguration#clone() clone()}</code> methods
- * should be used.
+ * {@code clone()} methods should be used.
*
* @param c the configuration to copy (can be <b>null</b>, then this
* operation will have no effect)
@@ -1264,8 +1263,7 @@
* well when appending hierarchical configurations because it is not able to
* copy information about the properties' structure (i.e. the
* parent-child-relationships will get lost). So when dealing with
- * hierarchical configuration objects their
- * <code>{@link HierarchicalConfiguration#clone() clone()}</code> methods
+ * hierarchical configuration objects their {@code clone()} methods
* should be used.
*
* @param c the configuration to be appended (can be <b>null</b>, then this