SF.net SVN: xmlunit:[478] trunk/xmlunit/src/main

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

Revision: 478
          http://xmlunit.svn.sourceforge.net/xmlunit/?rev=478&view=rev
Author:   bodewig
Date:     2010-09-14 10:25:52 +0000 (Tue, 14 Sep 2010)

Log Message:
-----------
don't need compareDontFire anymore

Modified Paths:
--------------
    trunk/xmlunit/src/main/java-core/net/sf/xmlunit/diff/AbstractDifferenceEngine.java
    trunk/xmlunit/src/main/net-core/diff/AbstractDifferenceEngine.cs

Modified: trunk/xmlunit/src/main/java-core/net/sf/xmlunit/diff/AbstractDifferenceEngine.java
===================================================================
--- trunk/xmlunit/src/main/java-core/net/sf/xmlunit/diff/AbstractDifferenceEngine.java	2010-09-14 10:23:36 UTC (rev 477)
+++ trunk/xmlunit/src/main/java-core/net/sf/xmlunit/diff/AbstractDifferenceEngine.java	2010-09-14 10:25:52 UTC (rev 478)
@@ -82,23 +82,16 @@
      * listeners and returns the outcome.
      */
     protected final ComparisonResult compare(Comparison comp) {
-        ComparisonResult altered = compareDontFire(comp);
-        listeners.fireComparisonPerformed(comp, altered);
-        return altered;
-    }
-
-    /**
-     * Compares the detail values for object equality, lets the
-     * difference evaluator evaluate the result
-     */
-    protected final ComparisonResult compareDontFire(Comparison comp) {
         Object controlValue = comp.getControlDetails().getValue();
         Object testValue = comp.getTestDetails().getValue();
         boolean equal = controlValue == null
             ? testValue == null : controlValue.equals(testValue);
         ComparisonResult initial =
             equal ? ComparisonResult.EQUAL : ComparisonResult.DIFFERENT;
-        return getDifferenceEvaluator().evaluate(comp, initial);
+        ComparisonResult altered =
+            getDifferenceEvaluator().evaluate(comp, initial);
+        listeners.fireComparisonPerformed(comp, altered);
+        return altered;
     }
 
     protected static String getXPath(XPathContext ctx) {

Modified: trunk/xmlunit/src/main/net-core/diff/AbstractDifferenceEngine.cs
===================================================================
--- trunk/xmlunit/src/main/net-core/diff/AbstractDifferenceEngine.cs	2010-09-14 10:23:36 UTC (rev 477)
+++ trunk/xmlunit/src/main/net-core/diff/AbstractDifferenceEngine.cs	2010-09-14 10:25:52 UTC (rev 478)
@@ -68,23 +68,15 @@
         /// listeners and returns the outcome.
         /// </summary>
         protected internal ComparisonResult Compare(Comparison comp) {
-            ComparisonResult altered = CompareDontFire(comp);
-            FireComparisonPerformed(comp, altered);
-            return altered;
-        }
-
-        /// <summary>
-        /// Compares the detail values for object equality, lets the
-        /// difference evaluator evaluate the result.
-        /// </summary>
-        protected internal ComparisonResult CompareDontFire(Comparison comp) {
             object controlValue = comp.ControlDetails.Value;
             object testValue = comp.TestDetails.Value;
             bool equal = controlValue == null
                 ? testValue == null : controlValue.Equals(testValue);
             ComparisonResult initial =
                 equal ? ComparisonResult.EQUAL : ComparisonResult.DIFFERENT;
-            return DifferenceEvaluator(comp, initial);
+            ComparisonResult altered = DifferenceEvaluator(comp, initial);
+            FireComparisonPerformed(comp, altered);
+            return altered;
         }
 
         private void FireComparisonPerformed(Comparison comp,


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