Changeset 15226 in josm

Timestamp:

2019-07-07T18:36:38+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #14208 - add dedicated buttons in filter dialog to sort/reverse filters order.

Major overhaul/harmonization of our reorderable/sortable models.

Location:

trunk

Files:

• images/dialogs/reverse.png (moved) (moved from trunk/images/dialogs/relation/reverse.png )
• src/org/openstreetmap/josm/data/ReorderableModel.java (added)
• src/org/openstreetmap/josm/data/SortableModel.java (added)
• src/org/openstreetmap/josm/data/osm/Filter.java (modified) (3 diffs)
• src/org/openstreetmap/josm/data/osm/FilterModel.java (modified) (9 diffs)
• src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java (modified) (12 diffs)
• src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java (modified) (14 diffs)
• src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified) (13 diffs)
• src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified) (16 diffs)
• src/org/openstreetmap/josm/gui/dialogs/relation/actions/ReverseAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/util/ReorderableTableModel.java (added)
• src/org/openstreetmap/josm/gui/util/SortableTableModel.java (added)
• src/org/openstreetmap/josm/gui/util/TableHelper.java (modified) (3 diffs)
• src/org/openstreetmap/josm/tools/ArrayUtils.java (added)

trunk/src/org/openstreetmap/josm/data/osm/Filter.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
+import java.util.Comparator;
 import java.util.Objects;
 
@@ -15 +16 @@
  * @since 2125
  */
-public class Filter extends SearchSetting {
+public class Filter extends SearchSetting implements Comparable<Filter> {
     private static final String version = "1";
 
@@ -167 +168 @@
         return e;
     }
+
+    @Override
+    public int compareTo(Filter o) {
+        return Comparator
+                .<Filter, String>comparing(f -> f.text)
+                .thenComparing(f -> f.mode)
+                .thenComparing(f -> f.caseSensitive)
+                .thenComparing(f -> f.regexSearch)
+                .thenComparing(f -> f.mapCSSSearch)
+                .thenComparing(f -> f.enable)
+                .thenComparing(f -> f.hiding)
+                .thenComparing(f -> f.inverted)
+                .compare(this, o);
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/FilterModel.java

@@ -8 +8 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -16 +17 @@
 import javax.swing.JOptionPane;
 
+import org.openstreetmap.josm.data.SortableModel;
 import org.openstreetmap.josm.data.StructUtils;
 import org.openstreetmap.josm.data.osm.Filter.FilterPreferenceEntry;
@@ -29 +31 @@
  * @since 12400
  */
-public class FilterModel {
+public class FilterModel implements SortableModel<Filter> {
 
     /**
@@ -236 +238 @@
 
     /**
+     * Moves the filters in the given rows by a number of positions.
+     * @param delta negative or positive increment
+     * @param rowIndexes The filter rows
+     * @return true if the filters have been moved down
+     * @since 15226
+     */
+    public boolean moveFilters(int delta, int... rowIndexes) {
+        if (!canMove(delta, filters::size, rowIndexes))
+            return false;
+        doMove(delta, rowIndexes);
+        updateFilterMatcher();
+        return true;
+    }
+
+    /**
      * Moves down the filter in the given row.
      * @param rowIndex The filter row
@@ -241 +258 @@
      */
     public boolean moveDownFilter(int rowIndex) {
-        if (rowIndex >= filters.size() - 1)
-            return false;
-        filters.add(rowIndex + 1, filters.remove(rowIndex));
-        updateFilterMatcher();
-        return true;
+        return moveFilters(1, rowIndex);
     }
 
@@ -254 +267 @@
      */
     public boolean moveUpFilter(int rowIndex) {
-        if (rowIndex <= 0 || rowIndex >= filters.size())
-            return false;
-        filters.add(rowIndex - 1, filters.remove(rowIndex));
-        updateFilterMatcher();
-        return true;
+        return moveFilters(-1, rowIndex);
     }
 
@@ -277 +286 @@
      * @param filter The filter that should be placed in that row
      * @return the filter previously at the specified position
-     */
+     * @deprecated Use {@link #setValue}
+     */
+    @Deprecated
     public Filter setFilter(int rowIndex, Filter filter) {
+        return setValue(rowIndex, filter);
+    }
+
+    @Override
+    public Filter setValue(int rowIndex, Filter filter) {
         Filter result = filters.set(rowIndex, filter);
         updateFilterMatcher();
@@ -288 +304 @@
      * @param rowIndex The row index
      * @return The filter in that row
-     */
+     * @deprecated Use {@link #getValue}
+     */
+    @Deprecated
     public Filter getFilter(int rowIndex) {
+        return getValue(rowIndex);
+    }
+
+    @Override
+    public Filter getValue(int rowIndex) {
         return filters.get(rowIndex);
     }
@@ -418 +441 @@
         return result;
     }
+
+    @Override
+    public void sort() {
+        Collections.sort(filters);
+        updateFilterMatcher();
+    }
+
+    @Override
+    public void reverse() {
+        Collections.reverse(filters);
+        updateFilterMatcher();
+    }
 }

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

@@ -12 +12 @@
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.swing.AbstractAction;
 import javax.swing.DefaultCellEditor;
+import javax.swing.DefaultListSelectionModel;
 import javax.swing.JCheckBox;
 import javax.swing.JTable;
@@ -62 +64 @@
 
     private JTable userTable;
-    private final FilterTableModel filterModel = new FilterTableModel();
-
-    private final EnableFilterAction enableFilterAction;
-    private final HidingFilterAction hidingFilterAction;
+    private final FilterTableModel filterModel = new FilterTableModel(new DefaultListSelectionModel());
+
+    private final AddAction addAction = new AddAction();
+    private final EditAction editAction = new EditAction();
+    private final DeleteAction deleteAction = new DeleteAction();
+    private final MoveUpAction moveUpAction = new MoveUpAction();
+    private final MoveDownAction moveDownAction = new MoveDownAction();
+    private final SortAction sortAction = new SortAction();
+    private final ReverseAction reverseAction = new ReverseAction();
+    private final EnableFilterAction enableFilterAction = new EnableFilterAction();
+    private final HidingFilterAction hidingFilterAction = new HidingFilterAction();
 
     /**
@@ -75 +84 @@
                         KeyEvent.VK_F, Shortcut.ALT_SHIFT), 162);
         build();
-        enableFilterAction = new EnableFilterAction();
-        hidingFilterAction = new HidingFilterAction();
         MultikeyActionsHandler.getInstance().addAction(enableFilterAction);
         MultikeyActionsHandler.getInstance().addAction(hidingFilterAction);
@@ -112 +119 @@
     };
 
+    private abstract class FilterAction extends AbstractAction implements IEnabledStateUpdating {
+
+        FilterAction(String name, String description, String icon) {
+            putValue(NAME, name);
+            putValue(SHORT_DESCRIPTION, description);
+            new ImageProvider("dialogs", icon).getResource().attachImageIcon(this, true);
+        }
+
+        @Override
+        public void updateEnabledState() {
+            setEnabled(!filterModel.getSelectionModel().isSelectionEmpty());
+        }
+    }
+
+    private class AddAction extends FilterAction {
+        AddAction() {
+            super(tr("Add"), tr("Add filter."), /* ICON(dialogs/) */ "add");
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            SearchSetting searchSetting = SearchAction.showSearchDialog(new Filter());
+            if (searchSetting != null) {
+                filterModel.addFilter(new Filter(searchSetting));
+            }
+        }
+
+        @Override
+        public void updateEnabledState() {
+            // Do nothing
+        }
+    }
+
+    private class EditAction extends FilterAction {
+        EditAction() {
+            super(tr("Edit"), tr("Edit filter."), /* ICON(dialogs/) */ "edit");
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            int index = filterModel.getSelectionModel().getMinSelectionIndex();
+            if (index < 0) return;
+            Filter f = filterModel.getValue(index);
+            SearchSetting searchSetting = SearchAction.showSearchDialog(f);
+            if (searchSetting != null) {
+                filterModel.setValue(index, new Filter(searchSetting));
+            }
+        }
+    }
+
+    private class DeleteAction extends FilterAction {
+        DeleteAction() {
+            super(tr("Delete"), tr("Delete filter."), /* ICON(dialogs/) */ "delete");
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            int index = filterModel.getSelectionModel().getMinSelectionIndex();
+            if (index >= 0) {
+                filterModel.removeFilter(index);
+            }
+        }
+    }
+
+    private class MoveUpAction extends FilterAction {
+        MoveUpAction() {
+            super(tr("Up"), tr("Move filter up."), /* ICON(dialogs/) */ "up");
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            int index = userTable.convertRowIndexToModel(userTable.getSelectionModel().getMinSelectionIndex());
+            if (index >= 0 && filterModel.moveUp(index)) {
+                filterModel.getSelectionModel().setSelectionInterval(index-1, index-1);
+            }
+        }
+
+        @Override
+        public void updateEnabledState() {
+            setEnabled(filterModel.canMoveUp());
+        }
+    }
+
+    private class MoveDownAction extends FilterAction {
+        MoveDownAction() {
+            super(tr("Down"), tr("Move filter down."), /* ICON(dialogs/) */ "down");
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            int index = userTable.convertRowIndexToModel(userTable.getSelectionModel().getMinSelectionIndex());
+            if (index >= 0 && filterModel.moveDown(index)) {
+                filterModel.getSelectionModel().setSelectionInterval(index+1, index+1);
+            }
+        }
+
+        @Override
+        public void updateEnabledState() {
+            setEnabled(filterModel.canMoveDown());
+        }
+    }
+
+    private class SortAction extends FilterAction {
+        SortAction() {
+            super(tr("Sort"), tr("Sort filters."), /* ICON(dialogs/) */ "sort");
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            filterModel.sort();
+        }
+
+        @Override
+        public void updateEnabledState() {
+            setEnabled(filterModel.getRowCount() > 1);
+        }
+    }
+
+    private class ReverseAction extends FilterAction {
+        ReverseAction() {
+            super(tr("Reverse"), tr("Reverse the filters order."), /* ICON(dialogs/) */ "reverse");
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            filterModel.reverse();
+        }
+
+        @Override
+        public void updateEnabledState() {
+            setEnabled(filterModel.getRowCount() > 1);
+        }
+    }
+
     /**
      * Builds the GUI.
@@ -120 +261 @@
         userTable.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
         userTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        userTable.setAutoCreateRowSorter(true);
+        userTable.setSelectionModel(filterModel.getSelectionModel());
 
         TableHelper.adjustColumnWidth(userTable, 0, false);
@@ -130 +271 @@
         userTable.setDefaultRenderer(String.class, new StringRenderer());
         userTable.setDefaultEditor(String.class, new DefaultCellEditor(new DisableShortcutsOnFocusGainedTextField()));
-
-        SideButton addButton = new SideButton(new AbstractAction() {
-            {
-                putValue(NAME, tr("Add"));
-                putValue(SHORT_DESCRIPTION, tr("Add filter."));
-                new ImageProvider("dialogs", "add").getResource().attachImageIcon(this, true);
-            }
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                SearchSetting searchSetting = SearchAction.showSearchDialog(new Filter());
-                if (searchSetting != null) {
-                    filterModel.addFilter(new Filter(searchSetting));
-                }
-            }
-        });
-        SideButton editButton = new SideButton(new AbstractAction() {
-            {
-                putValue(NAME, tr("Edit"));
-                putValue(SHORT_DESCRIPTION, tr("Edit filter."));
-                new ImageProvider("dialogs", "edit").getResource().attachImageIcon(this, true);
-            }
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                int index = userTable.getSelectionModel().getMinSelectionIndex();
-                if (index < 0) return;
-                Filter f = filterModel.getFilter(index);
-                SearchSetting searchSetting = SearchAction.showSearchDialog(f);
-                if (searchSetting != null) {
-                    filterModel.setFilter(index, new Filter(searchSetting));
-                }
-            }
-        });
-        SideButton deleteButton = new SideButton(new AbstractAction() {
-            {
-                putValue(NAME, tr("Delete"));
-                putValue(SHORT_DESCRIPTION, tr("Delete filter."));
-                new ImageProvider("dialogs", "delete").getResource().attachImageIcon(this, true);
-            }
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                int index = userTable.getSelectionModel().getMinSelectionIndex();
-                if (index >= 0) {
-                    filterModel.removeFilter(index);
-                }
-            }
-        });
-        SideButton upButton = new SideButton(new AbstractAction() {
-            {
-                putValue(NAME, tr("Up"));
-                putValue(SHORT_DESCRIPTION, tr("Move filter up."));
-                new ImageProvider("dialogs", "up").getResource().attachImageIcon(this, true);
-            }
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                int index = userTable.getSelectionModel().getMinSelectionIndex();
-                if (index >= 0) {
-                    filterModel.moveUpFilter(index);
-                    userTable.getSelectionModel().setSelectionInterval(index-1, index-1);
-                }
-            }
-        });
-        SideButton downButton = new SideButton(new AbstractAction() {
-            {
-                putValue(NAME, tr("Down"));
-                putValue(SHORT_DESCRIPTION, tr("Move filter down."));
-                new ImageProvider("dialogs", "down").getResource().attachImageIcon(this, true);
-            }
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                int index = userTable.getSelectionModel().getMinSelectionIndex();
-                if (index >= 0) {
-                    filterModel.moveDownFilter(index);
-                    userTable.getSelectionModel().setSelectionInterval(index+1, index+1);
-                }
-            }
-        });
 
         // Toggle filter "enabled" on Enter
@@ -218 +278 @@
                 int index = userTable.getSelectedRow();
                 if (index >= 0) {
-                    Filter filter = filterModel.getFilter(index);
+                    Filter filter = filterModel.getValue(index);
                     filterModel.setValueAt(!filter.enable, index, FilterTableModel.COL_ENABLED);
                 }
@@ -230 +290 @@
                 int index = userTable.getSelectedRow();
                 if (index >= 0) {
-                    Filter filter = filterModel.getFilter(index);
+                    Filter filter = filterModel.getValue(index);
                     filterModel.setValueAt(!filter.hiding, index, FilterTableModel.COL_HIDING);
                 }
@@ -236 +296 @@
         });
 
-        createLayout(userTable, true, Arrays.asList(
-                addButton, editButton, deleteButton, upButton, downButton
-        ));
+        List<FilterAction> actions = Arrays.asList(addAction, editAction, deleteAction, moveUpAction, moveDownAction, sortAction, reverseAction);
+        for (FilterAction action : actions) {
+            TableHelper.adaptTo(action, filterModel);
+            TableHelper.adaptTo(action, filterModel.getSelectionModel());
+            action.updateEnabledState();
+        }
+        createLayout(userTable, true, actions.stream().map(a -> new SideButton(a, false)).collect(Collectors.toList()));
     }
 
@@ -384 +448 @@
 
             for (int i = 0; i < filterModel.getRowCount(); i++) {
-                Filter filter = filterModel.getFilter(i);
-                MultikeyInfo info = new MultikeyInfo(i, filter.text);
-                result.add(info);
+                result.add(new MultikeyInfo(i, filterModel.getValue(i).text));
             }
 
@@ -420 +482 @@
         public void executeMultikeyAction(int index, boolean repeatLastAction) {
             if (index >= 0 && index < filterModel.getRowCount()) {
-                Filter filter = filterModel.getFilter(index);
+                Filter filter = filterModel.getValue(index);
                 filterModel.setValueAt(!filter.enable, index, FilterTableModel.COL_ENABLED);
                 lastFilter = filter;
@@ -444 +506 @@
         public void executeMultikeyAction(int index, boolean repeatLastAction) {
             if (index >= 0 && index < filterModel.getRowCount()) {
-                Filter filter = filterModel.getFilter(index);
+                Filter filter = filterModel.getValue(index);
                 filterModel.setValueAt(!filter.hiding, index, FilterTableModel.COL_HIDING);
                 lastFilter = filter;

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

@@ -9 +9 @@
 import java.util.List;
 
+import javax.swing.ListSelectionModel;
 import javax.swing.table.AbstractTableModel;
 
@@ -17 +18 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.autofilter.AutoFilterManager;
+import org.openstreetmap.josm.gui.util.SortableTableModel;
 import org.openstreetmap.josm.gui.widgets.OSDLabel;
 import org.openstreetmap.josm.tools.Logging;
@@ -24 +26 @@
  *
  * @author Petr_Dlouhý
+ * @since 2125
  */
-public class FilterTableModel extends AbstractTableModel {
+public class FilterTableModel extends AbstractTableModel implements SortableTableModel<Filter> {
 
     /**
@@ -50 +53 @@
 
     /**
-     * A helper for {@link #drawOSDText(Graphics2D)}.
+     * The selection model
+     */
+    final ListSelectionModel selectionModel;
+
+    /**
+     * A helper for {@link #drawOSDText(Graphics2D)}
      */
     private final OSDLabel lblOSD = new OSDLabel("");
@@ -56 +64 @@
     /**
      * Constructs a new {@code FilterTableModel}.
-     */
-    public FilterTableModel() {
+     * @param listSelectionModel selection model
+     */
+    public FilterTableModel(ListSelectionModel listSelectionModel) {
+        this.selectionModel = listSelectionModel;
         loadPrefs();
     }
@@ -134 +144 @@
     }
 
+    @Override
+    public boolean doMove(int delta, int... selectedRows) {
+        return model.moveFilters(delta, selectedRows);
+    }
+
+    @Override
+    public boolean move(int delta, int... selectedRows) {
+        if (!SortableTableModel.super.move(delta, selectedRows))
+            return false;
+        savePrefs();
+        updateFilters();
+        int rowIndex = selectedRows[0];
+        if (delta < 0)
+            fireTableRowsUpdated(rowIndex + delta, rowIndex);
+        else if (delta > 0)
+            fireTableRowsUpdated(rowIndex, rowIndex + delta);
+        return true;
+    }
+
     /**
      * Moves down the filter in the given row.
      * @param rowIndex The filter row
-     */
+     * @deprecated Use {@link #moveDown(int...)}
+     */
+    @Deprecated
     public void moveDownFilter(int rowIndex) {
-        if (model.moveDownFilter(rowIndex)) {
-            savePrefs();
-            updateFilters();
-            fireTableRowsUpdated(rowIndex, rowIndex + 1);
-        }
+        moveDown(rowIndex);
     }
 
@@ -149 +176 @@
      * Moves up the filter in the given row
      * @param rowIndex The filter row
-     */
+     * @deprecated Use {@link #moveUp(int...)}
+     */
+    @Deprecated
     public void moveUpFilter(int rowIndex) {
-        if (model.moveUpFilter(rowIndex)) {
-            savePrefs();
-            updateFilters();
-            fireTableRowsUpdated(rowIndex - 1, rowIndex);
-        }
+        moveUp(rowIndex);
     }
 
@@ -174 +199 @@
      * @param rowIndex The row index
      * @param filter The filter that should be placed in that row
-     */
+     * @deprecated Use {@link #setValue}
+     */
+    @Deprecated
     public void setFilter(int rowIndex, Filter filter) {
-        model.setFilter(rowIndex, filter);
+        setValue(rowIndex, filter);
+    }
+
+    @Override
+    public Filter setValue(int rowIndex, Filter filter) {
+        Filter result = model.setValue(rowIndex, filter);
         savePrefs();
         updateFilters();
         fireTableRowsUpdated(rowIndex, rowIndex);
+        return result;
     }
 
@@ -186 +219 @@
      * @param rowIndex The row index
      * @return The filter in that row
-     */
+     * @deprecated Use {@link #getValue}
+     */
+    @Deprecated
     public Filter getFilter(int rowIndex) {
-        return model.getFilter(rowIndex);
+        return getValue(rowIndex);
+    }
+
+    @Override
+    public Filter getValue(int rowIndex) {
+        return model.getValue(rowIndex);
+    }
+
+    @Override
+    public ListSelectionModel getSelectionModel() {
+        return selectionModel;
     }
 
@@ -225 +270 @@
      */
     public boolean isCellEnabled(int row, int column) {
-        return model.getFilter(row).enable || column == 0;
+        return model.getValue(row).enable || column == 0;
     }
 
@@ -238 +283 @@
             return;
         }
-        Filter f = model.getFilter(row);
+        Filter f = model.getValue(row);
         switch (column) {
         case COL_ENABLED:
@@ -254 +299 @@
         default: // Do nothing
         }
-        setFilter(row, f);
+        setValue(row, f);
     }
 
@@ -262 +307 @@
             return null;
         }
-        Filter f = model.getFilter(row);
+        Filter f = model.getValue(row);
         switch (column) {
         case COL_ENABLED:
@@ -308 +353 @@
         return model.getFilters();
     }
+
+    @Override
+    public void sort() {
+        model.sort();
+        fireTableDataChanged();
+    }
+
+    @Override
+    public void reverse() {
+        model.reverse();
+        fireTableDataChanged();
+    }
 }

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

@@ -17 +17 @@
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -74 +73 @@
 import org.openstreetmap.josm.gui.util.MultikeyActionsHandler;
 import org.openstreetmap.josm.gui.util.MultikeyShortcutAction.MultikeyInfo;
+import org.openstreetmap.josm.gui.util.ReorderableTableModel;
+import org.openstreetmap.josm.gui.util.TableHelper;
 import org.openstreetmap.josm.gui.widgets.DisableShortcutsOnFocusGainedTextField;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
@@ -79 +80 @@
 import org.openstreetmap.josm.gui.widgets.ScrollableTable;
 import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.tools.ArrayUtils;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
@@ -268 +270 @@
         // -- move up action
         MoveUpAction moveUpAction = new MoveUpAction(model);
-        adaptTo(moveUpAction, model);
-        adaptTo(moveUpAction, selectionModel);
+        TableHelper.adaptTo(moveUpAction, model);
+        TableHelper.adaptTo(moveUpAction, selectionModel);
 
         // -- move down action
         MoveDownAction moveDownAction = new MoveDownAction(model);
-        adaptTo(moveDownAction, model);
-        adaptTo(moveDownAction, selectionModel);
+        TableHelper.adaptTo(moveDownAction, model);
+        TableHelper.adaptTo(moveDownAction, selectionModel);
 
         // -- activate action
@@ -280 +282 @@
         activateLayerAction.updateEnabledState();
         MultikeyActionsHandler.getInstance().addAction(activateLayerAction);
-        adaptTo(activateLayerAction, selectionModel);
+        TableHelper.adaptTo(activateLayerAction, selectionModel);
 
         JumpToMarkerActions.initialize();
@@ -287 +289 @@
         showHideLayerAction = new ShowHideLayerAction(model);
         MultikeyActionsHandler.getInstance().addAction(showHideLayerAction);
-        adaptTo(showHideLayerAction, selectionModel);
+        TableHelper.adaptTo(showHideLayerAction, selectionModel);
 
         LayerVisibilityAction visibilityAction = new LayerVisibilityAction(model);
-        adaptTo(visibilityAction, selectionModel);
+        TableHelper.adaptTo(visibilityAction, selectionModel);
         SideButton visibilityButton = new SideButton(visibilityAction, false);
         visibilityAction.setCorrespondingSideButton(visibilityButton);
@@ -297 +299 @@
         DeleteLayerAction deleteLayerAction = new DeleteLayerAction(model);
         layerList.getActionMap().put("deleteLayer", deleteLayerAction);
-        adaptTo(deleteLayerAction, selectionModel);
+        TableHelper.adaptTo(deleteLayerAction, selectionModel);
         getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
                 KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), "delete"
@@ -365 +367 @@
      * @param listener  the listener
      * @param listSelectionModel  the source emitting {@link ListSelectionEvent}s
-     */
+     * @deprecated Use {@link TableHelper#adaptTo}
+     */
+    @Deprecated
     protected void adaptTo(final IEnabledStateUpdating listener, ListSelectionModel listSelectionModel) {
-        listSelectionModel.addListSelectionListener(e -> listener.updateEnabledState());
+        TableHelper.adaptTo(listener, listSelectionModel);
     }
 
@@ -377 +381 @@
      * @param listener the listener
      * @param listModel the source emitting {@link ListDataEvent}s
-     */
+     * @deprecated Use {@link TableHelper#adaptTo}
+     */
+    @Deprecated
     protected void adaptTo(final IEnabledStateUpdating listener, LayerListModel listModel) {
-        listModel.addTableModelListener(e -> listener.updateEnabledState());
+        TableHelper.adaptTo(listener, listModel);
     }
 
@@ -679 +685 @@
      */
     public static final class LayerListModel extends AbstractTableModel
-            implements LayerChangeListener, ActiveLayerChangeListener, PropertyChangeListener {
+            implements LayerChangeListener, ActiveLayerChangeListener, PropertyChangeListener, ReorderableTableModel<Layer> {
         /** manages list selection state*/
         private final DefaultListSelectionModel selectionModel;
@@ -801 +807 @@
          */
         public List<Integer> getSelectedRows() {
-            List<Integer> selected = new ArrayList<>();
-            for (int i = 0; i < getLayers().size(); i++) {
-                if (selectionModel.isSelectedIndex(i)) {
-                    selected.add(i);
-                }
-            }
-            return selected;
+            return ArrayUtils.toList(TableHelper.getSelectedIndices(selectionModel));
         }
 
@@ -820 +820 @@
             layer.removePropertyChangeListener(this);
             final int size = getRowCount();
-            final List<Integer> rows = getSelectedRows();
-
-            if (rows.isEmpty() && size > 0) {
+            final int[] rows = TableHelper.getSelectedIndices(selectionModel);
+
+            if (rows.length == 0 && size > 0) {
                 selectionModel.setSelectionInterval(size-1, size-1);
             }
@@ -876 +876 @@
         }
 
-        /**
-         * Replies true if the currently selected layers can move up by one position
-         *
-         * @return true if the currently selected layers can move up by one position
-         */
-        public boolean canMoveUp() {
-            List<Integer> sel = getSelectedRows();
-            return !sel.isEmpty() && sel.get(0) > 0;
-        }
-
-        /**
-         * Move up the currently selected layers by one position
-         *
-         */
-        public void moveUp() {
-            if (!canMoveUp())
-                return;
-            List<Integer> sel = getSelectedRows();
-            List<Layer> layers = getLayers();
-            MapView mapView = MainApplication.getMap().mapView;
-            for (int row : sel) {
-                Layer l1 = layers.get(row);
-                mapView.moveLayer(l1, row-1);
-            }
-            fireTableDataChanged();
-            selectionModel.setValueIsAdjusting(true);
-            selectionModel.clearSelection();
-            for (int row : sel) {
-                selectionModel.addSelectionInterval(row-1, row-1);
-            }
-            selectionModel.setValueIsAdjusting(false);
+        @Override
+        public DefaultListSelectionModel getSelectionModel() {
+            return selectionModel;
+        }
+
+        @Override
+        public Layer getValue(int index) {
+            return getLayer(index);
+        }
+
+        @Override
+        public Layer setValue(int index, Layer value) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean doMove(int delta, int... selectedRows) {
+            if (delta != 0) {
+                List<Layer> layers = getLayers();
+                MapView mapView = MainApplication.getMap().mapView;
+                if (delta < 0) {
+                    for (int row : selectedRows) {
+                        mapView.moveLayer(layers.get(row), row + delta);
+                    }
+                } else if (delta > 0) {
+                    for (int i = selectedRows.length - 1; i >= 0; i--) {
+                        mapView.moveLayer(layers.get(selectedRows[i]), selectedRows[i] + delta);
+                    }
+                }
+                fireTableDataChanged();
+            }
+            return delta != 0;
+        }
+
+        @Override
+        public boolean move(int delta, int... selectedRows) {
+            if (!ReorderableTableModel.super.move(delta, selectedRows))
+                return false;
             ensureSelectedIsVisible();
-        }
-
-        /**
-         * Replies true if the currently selected layers can move down by one position
-         *
-         * @return true if the currently selected layers can move down by one position
-         */
-        public boolean canMoveDown() {
-            List<Integer> sel = getSelectedRows();
-            return !sel.isEmpty() && sel.get(sel.size()-1) < getLayers().size()-1;
-        }
-
-        /**
-         * Move down the currently selected layers by one position
-         */
-        public void moveDown() {
-            if (!canMoveDown())
-                return;
-            List<Integer> sel = getSelectedRows();
-            Collections.reverse(sel);
-            List<Layer> layers = getLayers();
-            MapView mapView = MainApplication.getMap().mapView;
-            for (int row : sel) {
-                Layer l1 = layers.get(row);
-                mapView.moveLayer(l1, row+1);
-            }
-            fireTableDataChanged();
-            selectionModel.setValueIsAdjusting(true);
-            selectionModel.clearSelection();
-            for (int row : sel) {
-                selectionModel.addSelectionInterval(row+1, row+1);
-            }
-            selectionModel.setValueIsAdjusting(false);
-            ensureSelectedIsVisible();
+            return true;
         }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

@@ -3 +3 @@
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.BitSet;
 import java.util.Collection;
@@ -45 +44 @@
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.util.SortableTableModel;
 import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTableModel;
+import org.openstreetmap.josm.tools.ArrayUtils;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.bugreport.BugReport;
@@ -53 +54 @@
  */
 public class MemberTableModel extends AbstractTableModel
-implements TableModelListener, DataSelectionListener, DataSetListener, OsmPrimitivesTableModel {
+implements TableModelListener, DataSelectionListener, DataSetListener, OsmPrimitivesTableModel, SortableTableModel<RelationMember> {
 
     /**
@@ -181 +182 @@
     /* --------------------------------------------------------------------------- */
 
+    /**
+     * Add a new member model listener.
+     * @param listener member model listener to add
+     */
     public void addMemberModelListener(IMemberModelListener listener) {
         if (listener != null) {
@@ -187 +192 @@
     }
 
+    /**
+     * Remove a member model listener.
+     * @param listener member model listener to remove
+     */
     public void removeMemberModelListener(IMemberModelListener listener) {
         listeners.remove(listener);
@@ -260 +269 @@
     }
 
-    /**
-     * Move up selected rows, if possible.
-     * @param selectedRows rows to move up
-     * @see #canMoveUp
-     */
-    public void moveUp(int... selectedRows) {
-        if (!canMoveUp(selectedRows))
-            return;
-
-        for (int row : selectedRows) {
-            RelationMember member1 = members.get(row);
-            RelationMember member2 = members.get(row - 1);
-            members.set(row, member2);
-            members.set(row - 1, member1);
-        }
+    @Override
+    public boolean move(int delta, int... selectedRows) {
+        if (!canMove(delta, this::getRowCount, selectedRows))
+            return false;
+        doMove(delta, selectedRows);
         fireTableDataChanged();
-        getSelectionModel().setValueIsAdjusting(true);
-        getSelectionModel().clearSelection();
+        final ListSelectionModel selectionModel = getSelectionModel();
+        selectionModel.setValueIsAdjusting(true);
+        selectionModel.clearSelection();
         BitSet selected = new BitSet();
         for (int row : selectedRows) {
@@ -284 +284 @@
         }
         addToSelectedMembers(selected);
-        getSelectionModel().setValueIsAdjusting(false);
-        fireMakeMemberVisible(selectedRows[0] - 1);
-    }
-
-    /**
-     * Move down selected rows, if possible.
-     * @param selectedRows rows to move down
-     * @see #canMoveDown
-     */
-    public void moveDown(int... selectedRows) {
-        if (!canMoveDown(selectedRows))
-            return;
-
-        for (int i = selectedRows.length - 1; i >= 0; i--) {
-            int row = selectedRows[i];
-            RelationMember member1 = members.get(row);
-            RelationMember member2 = members.get(row + 1);
-            members.set(row, member2);
-            members.set(row + 1, member1);
-        }
-        fireTableDataChanged();
-        getSelectionModel();
-        getSelectionModel().setValueIsAdjusting(true);
-        getSelectionModel().clearSelection();
-        BitSet selected = new BitSet();
-        for (int row : selectedRows) {
-            row++;
-            selected.set(row);
-        }
-        addToSelectedMembers(selected);
-        getSelectionModel().setValueIsAdjusting(false);
-        fireMakeMemberVisible(selectedRows[0] + 1);
+        selectionModel.setValueIsAdjusting(false);
+        fireMakeMemberVisible(selectedRows[0] + delta);
+        return true;
     }
 
@@ -338 +309 @@
 
     /**
-     * Checks that a range of rows can be moved up.
-     * @param rows indexes of rows to move up
-     * @return {@code true} if rows can be moved up
-     */
-    public boolean canMoveUp(int... rows) {
-        if (rows == null || rows.length == 0)
-            return false;
-        Arrays.sort(rows);
-        return rows[0] > 0 && rows[rows.length - 1] < members.size();
-    }
-
-    /**
-     * Checks that a range of rows can be moved down.
-     * @param rows indexes of rows to move down
-     * @return {@code true} if rows can be moved down
-     */
-    public boolean canMoveDown(int... rows) {
-        if (rows == null || rows.length == 0)
-            return false;
-        Arrays.sort(rows);
-        return rows[0] >= 0 && rows[rows.length - 1] < members.size() - 1;
-    }
-
-    /**
      * Checks that a range of rows can be removed.
      * @param rows indexes of rows to remove
@@ -370 +317 @@
     }
 
-    /**
-     * Returns the selection model.
-     * @return the selection model (never null)
-     */
+    @Override
     public DefaultListSelectionModel getSelectionModel() {
         if (listSelectionModel == null) {
@@ -382 +326 @@
     }
 
+    @Override
+    public RelationMember getValue(int index) {
+        return members.get(index);
+    }
+
+    @Override
+    public RelationMember setValue(int index, RelationMember value) {
+        return members.set(index, value);
+    }
+
+    /**
+     * Remove members referring to the given list of primitives.
+     * @param primitives list of OSM primitives
+     */
     public void removeMembersReferringTo(List<? extends OsmPrimitive> primitives) {
         if (primitives == null)
             return;
-        members.removeIf(member -> primitives.contains(member.getMember()));
-        fireTableDataChanged();
+        if (members.removeIf(member -> primitives.contains(member.getMember())))
+            fireTableDataChanged();
     }
 
@@ -398 +356 @@
     }
 
+    /**
+     * Determines if this model has the same members as the given relation.
+     * @param relation relation
+     * @return {@code true} if this model has the same members as {@code relation}
+     */
     public boolean hasSameMembersAs(Relation relation) {
-        if (relation == null)
-            return false;
-        if (relation.getMembersCount() != members.size())
+        if (relation == null || relation.getMembersCount() != members.size())
             return false;
         for (int i = 0; i < relation.getMembersCount(); i++) {
@@ -464 +425 @@
         }
         return false;
-    }
-
-    protected List<Integer> getSelectedIndices() {
-        List<Integer> selectedIndices = new ArrayList<>();
-        for (int i = 0; i < members.size(); i++) {
-            if (getSelectionModel().isSelectedIndex(i)) {
-                selectedIndices.add(i);
-            }
-        }
-        return selectedIndices;
     }
 
@@ -773 +724 @@
         addToSelectedMembers(selected);
         getSelectionModel().setValueIsAdjusting(false);
-        if (!getSelectedIndices().isEmpty()) {
-            fireMakeMemberVisible(getSelectedIndices().get(0));
+        int[] selectedIndices = getSelectedIndices();
+        if (selectedIndices.length > 0) {
+            fireMakeMemberVisible(selectedIndices[0]);
         }
     }
@@ -793 +745 @@
      * Sort the selected relation members by the way they are linked.
      */
+    @Override
     public void sort() {
         List<RelationMember> selectedMembers = new ArrayList<>(getSelectedMembers());
@@ -802 +755 @@
         } else {
             sortedMembers = relationSorter.sortMembers(selectedMembers);
-            List<Integer> selectedIndices = getSelectedIndices();
+            List<Integer> selectedIndices = ArrayUtils.toList(getSelectedIndices());
             newMembers = new ArrayList<>();
             boolean inserted = false;
@@ -861 +814 @@
      * Reverse the relation members.
      */
+    @Override
     public void reverse() {
-        List<Integer> selectedIndices = getSelectedIndices();
-        List<Integer> selectedIndicesReversed = getSelectedIndices();
+        List<Integer> selectedIndices = ArrayUtils.toList(getSelectedIndices());
+        List<Integer> selectedIndicesReversed = ArrayUtils.toList(getSelectedIndices());
 
         if (selectedIndices.size() <= 1) {

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/ReverseAction.java

@@ -23 +23 @@
 
         putValue(SHORT_DESCRIPTION, tr("Reverse the order of the relation members"));
-        new ImageProvider("dialogs/relation", "reverse").getResource().attachImageIcon(this, true);
+        new ImageProvider("dialogs/", "reverse").getResource().attachImageIcon(this, true);
         putValue(NAME, tr("Reverse"));
         updateEnabledState();

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

@@ -88 +88 @@
 import org.openstreetmap.josm.gui.util.FileFilterAllFiles;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.util.ReorderableTableModel;
 import org.openstreetmap.josm.gui.util.TableHelper;
 import org.openstreetmap.josm.gui.widgets.AbstractFileChooser;
@@ -627 +628 @@
      * Table model of active sources.
      */
-    protected class ActiveSourcesModel extends AbstractTableModel {
+    protected class ActiveSourcesModel extends AbstractTableModel implements ReorderableTableModel<SourceEntry> {
         private transient List<SourceEntry> data;
         private final DefaultListSelectionModel selectionModel;
@@ -767 +768 @@
         }
 
-        public boolean canMove(int i) {
-            int[] sel = tblActiveSources.getSelectedRows();
-            if (sel.length == 0)
-                return false;
-            if (i < 0)
-                return sel[0] >= -i;
-                else if (i > 0)
-                    return sel[sel.length-1] <= getRowCount()-1 - i;
-                else
-                    return true;
-        }
-
-        public void move(int i) {
-            if (!canMove(i)) return;
-            int[] sel = tblActiveSources.getSelectedRows();
-            for (int row: sel) {
-                SourceEntry t1 = data.get(row);
-                SourceEntry t2 = data.get(row + i);
-                data.set(row, t2);
-                data.set(row + i, t1);
-            }
-            selectionModel.setValueIsAdjusting(true);
-            selectionModel.clearSelection();
-            for (int row: sel) {
-                selectionModel.addSelectionInterval(row + i, row + i);
-            }
-            selectionModel.setValueIsAdjusting(false);
+        @Override
+        public DefaultListSelectionModel getSelectionModel() {
+            return selectionModel;
+        }
+
+        @Override
+        public SourceEntry getValue(int index) {
+            return data.get(index);
+        }
+
+        @Override
+        public SourceEntry setValue(int index, SourceEntry value) {
+            return data.set(index, value);
         }
     }

trunk/src/org/openstreetmap/josm/gui/util/TableHelper.java

@@ -5 +5 @@
 
 import javax.swing.JTable;
+import javax.swing.ListSelectionModel;
+import javax.swing.event.ListDataEvent;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.table.AbstractTableModel;
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
+
+import org.openstreetmap.josm.gui.dialogs.IEnabledStateUpdating;
 
 /**
@@ -16 +22 @@
     private TableHelper() {
         // Hide default constructor for utils classes
+    }
+
+    /**
+     * Wires <code>listener</code> to <code>listSelectionModel</code> in such a way, that
+     * <code>listener</code> receives a {@link IEnabledStateUpdating#updateEnabledState()}
+     * on every {@link ListSelectionEvent}.
+     *
+     * @param listener  the listener
+     * @param listSelectionModel  the source emitting {@link ListSelectionEvent}s
+     * @since 15226
+     */
+    public static void adaptTo(final IEnabledStateUpdating listener, ListSelectionModel listSelectionModel) {
+        listSelectionModel.addListSelectionListener(e -> listener.updateEnabledState());
+    }
+
+    /**
+     * Wires <code>listener</code> to <code>listModel</code> in such a way, that
+     * <code>listener</code> receives a {@link IEnabledStateUpdating#updateEnabledState()}
+     * on every {@link ListDataEvent}.
+     *
+     * @param listener the listener
+     * @param listModel the source emitting {@link ListDataEvent}s
+     * @since 15226
+     */
+    public static void adaptTo(final IEnabledStateUpdating listener, AbstractTableModel listModel) {
+        listModel.addTableModelListener(e -> listener.updateEnabledState());
     }
 
@@ -83 +115 @@
         }
     }
+
+    /**
+     * Returns an array of all of the selected indices in the selection model, in increasing order.
+     * Unfortunately this method is not available in OpenJDK before version 11, see
+     * https://bugs.openjdk.java.net/browse/JDK-8199395
+     * Code taken from OpenJDK 11. To be removed when we switch to Java 11 or later.
+     *
+     * @param selectionModel list selection model.
+     *
+     * @return all of the selected indices, in increasing order,
+     *         or an empty array if nothing is selected
+     * @since 15226
+     */
+    public static int[] getSelectedIndices(ListSelectionModel selectionModel) {
+        int iMin = selectionModel.getMinSelectionIndex();
+        int iMax = selectionModel.getMaxSelectionIndex();
+
+        if (iMin < 0 || iMax < 0) {
+            return new int[0];
+        }
+
+        int[] rvTmp = new int[1 + iMax - iMin];
+        int n = 0;
+        for (int i = iMin; i <= iMax; i++) {
+            if (selectionModel.isSelectedIndex(i)) {
+                rvTmp[n++] = i;
+            }
+        }
+        int[] rv = new int[n];
+        System.arraycopy(rvTmp, 0, rv, 0, n);
+        return rv;
+    }
 }