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

Timestamp:

2009-11-14T17:59:10+01:00 (16 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/HistoryBrowserDialog.java (modified) (9 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.history;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -17 +18 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.history.History;
 import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
@@ -24 +26 @@
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 /**
@@ -35 +36 @@
     /** the embedded browser */
     private HistoryBrowser browser;
+    private CloseAction closeAction;
 
     /**
@@ -44 +46 @@
         String title = "";
         switch(h.getEarliest().getType()) {
-            case NODE:  title = marktr("History for node {0}"); break;
-            case WAY: title = marktr("History for way {0}"); break;
-            case RELATION:  title = marktr("History for relation {0}"); break;
+        case NODE:  title = marktr("History for node {0}"); break;
+        case WAY: title = marktr("History for way {0}"); break;
+        case RELATION:  title = marktr("History for relation {0}"); break;
         }
         setTitle(tr(
@@ -70 +72 @@
         pnl.add(btn);
 
-        btn = new SideButton(new CloseAction());
+        btn = new SideButton(closeAction = new CloseAction());
         btn.setName("btn.close");
         pnl.add(btn);
@@ -106 +108 @@
     }
 
-    public void historyUpdated(HistoryDataSet source, long primitiveId) {
-        if (primitiveId == browser.getHistory().getId()) {
+    public void historyUpdated(HistoryDataSet source, PrimitiveId primitiveId) {
+        if (primitiveId == null) {
+            browser.populate(source.getHistory(browser.getHistory().getPrimitmiveId()));
+        } else if (primitiveId.equals(browser.getHistory().getPrimitmiveId())) {
             browser.populate(source.getHistory(primitiveId));
-        } else if (primitiveId == 0) {
-            browser.populate(source.getHistory(browser.getHistory().getId()));
         }
+    }
+
+    public void unlinkAsListener() {
+        getHistoryBrowser().getModel().unlinkAsListener();
     }
 
@@ -121 +127 @@
         }
 
-        public void actionPerformed(ActionEvent e) {
+        public void run() {
+            getHistoryBrowser().getModel().unlinkAsListener();
             HistoryDataSet.getInstance().removeHistoryDataSetListener(HistoryBrowserDialog.this);
             HistoryBrowserDialogManager.getInstance().hide(HistoryBrowserDialog.this);
+        }
+
+        public void actionPerformed(ActionEvent e) {
+            run();
         }
     }
@@ -144 +155 @@
         @Override
         public void windowClosing(WindowEvent e) {
-            HistoryDataSet.getInstance().removeHistoryDataSetListener(HistoryBrowserDialog.this);
-            HistoryBrowserDialogManager.getInstance().hide(HistoryBrowserDialog.this);
+            closeAction.run();
         }
     }