SF.net SVN: xmlunit: [211] trunk/xmlunit/src/java/org/custommonkey/xmlunit/ DifferenceEngine.java

[<bo...@us...>]

Revision: 211
          http://xmlunit.svn.sourceforge.net/xmlunit/?rev=211&view=rev
Author:   bodewig
Date:     2007-05-18 03:37:41 -0700 (Fri, 18 May 2007)

Log Message:
-----------
minor refactoring

Modified Paths:
--------------
    trunk/xmlunit/src/java/org/custommonkey/xmlunit/DifferenceEngine.java

Modified: trunk/xmlunit/src/java/org/custommonkey/xmlunit/DifferenceEngine.java
===================================================================
--- trunk/xmlunit/src/java/org/custommonkey/xmlunit/DifferenceEngine.java	2007-05-18 05:25:53 UTC (rev 210)
+++ trunk/xmlunit/src/java/org/custommonkey/xmlunit/DifferenceEngine.java	2007-05-18 10:37:41 UTC (rev 211)
@@ -69,6 +69,7 @@
 public class DifferenceEngine implements DifferenceConstants {
     private static final String NULL_NODE = "null";
     private static final String NOT_NULL_NODE = "not null";
+    private static final String ATTRIBUTE_ABSENT = "[attribute absent]";
     private final ComparisonController controller;
     private final XpathNodeTracker controlTracker;
     private final XpathNodeTracker testTracker;
@@ -485,11 +486,11 @@
                                   NamedNodeMap testAttr,
                                   DifferenceListener listener)
         throws DifferenceFoundException {
-        ArrayList allTestAttrs = new ArrayList();
+        ArrayList unmatchedTestAttrs = new ArrayList();
         for (int i=0; i < testAttr.getLength(); ++i) {
             Attr nextAttr = (Attr) testAttr.item(i);
             if (!isXMLNSAttribute(nextAttr)) {
-                allTestAttrs.add(nextAttr);
+                unmatchedTestAttrs.add(nextAttr);
             }
         }
         
@@ -510,7 +511,7 @@
                 }
 
                 if (compareTo != null) {
-                    allTestAttrs.remove(compareTo);
+                    unmatchedTestAttrs.remove(compareTo);
                 }
 
                 if (isRecognizedXMLSchemaInstanceAttribute(nextAttr)) {
@@ -523,7 +524,7 @@
 
                     if (!XMLUnit.getIgnoreAttributeOrder()) {
                         Attr attributeItem = (Attr) testAttr.item(i);
-                        String testAttrName = "[attribute absent]";
+                        String testAttrName = ATTRIBUTE_ABSENT;
                         if (attributeItem != null) {
                             testAttrName =
                                 getUnNamespacedNodeName(attributeItem);
@@ -538,7 +539,7 @@
             }
         }
 
-        for (Iterator iter = allTestAttrs.iterator(); iter.hasNext(); ) {
+        for (Iterator iter = unmatchedTestAttrs.iterator(); iter.hasNext(); ) {
             Attr nextAttr = (Attr) iter.next();
             if (isRecognizedXMLSchemaInstanceAttribute(nextAttr)) {
                 compareRecognizedXMLSchemaInstanceAttribute(null, nextAttr,
@@ -616,8 +617,8 @@
             testTracker.visited(test);
         }
         
-        compare(control != null ? control.getValue() : "[not specified]",
-                test != null ? test.getValue() : "[not specified]",
+        compare(control != null ? control.getValue() : ATTRIBUTE_ABSENT,
+                test != null ? test.getValue() : ATTRIBUTE_ABSENT,
                 control, test, listener, d);
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.