Changeset 15213 in josm

Timestamp:

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

Author:

Don-vip

Message:

see #13458 - keep icon correct shape

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (modified) (4 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;
@@ -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);
         }
     }
@@ -1388 +1375 @@
             }
             final ImageSizes size = ImageSizes.TABLE;
-            setIcon(value.icon == null ? ImageProvider.getEmpty(size) : value.icon.getImageIcon(size.getImageDimension()));
+            setIcon(value.icon == null ? ImageProvider.getEmpty(size) : value.icon.getImageIconBounded(size.getImageDimension()));
             return this;
         }