Changeset 7949 in josm for trunk/src

Timestamp:

2015-01-10T00:38:05+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #10933 - keep the same selection in selection dialog after cliking the "select" button + code refactoring/cleanup

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AbstractSelectAction.java (added)
• gui/dialogs/ConflictDialog.java (modified) (2 diffs)
• gui/dialogs/SelectionListDialog.java (modified) (5 diffs)
• gui/dialogs/ValidatorDialog.java (modified) (2 diffs)

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

@@ -32 +32 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.AbstractSelectAction;
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.conflict.Conflict;
@@ -441 +442 @@
     }
 
-    class SelectAction extends AbstractAction implements ListSelectionListener {
-        public SelectAction() {
-            putValue(NAME, tr("Select"));
-            putValue(SHORT_DESCRIPTION,  tr("Set the selected elements on the map to the selected items in the list above."));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs", "select"));
+    class SelectAction extends AbstractSelectAction implements ListSelectionListener {
+        private SelectAction() {
             putValue("help", ht("/Dialog/ConflictList#SelectAction"));
         }

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

@@ -34 +34 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.AbstractSelectAction;
 import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.relation.DownloadSelectedIncompleteMembersAction;
@@ -318 +319 @@
      * of this dialog
      */
-    class SelectAction extends AbstractAction implements ListSelectionListener {
+    class SelectAction extends AbstractSelectAction implements ListSelectionListener {
         /**
          * Constructs a new {@code SelectAction}.
          */
         public SelectAction() {
-            putValue(NAME, tr("Select"));
-            putValue(SHORT_DESCRIPTION,  tr("Set the selected elements on the map to the selected items in the list above."));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs","select"));
             updateEnabledState();
         }
@@ -336 +334 @@
             if (editLayer == null) return;
             editLayer.data.setSelected(sel);
+            model.selectionModel.setSelectionInterval(0, sel.size()-1);
         }
 
@@ -722 +721 @@
 
         @Override
-        public void primitivesAdded(PrimitivesAddedEvent event) {/* ignored - handled by SelectionChangeListener */}
-        @Override
-        public void primitivesRemoved(PrimitivesRemovedEvent event) {/* ignored - handled by SelectionChangeListener*/}
+        public void primitivesAdded(PrimitivesAddedEvent event) {
+            /* ignored - handled by SelectionChangeListener */
+        }
+
+        @Override
+        public void primitivesRemoved(PrimitivesRemovedEvent event) {
+            /* ignored - handled by SelectionChangeListener*/
+        }
     }
 
@@ -736 +740 @@
 
         public SearchMenuItem(SearchSetting s) {
-            super(Utils.shortenString(s.toString(), org.openstreetmap.josm.actions.search.SearchAction.MAX_LENGTH_SEARCH_EXPRESSION_DISPLAY));
+            super(Utils.shortenString(s.toString(),
+                    org.openstreetmap.josm.actions.search.SearchAction.MAX_LENGTH_SEARCH_EXPRESSION_DISPLAY));
             this.s = s;
             addActionListener(this);

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

@@ -28 +28 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.AbstractSelectAction;
 import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.relation.EditRelationAction;
@@ -102 +103 @@
         List<SideButton> buttons = new LinkedList<>();
 
-        selectButton = new SideButton(new AbstractAction() {
-            {
-                putValue(NAME, tr("Select"));
-                putValue(SHORT_DESCRIPTION,  tr("Set the selected elements on the map to the selected items in the list above."));
-                putValue(SMALL_ICON, ImageProvider.get("dialogs","select"));
-            }
+        selectButton = new SideButton(new AbstractSelectAction() {
             @Override
             public void actionPerformed(ActionEvent e) {