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

Timestamp:

2015-08-31T19:39:14+02:00 (9 years ago)

Author:

simon04

Message:

see #11819 - History dialog: show reversed nodes in yellow, show explanatory tooltip on column header

Location:

trunk/src/org/openstreetmap/josm/gui/history

Files:

• NodeListViewer.java (modified) (1 diff)
• TwoColumnDiff.java (modified) (5 diffs)

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

@@ -100 +100 @@
                         reversed = model.isReversed();
                         columnModel.getColumn(0).setHeaderValue(reversed ? reversedText : nonReversedText);
+                        table.getTableHeader().setToolTipText(
+                                reversed ? tr("The nodes of this way are in reverse order") : null);
                         table.getTableHeader().repaint();
                     }

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

@@ -35 +35 @@
             DELETED(new Color(255, 197, 197)),
             CHANGED(new Color(255, 234, 213)),
+            REVERSED(new Color(255, 255, 204)),
             SAME(new Color(234, 234, 234)),
             EMPTY(new Color(234, 234, 234));
@@ -80 +81 @@
                 || script != null && scriptReversed.deleted + scriptReversed.inserted < script.deleted + script.inserted) {
             this.referenceReversed = true;
-            twoColumnDiffFromScript(scriptReversed, referenceReversed, current);
+            twoColumnDiffFromScript(scriptReversed, referenceReversed, current, true);
         } else {
             this.referenceReversed = false;
-            twoColumnDiffFromScript(script, reference, current);
+            twoColumnDiffFromScript(script, reference, current, false);
         }
     }
@@ -91 +92 @@
      * This method expands this script into a full two column description.
      */
-    private void twoColumnDiffFromScript(Diff.Change script, Object[] a, Object[] b) {
+    private void twoColumnDiffFromScript(Diff.Change script, Object[] a, Object[] b, final boolean reversed) {
         int ia = 0;
         int ib = 0;
@@ -99 +100 @@
             int inserted = script.inserted;
             while (ia < script.line0 && ib < script.line1) {
-                Item cell = new Item(DiffItemType.SAME, a[ia]);
-                referenceDiff.add(cell);
-                currentDiff.add(cell);
-                ia++;
-                ib++;
+                referenceDiff.add(new Item(reversed ? DiffItemType.REVERSED : DiffItemType.SAME, a[ia++]));
+                currentDiff.add(new Item(DiffItemType.SAME, b[ib++]));
             }
 
@@ -123 +121 @@
         }
         while (ia < a.length && ib < b.length) {
-            referenceDiff.add(new Item(DiffItemType.SAME, a[ia++]));
+            referenceDiff.add(new Item(reversed ? DiffItemType.REVERSED : DiffItemType.SAME, a[ia++]));
             currentDiff.add(new Item(DiffItemType.SAME, b[ib++]));
         }