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 2008/03/22 19:44:40 UTC
svn commit: r640047 - in
/commons/proper/configuration/branches/configuration2_experimental/src:
main/java/org/apache/commons/configuration2/plist/
test/java/org/apache/commons/configuration2/plist/
Author: oheger
Date: Sat Mar 22 11:44:39 2008
New Revision: 640047
URL: http://svn.apache.org/viewvc?rev=640047&view=rev
Log:
File-based hierarchical configurations are now derived from AbstractHierarchicalConfiguration
Modified:
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/PropertyListParser.java
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/PropertyListParser.jj
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java
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=640047&r1=640046&r2=640047&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 Sat Mar 22 11:44:39 2008
@@ -31,6 +31,7 @@
import java.util.Map;
import java.util.TimeZone;
+import org.apache.commons.configuration2.AbstractHierarchicalConfiguration;
import org.apache.commons.configuration2.AbstractHierarchicalFileConfiguration;
import org.apache.commons.configuration2.Configuration;
import org.apache.commons.configuration2.ConfigurationException;
@@ -115,7 +116,7 @@
* @param c the configuration to copy
* @since 1.4
*/
- public PropertyListConfiguration(HierarchicalConfiguration c)
+ public PropertyListConfiguration(AbstractHierarchicalConfiguration<? extends ConfigurationNode> c)
{
super(c);
}
@@ -196,7 +197,7 @@
PropertyListParser parser = new PropertyListParser(in);
try
{
- HierarchicalConfiguration config = parser.parse();
+ AbstractHierarchicalConfiguration<ConfigurationNode> config = parser.parse();
setRootNode(config.getRootNode());
}
catch (ParseException e)
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=640047&r1=640046&r2=640047&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 Sat Mar 22 11:44:39 2008
@@ -5,7 +5,7 @@
import java.util.List;
import java.util.ArrayList;
-import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.InMemoryConfiguration;
import org.apache.commons.configuration2.tree.ConfigurationNode;
import org.apache.commons.configuration2.tree.DefaultConfigurationNode;
@@ -112,10 +112,10 @@
break label_1;
}
child = Property();
- if (child.getValue() instanceof HierarchicalConfiguration)
+ if (child.getValue() instanceof InMemoryConfiguration)
{
// prune & graft the nested configuration to the parent configuration
- HierarchicalConfiguration conf = (HierarchicalConfiguration) child.getValue();
+ InMemoryConfiguration conf = (InMemoryConfiguration) child.getValue();
ConfigurationNode root = 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=640047&r1=640046&r2=640047&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 Sat Mar 22 11:44:39 2008
@@ -28,7 +28,7 @@
import java.util.List;
import java.util.ArrayList;
-import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.InMemoryConfiguration;
import org.apache.commons.configuration2.tree.ConfigurationNode;
import org.apache.commons.configuration2.tree.DefaultConfigurationNode;
@@ -165,10 +165,10 @@
(
child = Property()
{
- if (child.getValue() instanceof HierarchicalConfiguration)
+ if (child.getValue() instanceof InMemoryConfiguration)
{
// prune & graft the nested configuration to the parent configuration
- HierarchicalConfiguration conf = (HierarchicalConfiguration) child.getValue();
+ InMemoryConfiguration conf = (InMemoryConfiguration) child.getValue();
ConfigurationNode root = conf.getRootNode();
root.setName(child.getName());
children.add(root);
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=640047&r1=640046&r2=640047&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 Sat Mar 22 11:44:39 2008
@@ -37,6 +37,7 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import org.apache.commons.configuration2.AbstractHierarchicalConfiguration;
import org.apache.commons.configuration2.AbstractHierarchicalFileConfiguration;
import org.apache.commons.configuration2.Configuration;
import org.apache.commons.configuration2.ConfigurationException;
@@ -145,7 +146,7 @@
* @param configuration the configuration to copy
* @since 1.4
*/
- public XMLPropertyListConfiguration(HierarchicalConfiguration configuration)
+ public XMLPropertyListConfiguration(AbstractHierarchicalConfiguration<? extends ConfigurationNode> configuration)
{
super(configuration);
}
Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java?rev=640047&r1=640046&r2=640047&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/plist/TestXMLPropertyListConfiguration.java Sat Mar 22 11:44:39 2008
@@ -28,6 +28,7 @@
import org.apache.commons.configuration2.ConfigurationComparator;
import org.apache.commons.configuration2.FileConfiguration;
import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.InMemoryConfiguration;
import org.apache.commons.configuration2.StrictConfigurationComparator;
import junit.framework.TestCase;
@@ -314,7 +315,7 @@
public void testInitCopy()
{
- XMLPropertyListConfiguration copy = new XMLPropertyListConfiguration((HierarchicalConfiguration) config);
+ XMLPropertyListConfiguration copy = new XMLPropertyListConfiguration((InMemoryConfiguration) config);
StrictConfigurationComparator comp = new StrictConfigurationComparator();
assertTrue("Configurations are not equal", comp.compare(config, copy));
}