Changeset 15214 in josm for trunk

Timestamp:

2019-07-06T22:47:06+02:00 (5 years ago)

Author:

Don-vip

Message:

see #13458 - revert accidental changes

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (modified) (3 diffs)

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;
@@ -628 +627 @@
      * Table model of active sources.
      */
-    protected class ActiveSourcesModel extends AbstractTableModel implements ReorderableTableModel<SourceEntry> {
+    protected class ActiveSourcesModel extends AbstractTableModel {
         private transient List<SourceEntry> data;
         private final DefaultListSelectionModel selectionModel;
@@ -768 +767 @@
         }
 
-        @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);
+        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);
         }
     }