You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by eb...@apache.org on 2004/06/02 19:04:51 UTC
cvs commit: jakarta-commons/configuration/src/java/org/apache/commons/configuration BaseConfiguration.java HierarchicalConfiguration.java
ebourg 2004/06/02 10:04:51
Modified: configuration project.xml
configuration/src/java/org/apache/commons/configuration
BaseConfiguration.java
HierarchicalConfiguration.java
Log:
- upgraded the dependency on [collections] to 3.0
- replaced the deprecated SequencedHashMap with LinkedMap
Revision Changes Path
1.21 +2 -2 jakarta-commons/configuration/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/configuration/project.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- project.xml 13 May 2004 12:29:12 -0000 1.20
+++ project.xml 2 Jun 2004 17:04:51 -0000 1.21
@@ -163,7 +163,7 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>2.1</version>
+ <version>3.0</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
1.5 +5 -4 jakarta-commons/configuration/src/java/org/apache/commons/configuration/BaseConfiguration.java
Index: BaseConfiguration.java
===================================================================
RCS file: /home/cvs/jakarta-commons/configuration/src/java/org/apache/commons/configuration/BaseConfiguration.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BaseConfiguration.java 27 Feb 2004 17:41:35 -0000 1.4
+++ BaseConfiguration.java 2 Jun 2004 17:04:51 -0000 1.5
@@ -17,8 +17,9 @@
*/
import java.util.Iterator;
+import java.util.Map;
-import org.apache.commons.collections.SequencedHashMap;
+import org.apache.commons.collections.map.LinkedMap;
/**
* Basic configuration classe. Stores the configuration data but does not
@@ -35,7 +36,7 @@
public class BaseConfiguration extends AbstractConfiguration
{
/** stores the configuration key-value pairs */
- private SequencedHashMap store = new SequencedHashMap();
+ private Map store = new LinkedMap();
/**
* Empty constructor. You must add all the values to this configuration.
@@ -148,6 +149,6 @@
*/
public Iterator getKeys()
{
- return store.iterator();
+ return store.keySet().iterator();
}
}
1.7 +3 -3 jakarta-commons/configuration/src/java/org/apache/commons/configuration/HierarchicalConfiguration.java
Index: HierarchicalConfiguration.java
===================================================================
RCS file: /home/cvs/jakarta-commons/configuration/src/java/org/apache/commons/configuration/HierarchicalConfiguration.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HierarchicalConfiguration.java 28 Mar 2004 14:43:04 -0000 1.6
+++ HierarchicalConfiguration.java 2 Jun 2004 17:04:51 -0000 1.7
@@ -27,7 +27,7 @@
import java.util.Set;
import java.util.Stack;
-import org.apache.commons.collections.SequencedHashMap;
+import org.apache.commons.collections.map.LinkedMap;
import org.apache.commons.lang.StringUtils;
/**
@@ -667,7 +667,7 @@
{
if (children == null)
{
- children = new SequencedHashMap();
+ children = new LinkedMap();
} /* if */
List c = (List) children.get(child.getName());
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org