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

Timestamp:

2016-12-08T00:54:43+01:00 (7 years ago)

Author:

Don-vip

Message:

findbugs - SIC_INNER_SHOULD_BE_STATIC_ANON

Location:

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

Files:

• HistoryBrowserDialogManager.java (modified) (3 diffs)
• NodeListViewer.java (modified) (5 diffs)

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

@@ -37 +37 @@
 public final class HistoryBrowserDialogManager implements LayerChangeListener {
 
+    static final class UnloadedHistoryPredicate implements Predicate<PrimitiveId> {
+        private final HistoryDataSet hds = HistoryDataSet.getInstance();
+
+        @Override
+        public boolean test(PrimitiveId p) {
+            History h = hds.getHistory(p);
+            if (h == null)
+                // reload if the history is not in the cache yet
+                return true;
+            else
+                // reload if the history object of the selected object is not in the cache yet
+                return !p.isNew() && h.getByVersion(p.getUniqueId()) == null;
+        }
+    }
+
     private static final String WINDOW_GEOMETRY_PREF = HistoryBrowserDialogManager.class.getName() + ".geometry";
 
     private static HistoryBrowserDialogManager instance;
+
+    private final Map<Long, HistoryBrowserDialog> dialogs;
+
+    private final Predicate<PrimitiveId> unloadedHistoryPredicate = new UnloadedHistoryPredicate();
+
+    private final Predicate<PrimitiveId> notNewPredicate = p -> !p.isNew();
+
+    protected HistoryBrowserDialogManager() {
+        dialogs = new HashMap<>();
+        Main.getLayerManager().addLayerChangeListener(this);
+    }
 
     /**
@@ -50 +76 @@
         }
         return instance;
-    }
-
-    private final Map<Long, HistoryBrowserDialog> dialogs;
-
-    protected HistoryBrowserDialogManager() {
-        dialogs = new HashMap<>();
-        Main.getLayerManager().addLayerChangeListener(this);
     }
 
@@ -211 +230 @@
         Main.worker.submit(r);
     }
-
-    private final Predicate<PrimitiveId> unloadedHistoryPredicate = new Predicate<PrimitiveId>() {
-
-        private HistoryDataSet hds = HistoryDataSet.getInstance();
-
-        @Override
-        public boolean test(PrimitiveId p) {
-            History h = hds.getHistory(p);
-            if (h == null)
-                // reload if the history is not in the cache yet
-                return true;
-            else
-                // reload if the history object of the selected object is not in the cache yet
-                return !p.isNew() && h.getByVersion(p.getUniqueId()) == null;
-        }
-    };
-
-    private final Predicate<PrimitiveId> notNewPredicate = p -> !p.isNew();
 }

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

@@ -44 +44 @@
  *   <li>on the right, it displays the node list for the version at {@link PointInTimeType#CURRENT_POINT_IN_TIME}</li>
  * </ul>
- *
+ * @since 1709
  */
 public class NodeListViewer extends JPanel {
@@ -74 +74 @@
         final NodeListTableColumnModel columnModel = new NodeListTableColumnModel();
         final JTable table = new JTable(tableModel, columnModel);
-        tableModel.addTableModelListener(newReversedChangeListener(table, columnModel));
+        tableModel.addTableModelListener(new ReversedChangeListener(table, columnModel));
         table.setName("table.referencenodelisttable");
         table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
@@ -87 +87 @@
         final NodeListTableColumnModel columnModel = new NodeListTableColumnModel();
         final JTable table = new JTable(tableModel, columnModel);
-        tableModel.addTableModelListener(newReversedChangeListener(table, columnModel));
+        tableModel.addTableModelListener(new ReversedChangeListener(table, columnModel));
         table.setName("table.currentnodelisttable");
         table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
@@ -94 +94 @@
         table.addMouseListener(new DoubleClickAdapter(table));
         return table;
-    }
-
-    protected TableModelListener newReversedChangeListener(final JTable table, final NodeListTableColumnModel columnModel) {
-        return new TableModelListener() {
-            private Boolean reversed;
-            private final String nonReversedText = tr("Nodes") + (table.getFont().canDisplay('\u25bc') ? " \u25bc" : " (1-n)");
-            private final String 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();
-                    }
-                }
-            }
-        };
     }
 
@@ -205 +183 @@
     }
 
+    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();
+                }
+            }
+        }
+    }
+
     static class NodeListPopupMenu extends JPopupMenu {
         private final ZoomToNodeAction zoomToNodeAction;