Changeset 16456 in josm for trunk/src/org/openstreetmap/josm/gui/history

Timestamp:

2020-05-17T22:19:47+02:00 (4 years ago)

Author:

simon04

Message:

fix #19161 - History/RelationMemberListViewer: show reversed diff indicator

Location:

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

Files:

• NodeListViewer.java (modified) (3 diffs)
• RelationMemberListViewer.java (modified) (2 diffs)
• ReversedChangeListener.java (added)

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

@@ -13 +13 @@
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
-import javax.swing.event.TableModelEvent;
-import javax.swing.event.TableModelListener;
 
 import org.openstreetmap.josm.actions.AutoScaleAction;
@@ -56 +54 @@
         final NodeListTableColumnModel columnModel = new NodeListTableColumnModel();
         final JTable table = new JTable(tableModel, columnModel);
-        tableModel.addTableModelListener(new ReversedChangeListener(table, columnModel));
+        tableModel.addTableModelListener(new ReversedChangeListener(table, columnModel, tr("The nodes of this way are in reverse order")));
         table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         selectionSynchronizer.participateInSynchronizedSelection(table.getSelectionModel());
@@ -62 +60 @@
         table.addMouseListener(new DoubleClickAdapter(table));
         return table;
-    }
-
-    static final class ReversedChangeListener implements TableModelListener {
-        private final NodeListTableColumnModel columnModel;
-        private final JTable table;
-        private Boolean reversed;
-        private final String nonReversedText;
-        private final String reversedText;
-
-        ReversedChangeListener(JTable table, NodeListTableColumnModel columnModel) {
-            this.columnModel = columnModel;
-            this.table = table;
-            nonReversedText = tr("Nodes") + (table.getFont().canDisplay('\u25bc') ? " \u25bc" : " (1-n)");
-            reversedText = tr("Nodes") + (table.getFont().canDisplay('\u25b2') ? " \u25b2" : " (n-1)");
-        }
-
-        @Override
-        public void tableChanged(TableModelEvent e) {
-            if (e.getSource() instanceof DiffTableModel) {
-                final DiffTableModel mod = (DiffTableModel) e.getSource();
-                if (reversed == null || reversed != mod.isReversed()) {
-                    reversed = mod.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/RelationMemberListViewer.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.history;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Rectangle;
@@ -21 +23 @@
     @Override
     protected JTable buildTable(PointInTimeType pointInTimeType) {
-        JTable table = new JTable(
-                model.getRelationMemberTableModel(pointInTimeType),
-                new RelationMemberTableColumnModel());
+        DiffTableModel tableModel = model.getRelationMemberTableModel(pointInTimeType);
+        RelationMemberTableColumnModel columnModel = new RelationMemberTableColumnModel();
+        JTable table = new JTable(tableModel, columnModel);
+        tableModel.addTableModelListener(new ReversedChangeListener(
+                table, columnModel, tr("The members of this relation are in reverse order")));
         table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         selectionSynchronizer.participateInSynchronizedSelection(table.getSelectionModel());