Changeset 16592 in josm for trunk

Timestamp:

2020-06-10T22:37:22+02:00 (4 years ago)

Author:

simon04

Message:

HistoryBrowserDialogManager.show: simplify

File:

• trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (modified) (2 diffs)

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

@@ -93 +93 @@
     }
 
-    private void show(long id, HistoryBrowserDialog dialog) {
-        if (dialogs.containsValue(dialog)) {
-            show(id);
-        } else {
-            placeOnScreen(dialog);
-            dialog.setVisible(true);
-            dialogs.put(id, dialog);
-        }
-    }
-
-    private void show(long id) {
-        if (dialogs.containsKey(id)) {
-            dialogs.get(id).toFront();
-        }
-    }
-
     private boolean hasDialogWithCloseUpperLeftCorner(Point p) {
         return dialogs.values().stream()
@@ -166 +150 @@
             return;
         if (existsDialog(h.getId())) {
-            show(h.getId());
+            dialogs.get(h.getId()).toFront();
         } else {
-            show(h.getId(), new HistoryBrowserDialog(h));
+            HistoryBrowserDialog dialog = new HistoryBrowserDialog(h);
+            placeOnScreen(dialog);
+            dialog.setVisible(true);
+            dialogs.put(h.getId(), dialog);
         }
     }