svn commit: r787409 - in /commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist: PropertyListParser.java PropertyListParser.jj

[ebourg]

Author: ebourg
Date: Mon Jun 22 21:19:13 2009
New Revision: 787409

URL: http://svn.apache.org/viewvc?rev=787409&view=rev
Log:
Replaced InMemoryConfiguration with AbstractHierarchicalConfiguration in the 
plist parser as the base hierarchical configuration

Modified:
    
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListParser.java
    
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListParser.jj

Modified: 
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListParser.java
URL: 
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListParser.java?rev=787409&r1=787408&r2=787409&view=diff
==============================================================================
--- 
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListParser.java
 (original)
+++ 
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListParser.java
 Mon Jun 22 21:19:13 2009
@@ -1,14 +1,13 @@
 /* Generated By:JavaCC: Do not edit this line. PropertyListParser.java */
 package org.apache.commons.configuration2.plist;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.ArrayList;
 
-import org.apache.commons.configuration2.InMemoryConfiguration;
+import org.apache.commons.configuration2.AbstractHierarchicalConfiguration;
 import org.apache.commons.configuration2.tree.ConfigurationNode;
 import org.apache.commons.configuration2.tree.DefaultConfigurationNode;
-
 import org.apache.commons.lang.StringUtils;
 
 /**
@@ -112,11 +111,11 @@
         break label_1;
       }
       child = Property();
-            if (child.getValue() instanceof InMemoryConfiguration)
+            if (child.getValue() instanceof AbstractHierarchicalConfiguration)
             {
                 // prune & graft the nested configuration to the parent 
configuration
-                InMemoryConfiguration conf = (InMemoryConfiguration) 
child.getValue();
-                ConfigurationNode root = conf.getRootNode();
+                AbstractHierarchicalConfiguration conf = 
(AbstractHierarchicalConfiguration) child.getValue();
+                ConfigurationNode root = (ConfigurationNode) 
conf.getRootNode();
                 root.setName(child.getName());
                 children.add(root);
             }

Modified: 
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListParser.jj
URL: 
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListParser.jj?rev=787409&r1=787408&r2=787409&view=diff
==============================================================================
--- 
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListParser.jj
 (original)
+++ 
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListParser.jj
 Mon Jun 22 21:19:13 2009
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.ArrayList;
 
-import org.apache.commons.configuration2.InMemoryConfiguration;
+import org.apache.commons.configuration2.AbstractHierarchicalConfiguration;
 import org.apache.commons.configuration2.tree.ConfigurationNode;
 import org.apache.commons.configuration2.tree.DefaultConfigurationNode;
 
@@ -165,11 +165,11 @@
     (
         child = Property()
         {
-            if (child.getValue() instanceof InMemoryConfiguration)
+            if (child.getValue() instanceof AbstractHierarchicalConfiguration)
             {
                 // prune & graft the nested configuration to the parent 
configuration
-                InMemoryConfiguration conf = (InMemoryConfiguration) 
child.getValue();
-                ConfigurationNode root = conf.getRootNode();
+                AbstractHierarchicalConfiguration conf = 
(AbstractHierarchicalConfiguration) child.getValue();
+                ConfigurationNode root = (ConfigurationNode) 
conf.getRootNode();
                 root.setName(child.getName());
                 children.add(root);
             }