Changeset 7781 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2014-12-10T21:21:58+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #10830 - enable "show history" action in selection dialog when a single object is selected

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified) (7 diffs)

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

@@ -82 +82 @@
 public class SelectionListDialog extends ToggleDialog  {
     private JList<OsmPrimitive> lstPrimitives;
-    private DefaultListSelectionModel selectionModel  = new DefaultListSelectionModel();
-    private SelectionListModel model = new SelectionListModel(selectionModel);
-
-    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();
-    private SelectInRelationListAction actSetRelationSelection = new SelectInRelationListAction();
-    private EditRelationAction actEditRelationSelection = new EditRelationAction();
-    private DownloadSelectedIncompleteMembersAction actDownloadSelectedIncompleteMembers = new DownloadSelectedIncompleteMembersAction();
+    private final DefaultListSelectionModel selectionModel = new DefaultListSelectionModel();
+    private final SelectionListModel model = new SelectionListModel(selectionModel);
+
+    private final SelectAction actSelect = new SelectAction();
+    private final SearchAction actSearch = new SearchAction();
+    private final ShowHistoryAction actShowHistory = new ShowHistoryAction();
+    private final ZoomToJOSMSelectionAction actZoomToJOSMSelection = new ZoomToJOSMSelectionAction();
+    private final ZoomToListSelection actZoomToListSelection = new ZoomToListSelection();
+    private final SelectInRelationListAction actSetRelationSelection = new SelectInRelationListAction();
+    private final EditRelationAction actEditRelationSelection = new EditRelationAction();
+    private final DownloadSelectedIncompleteMembersAction actDownloadSelIncompleteMembers = new DownloadSelectedIncompleteMembersAction();
 
     /** the popup menu and its handler */
@@ -169 +169 @@
     public void showNotify() {
         MapView.addEditLayerChangeListener(model);
+        SelectionEventManager.getInstance().addSelectionListener(actShowHistory, FireMode.IN_EDT_CONSOLIDATED);
         SelectionEventManager.getInstance().addSelectionListener(model, FireMode.IN_EDT_CONSOLIDATED);
         DatasetEventManager.getInstance().addDatasetListener(model, FireMode.IN_EDT);
@@ -185 +186 @@
         MapView.removeEditLayerChangeListener(actSearch);
         MapView.removeEditLayerChangeListener(model);
+        SelectionEventManager.getInstance().removeSelectionListener(actShowHistory);
         SelectionEventManager.getInstance().removeSelectionListener(model);
         DatasetEventManager.getInstance().removeDatasetListener(model);
@@ -237 +239 @@
         handler.addAction(actEditRelationSelection);
         handler.addSeparator();
-        handler.addAction(actDownloadSelectedIncompleteMembers);
+        handler.addAction(actDownloadSelIncompleteMembers);
         return handler;
     }
@@ -348 +350 @@
      * The action for showing history information of the current history item.
      */
-    class ShowHistoryAction extends AbstractAction implements ListSelectionListener {
+    class ShowHistoryAction extends AbstractAction implements ListSelectionListener, SelectionChangedListener {
         /**
          * Constructs a new {@code ShowHistoryAction}.
@@ -356 +358 @@
             putValue(SHORT_DESCRIPTION, tr("Display the history of the selected objects."));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "history"));
-            updateEnabledState();
+            updateEnabledState(model.getSize());
         }
 
@@ -362 +364 @@
         public void actionPerformed(ActionEvent e) {
             Collection<OsmPrimitive> sel = model.getSelected();
-            if (sel.isEmpty())return;
+            if (sel.isEmpty() && model.getSize() != 1) {
+                return;
+            } else if (sel.isEmpty()) {
+                sel = Collections.singleton(model.getElementAt(0));
+            }
             HistoryBrowserDialogManager.getInstance().showHistory(sel);
         }
 
-        protected void updateEnabledState() {
-            setEnabled(!model.getSelected().isEmpty());
+        protected void updateEnabledState(int osmSelectionSize) {
+            // See #10830 - allow to click on history button is a single object is selected, even if not selected again in the list
+            setEnabled(!model.getSelected().isEmpty() || osmSelectionSize == 1);
         }
 
         @Override
         public void valueChanged(ListSelectionEvent e) {
-            updateEnabledState();
+            updateEnabledState(model.getSize());
+        }
+
+        @Override
+        public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+            updateEnabledState(newSelection.size());
         }
     }