Changeset 2448 in josm for trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java

Timestamp:

2009-11-14T17:59:10+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed #3352: History doesn't get invalidated on upload?
fixed #3912: Extend history dialog to contain the currently modified version
new: zoom to node in list of nodes in history dialog (popup menu)
new: load history of node from node list in history dialog (popup menu or double click)
fixed: close all history dialogs when the number of layers drop to 0
fixed: implemented equals() and hashCode() on SimplePrimitiveId
fixed: history features now usePrimitiveId instead of long.

File:

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

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

@@ -4 +4 @@
 import java.awt.Dimension;
 import java.awt.Point;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.history.History;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;
 import org.openstreetmap.josm.tools.WindowGeometry;
 
-public class HistoryBrowserDialogManager {
+public class HistoryBrowserDialogManager implements LayerChangeListener {
     static private HistoryBrowserDialogManager instance;
     static public HistoryBrowserDialogManager getInstance() {
@@ -22 +27 @@
     protected HistoryBrowserDialogManager() {
         dialogs = new HashMap<Long, HistoryBrowserDialog>();
+        Layer.listeners.add(this);
     }
 
@@ -79 +85 @@
         dialog.dispose();
     }
+
+    /**
+     * Hides and destroys all currently visible history browser dialogs
+     * 
+     */
+    public void hideAll() {
+        ArrayList<HistoryBrowserDialog> dialogs = new ArrayList<HistoryBrowserDialog>();
+        dialogs.addAll(this.dialogs.values());
+        for (HistoryBrowserDialog dialog: dialogs) {
+            dialog.unlinkAsListener();
+            hide(dialog);
+        }
+    }
+
+    public void show(History h) {
+        if (h == null)
+            return;
+        if (existsDialog(h.getId())) {
+            show(h.getId());
+        } else {
+            HistoryBrowserDialog dialog = new HistoryBrowserDialog(h);
+            show(h.getId(), dialog);
+        }
+    }
+
+    /* ----------------------------------------------------------------------------- */
+    /* LayerChangeListener                                                           */
+    /* ----------------------------------------------------------------------------- */
+    public void activeLayerChange(Layer oldLayer, Layer newLayer) {}
+    public void layerAdded(Layer newLayer) {}
+
+    public void layerRemoved(Layer oldLayer) {
+        // remove all history browsers if the number of layers drops to 0
+        //
+        if (Main.map.mapView.getNumLayers() == 0) {
+            hideAll();
+        }
+    }
 }