Changeset 15772 in josm

Timestamp:

2020-01-26T18:26:20+01:00 (5 years ago)

Author:

simon04

Message:

Simplify HistoryViewerPanel.buildTable

Location:

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

Files:

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

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

@@ -30 +30 @@
     }
 
-    protected abstract JTable buildReferenceTable();
-
-    protected abstract JTable buildCurrentTable();
+    protected abstract JTable buildTable(PointInTimeType pointInTimeType);
 
     private void build() {
@@ -73 +71 @@
         gc.fill = GridBagConstraints.BOTH;
         gc.anchor = GridBagConstraints.NORTHWEST;
-        add(embedInScrollPane(buildReferenceTable()), gc);
+        add(embedInScrollPane(buildTable(PointInTimeType.REFERENCE_POINT_IN_TIME)), gc);
 
         gc.gridx = 1;
@@ -83 +81 @@
         gc.fill = GridBagConstraints.BOTH;
         gc.anchor = GridBagConstraints.NORTHWEST;
-        add(embedInScrollPane(buildCurrentTable()), gc);
+        add(embedInScrollPane(buildTable(PointInTimeType.CURRENT_POINT_IN_TIME)), gc);
     }
 }

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

@@ -52 +52 @@
 
     @Override
-    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) {
+    protected JTable buildTable(PointInTimeType pointInTimeType) {
         final DiffTableModel tableModel = model.getNodeListTableModel(pointInTimeType);
         final NodeListTableColumnModel columnModel = new NodeListTableColumnModel();
         final JTable table = new JTable(tableModel, columnModel);
         tableModel.addTableModelListener(new ReversedChangeListener(table, columnModel));
-        table.setName(name);
         table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         selectionSynchronizer.participateInSynchronizedSelection(table.getSelectionModel());

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

@@ -36 +36 @@
 
     @Override
-    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) {
+    protected JTable buildTable(PointInTimeType pointInTimeType) {
         JTable table = new JTable(
                 model.getRelationMemberTableModel(pointInTimeType),
                 new RelationMemberTableColumnModel());
-        table.setName(name);
         table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         selectionSynchronizer.participateInSynchronizedSelection(table.getSelectionModel());

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

@@ -59 +59 @@
 
     @Override
-    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) {
+    protected JTable buildTable(PointInTimeType pointInTime) {
         TagTableModel tagTableModel = model.getTagTableModel(pointInTime);
         JTable table = new JTable(tagTableModel, new TagTableColumnModel());