Changeset 16416 in josm for trunk/src/org/openstreetmap/josm/gui/preferences

Timestamp:

2020-05-15T22:39:18+02:00 (4 years ago)

Author:

simon04

Message:

fix #19234 - ToolbarPreferences: move up/down all selected entries

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -49 +49 @@
 import javax.swing.JTree;
 import javax.swing.ListCellRenderer;
+import javax.swing.ListSelectionModel;
 import javax.swing.MenuElement;
 import javax.swing.TransferHandler;
@@ -71 +72 @@
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.util.ReorderableTableModel;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
@@ -708 +710 @@
                     }
                 } else if ("up".equals(e.getActionCommand())) {
-                    int i = selectedList.getSelectedIndex();
-                    ActionDefinition o = selected.get(i);
-                    if (i != 0) {
-                        selected.remove(i);
-                        selected.add(i-1, o);
-                        selectedList.setSelectedIndex(i-1);
-                    }
+                    selected.moveUp();
                 } else if ("down".equals(e.getActionCommand())) {
-                    int i = selectedList.getSelectedIndex();
-                    ActionDefinition o = selected.get(i);
-                    if (i != selected.size()-1) {
-                        selected.remove(i);
-                        selected.add(i+1, o);
-                        selectedList.setSelectedIndex(i+1);
-                    }
+                    selected.moveDown();
                 }
             }
@@ -753 +743 @@
         }
 
+        private class ActionDefinitionModel extends DefaultListModel<ActionDefinition> implements ReorderableTableModel<ActionDefinition> {
+            @Override
+            public ListSelectionModel getSelectionModel() {
+                return selectedList.getSelectionModel();
+            }
+
+            @Override
+            public int getRowCount() {
+                return getSize();
+            }
+
+            @Override
+            public ActionDefinition getValue(int index) {
+                return getElementAt(index);
+            }
+
+            @Override
+            public ActionDefinition setValue(int index, ActionDefinition value) {
+                return set(index, value);
+            }
+        }
+
         private final Move moveAction = new Move();
 
-        private final DefaultListModel<ActionDefinition> selected = new DefaultListModel<>();
+        private final ActionDefinitionModel selected = new ActionDefinitionModel();
         private final JList<ActionDefinition> selectedList = new JList<>(selected);