Changeset 15226 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java

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.

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java (modified) (14 diffs)

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();
+    }
 }