Changeset 7750 in josm

Timestamp:

2014-11-26T21:44:56+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #6909 - remove history toggle dialog in favour of a new history button in selection toggle dialog

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapFrame.java (modified) (2 diffs)
• dialogs/HistoryDialog.java (deleted)
• dialogs/SelectionListDialog.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/gui/MapFrame.java

@@ -64 +64 @@
 import org.openstreetmap.josm.gui.dialogs.DialogsPanel;
 import org.openstreetmap.josm.gui.dialogs.FilterDialog;
-import org.openstreetmap.josm.gui.dialogs.HistoryDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.MapPaintDialog;
@@ -239 +238 @@
         addToggleDialog(new CommandStackDialog());
         addToggleDialog(new UserListDialog());
-        addToggleDialog(new HistoryDialog(), true);
         addToggleDialog(conflictDialog = new ConflictDialog());
         addToggleDialog(validatorDialog = new ValidatorDialog());

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -64 +64 @@
 import org.openstreetmap.josm.gui.PopupMenuHandler;
 import org.openstreetmap.josm.gui.SideButton;
+import org.openstreetmap.josm.gui.history.HistoryBrowserDialogManager;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -86 +87 @@
     private SelectAction actSelect = new SelectAction();
     private SearchAction actSearch = new SearchAction();
+    private ShowHistoryAction actShowHistory = new ShowHistoryAction();
     private ZoomToJOSMSelectionAction actZoomToJOSMSelection = new ZoomToJOSMSelectionAction();
     private ZoomToListSelection actZoomToListSelection = new ZoomToListSelection();
@@ -104 +106 @@
         lstPrimitives.setSelectionModel(selectionModel);
         lstPrimitives.setCellRenderer(new OsmPrimitivRenderer());
-        lstPrimitives.setTransferHandler(null); // Fix #6290. Drag & Drop is not supported anyway and Copy/Paste is better propagated to main window
+        // Fix #6290. Drag & Drop is not supported anyway and Copy/Paste is better propagated to main window
+        lstPrimitives.setTransferHandler(null);
+
+        lstPrimitives.getSelectionModel().addListSelectionListener(actSelect);
+        lstPrimitives.getSelectionModel().addListSelectionListener(actShowHistory);
 
         // the select action
         final SideButton selectButton = new SideButton(actSelect);
-        lstPrimitives.getSelectionModel().addListSelectionListener(actSelect);
         selectButton.createArrow(new ActionListener() {
             @Override
@@ -126 +131 @@
 
         createLayout(lstPrimitives, true, Arrays.asList(new SideButton[] {
-            selectButton, searchButton
+            selectButton, searchButton, new SideButton(actShowHistory)
         }));
     }
@@ -280 +285 @@
      */
     static class SearchAction extends AbstractAction implements EditLayerChangeListener {
+        /**
+         * Constructs a new {@code SearchAction}.
+         */
         public SearchAction() {
             putValue(NAME, tr("Search"));
@@ -293 +301 @@
         }
 
-        public void updateEnabledState() {
+        protected void updateEnabledState() {
             setEnabled(Main.main != null && Main.main.hasEditLayer());
         }
@@ -308 +316 @@
      */
     class SelectAction extends AbstractAction implements ListSelectionListener {
+        /**
+         * Constructs a new {@code SelectAction}.
+         */
         public SelectAction() {
             putValue(NAME, tr("Select"));
@@ -324 +335 @@
         }
 
-        public void updateEnabledState() {
+        protected void updateEnabledState() {
+            setEnabled(!model.getSelected().isEmpty());
+        }
+
+        @Override
+        public void valueChanged(ListSelectionEvent e) {
+            updateEnabledState();
+        }
+    }
+
+    /**
+     * The action for showing history information of the current history item.
+     */
+    class ShowHistoryAction extends AbstractAction implements ListSelectionListener {
+        /**
+         * Constructs a new {@code ShowHistoryAction}.
+         */
+        public ShowHistoryAction() {
+            putValue(NAME, tr("History"));
+            putValue(SHORT_DESCRIPTION, tr("Display the history of the selected objects."));
+            putValue(SMALL_ICON, ImageProvider.get("dialogs", "history"));
+            updateEnabledState();
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            Collection<OsmPrimitive> sel = model.getSelected();
+            if (sel.isEmpty())return;
+            HistoryBrowserDialogManager.getInstance().showHistory(sel);
+        }
+
+        protected void updateEnabledState() {
             setEnabled(!model.getSelected().isEmpty());
         }
@@ -377 +419 @@
      *
      */
-    class ZoomToListSelection extends AbstractAction implements ListSelectionListener{
+    class ZoomToListSelection extends AbstractAction implements ListSelectionListener {
+        /**
+         * Constructs a new {@code ZoomToListSelection}.
+         */
         public ZoomToListSelection() {
             putValue(NAME, tr("Zoom to selected element(s)"));
@@ -397 +442 @@
         }
 
-        public void updateEnabledState() {
+        protected void updateEnabledState() {
             setEnabled(!model.getSelected().isEmpty());
         }