commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ebo...@apache.org
Subject svn commit: r787633 - in /commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2: json/JSONConfiguration.java plist/PropertyListConfiguration.java plist/XMLPropertyListConfiguration.java
Date Tue, 23 Jun 2009 11:03:50 GMT
Author: ebourg
Date: Tue Jun 23 11:03:49 2009
New Revision: 787633

URL: http://svn.apache.org/viewvc?rev=787633&view=rev
Log:
Replaced HierarchicalConfiguration with AbstractHierarchicalConfiguration in the plist and
json configurations

Modified:
    commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/json/JSONConfiguration.java
    commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java
    commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java

Modified: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/json/JSONConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/json/JSONConfiguration.java?rev=787633&r1=787632&r2=787633&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/json/JSONConfiguration.java
(original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/json/JSONConfiguration.java
Tue Jun 23 11:03:49 2009
@@ -31,7 +31,6 @@
 import org.apache.commons.configuration2.AbstractHierarchicalFileConfiguration;
 import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.configuration2.ConfigurationException;
-import org.apache.commons.configuration2.HierarchicalConfiguration;
 import org.apache.commons.configuration2.MapConfiguration;
 import org.apache.commons.configuration2.tree.ConfigurationNode;
 import org.apache.commons.configuration2.tree.DefaultConfigurationNode;
@@ -224,9 +223,9 @@
             }
             out.print(" ]");
         }
-        else if (value instanceof HierarchicalConfiguration)
+        else if (value instanceof AbstractHierarchicalConfiguration)
         {
-            printNode(out, indentLevel, ((HierarchicalConfiguration) value).getRootNode());
+            printNode(out, indentLevel, ((AbstractHierarchicalConfiguration<ConfigurationNode>)
value).getRootNode());
         }
         else if (value instanceof Configuration)
         {

Modified: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java?rev=787633&r1=787632&r2=787633&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java
(original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java
Tue Jun 23 11:03:49 2009
@@ -35,7 +35,6 @@
 import org.apache.commons.configuration2.AbstractHierarchicalFileConfiguration;
 import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.configuration2.ConfigurationException;
-import org.apache.commons.configuration2.HierarchicalConfiguration;
 import org.apache.commons.configuration2.MapConfiguration;
 import org.apache.commons.configuration2.tree.ConfigurationNode;
 import org.apache.commons.configuration2.tree.DefaultConfigurationNode;
@@ -305,9 +304,9 @@
             }
             out.print(" )");
         }
-        else if (value instanceof HierarchicalConfiguration)
+        else if (value instanceof AbstractHierarchicalConfiguration)
         {
-            printNode(out, indentLevel, ((HierarchicalConfiguration) value).getRootNode());
+            printNode(out, indentLevel, ((AbstractHierarchicalConfiguration<ConfigurationNode>)
value).getRootNode());
         }
         else if (value instanceof Configuration)
         {

Modified: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java?rev=787633&r1=787632&r2=787633&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
(original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
Tue Jun 23 11:03:49 2009
@@ -35,7 +35,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
-
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
@@ -43,7 +42,6 @@
 import org.apache.commons.configuration2.AbstractHierarchicalFileConfiguration;
 import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.configuration2.ConfigurationException;
-import org.apache.commons.configuration2.HierarchicalConfiguration;
 import org.apache.commons.configuration2.MapConfiguration;
 import org.apache.commons.configuration2.tree.ConfigurationNode;
 import org.apache.commons.configuration2.tree.DefaultConfigurationNode;
@@ -373,9 +371,9 @@
             }
             out.println(padding + "</array>");
         }
-        else if (value instanceof HierarchicalConfiguration)
+        else if (value instanceof AbstractHierarchicalConfiguration)
         {
-            printNode(out, indentLevel, ((HierarchicalConfiguration) value).getRootNode());
+            printNode(out, indentLevel, ((AbstractHierarchicalConfiguration<ConfigurationNode>)
value).getRootNode());
         }
         else if (value instanceof Configuration)
         {
@@ -518,7 +516,6 @@
             }
             else
             {
-                PListNode node = (PListNode) peek();
                 if ("string".equals(qName))
                 {
                     ((PListNode) peek()).addValue(buffer.toString());



Mime
View raw message