Changeset 17921 in josm for trunk

Timestamp:

2021-06-02T23:14:11+02:00 (3 years ago)

Author:

simon04

Message:

fix #18697 - Revert "Simplify HistoryViewerPanel.buildTable"

This reverts commit r15772

Location:

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

Files:

• HistoryViewerPanel.java (modified) (3 diffs)
• NodeListViewer.java (modified) (2 diffs)
• RelationMemberListViewer.java (modified) (2 diffs)
• TagInfoViewer.java (modified) (1 diff)

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

@@ -43 +43 @@
     }
 
-    protected abstract JTable buildTable(PointInTimeType pointInTimeType);
+    protected abstract JTable buildReferenceTable();
+
+    protected abstract JTable buildCurrentTable();
 
     private void build() {
@@ -84 +86 @@
         gc.fill = GridBagConstraints.BOTH;
         gc.anchor = GridBagConstraints.NORTHWEST;
-        add(embedInScrollPane(buildTable(PointInTimeType.REFERENCE_POINT_IN_TIME)), gc);
+        add(embedInScrollPane(buildReferenceTable()), gc);
 
         gc.gridx = 1;
@@ -94 +96 @@
         gc.fill = GridBagConstraints.BOTH;
         gc.anchor = GridBagConstraints.NORTHWEST;
-        add(embedInScrollPane(buildTable(PointInTimeType.CURRENT_POINT_IN_TIME)), gc);
+        add(embedInScrollPane(buildCurrentTable()), gc);
     }
 

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

@@ -38 +38 @@
 
     @Override
-    protected JTable buildTable(PointInTimeType pointInTimeType) {
+    protected JTable buildReferenceTable() {
+        return buildTable(PointInTimeType.REFERENCE_POINT_IN_TIME, "table.referencenodelisttable");
+    }
+
+    @Override
+    protected JTable buildCurrentTable() {
+        return buildTable(PointInTimeType.CURRENT_POINT_IN_TIME, "table.currentnodelisttable");
+    }
+
+    private JTable buildTable(PointInTimeType pointInTimeType, String name) {
         final DiffTableModel tableModel = model.getNodeListTableModel(pointInTimeType);
         final NodeListTableColumnModel columnModel = new NodeListTableColumnModel();
@@ -44 +53 @@
         TableHelper.setFont(table, getClass());
         tableModel.addTableModelListener(new ReversedChangeListener(table, columnModel, tr("The nodes of this way are in reverse order")));
+        table.setName(name);
         table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         selectionSynchronizer.participateInSynchronizedSelection(table.getSelectionModel());

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

@@ -29 +29 @@
 
     @Override
-    protected JTable buildTable(PointInTimeType pointInTimeType) {
+    protected JTable buildReferenceTable() {
+        return buildTable(PointInTimeType.REFERENCE_POINT_IN_TIME, "table.referencememberlisttable");
+    }
+
+    @Override
+    protected JTable buildCurrentTable() {
+        return buildTable(PointInTimeType.CURRENT_POINT_IN_TIME, "table.currentmemberlisttable");
+    }
+
+    private JTable buildTable(PointInTimeType pointInTimeType, String name) {
         final DiffTableModel tableModel = model.getRelationMemberTableModel(pointInTimeType);
         final RelationMemberTableColumnModel columnModel = new RelationMemberTableColumnModel();
@@ -36 +45 @@
         tableModel.addTableModelListener(new ReversedChangeListener(
                 table, columnModel, tr("The members of this relation are in reverse order")));
+        table.setName(name);
         table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         selectionSynchronizer.participateInSynchronizedSelection(table.getSelectionModel());

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

@@ -62 +62 @@
 
     @Override
-    protected JTable buildTable(PointInTimeType pointInTime) {
+    protected JTable buildReferenceTable() {
+        return buildTable(PointInTimeType.REFERENCE_POINT_IN_TIME);
+    }
+
+    @Override
+    protected JTable buildCurrentTable() {
+        return buildTable(PointInTimeType.CURRENT_POINT_IN_TIME);
+    }
+
+    private JTable buildTable(PointInTimeType pointInTime) {
         TagTableModel tagTableModel = model.getTagTableModel(pointInTime);
         JTable table = new JTable(tagTableModel, new TagTableColumnModel());