Changeset 8976 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2015-11-02T10:21:34+01:00 (8 years ago)

Author:

simon04

Message:

fix #12016 - History dialog sometimes incorrectly shows a way as reversed

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/history/TwoColumnDiff.java (modified) (1 diff)
• tools/Diff.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java

@@ -79 +79 @@
         Diff.Change scriptReversed = new Diff(referenceReversed, current).diff_2(false);
         if (scriptReversed == null /* reference and current are identical */
-                || script != null && scriptReversed.deleted + scriptReversed.inserted < script.deleted + script.inserted) {
+                || script != null && scriptReversed.getTotalNumberOfChanges() < script.getTotalNumberOfChanges()) {
             this.referenceReversed = true;
             twoColumnDiffFromScript(scriptReversed, referenceReversed, current, true);

trunk/src/org/openstreetmap/josm/tools/Diff.java

@@ -570 +570 @@
         }
 
+        /**
+         * Returns the number of insertions and deletions of this change as well as
+         * (recursively) the changes linked via {@link #link}.
+         */
+        public int getTotalNumberOfChanges() {
+            return inserted + deleted + (link != null ? link.getTotalNumberOfChanges() : 0);
+        }
+
         @Override
         public String toString() {