CVS: jcontainer/loom/engine/src/java/org/jcontainer/loom/components/configuration/merger ConfigurationSplitter.java,1.3,1.4

Peter Donald <pdonald-yCVjj/[email protected]> Wed, 3 Dec 2003 03:11:53 -0600
Newsgroups gmane.comp.java.jcontainer.cvs
Message-ID <[email protected]>
Update of /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/configuration/merger
In directory hogshead.codehaus.org:/tmp/cvs-serv16736/engine/src/java/org/jcontainer/loom/components/configuration/merger

Modified Files:
	ConfigurationSplitter.java 
Log Message:
Use equals implementation in ConfigurationUtil and remove unsed version in ConfigUtil


Index: ConfigurationSplitter.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/configuration/merger/ConfigurationSplitter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ConfigurationSplitter.java	5 Oct 2003 03:25:08 -0000	1.3
+++ ConfigurationSplitter.java	3 Dec 2003 09:11:18 -0000	1.4
@@ -90,6 +90,7 @@
 import org.jcontainer.dna.Configuration;
 import org.jcontainer.dna.ConfigurationException;
 import org.jcontainer.dna.impl.DefaultConfiguration;
+import org.jcontainer.dna.impl.ConfigurationUtil;
 import org.jcontainer.loom.components.util.ConfigUtil;
 
 /**
@@ -222,7 +223,7 @@
             {
                 layer.addChild( kids[ i ] );
             }
-            else if( !ConfigUtil.equals( kids[ i ], mergedWith ) )
+            else if( !ConfigurationUtil.equals( kids[ i ], mergedWith ) )
             {
                 final DefaultConfiguration layerChild = doSplit( kids[ i ], mergedWith, keyAttr );