Changeset 9992 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs

Timestamp:

2016-03-14T09:56:22+01:00 (8 years ago)

Author:

Don-vip

Message:

sonar - fix more issues

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java (modified) (6 diffs)

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

@@ -98 +98 @@
             KeyEvent.VK_H, Shortcut.ALT_CTRL);
 
-    protected static final String[] COLUMN_TOOLTIPS = {
+    private static final String[] COLUMN_TOOLTIPS = {
             Main.platform.makeTooltip(tr("Enable filter"), ENABLE_FILTER_SHORTCUT),
             Main.platform.makeTooltip(tr("Hiding filter"), HIDING_FILTER_SHORTCUT),
@@ -180 +180 @@
             public void actionPerformed(ActionEvent e) {
                 int index = userTable.getSelectionModel().getMinSelectionIndex();
-                if (index < 0) return;
-                filterModel.removeFilter(index);
+                if (index >= 0) {
+                    filterModel.removeFilter(index);
+                }
             }
         });
@@ -194 +195 @@
             public void actionPerformed(ActionEvent e) {
                 int index = userTable.getSelectionModel().getMinSelectionIndex();
-                if (index < 0) return;
-                filterModel.moveUpFilter(index);
-                userTable.getSelectionModel().setSelectionInterval(index-1, index-1);
-            }
-
+                if (index >= 0) {
+                    filterModel.moveUpFilter(index);
+                    userTable.getSelectionModel().setSelectionInterval(index-1, index-1);
+                }
+            }
         });
         SideButton downButton = new SideButton(new AbstractAction() {
@@ -210 +211 @@
             public void actionPerformed(ActionEvent e) {
                 int index = userTable.getSelectionModel().getMinSelectionIndex();
-                if (index < 0) return;
-                filterModel.moveDownFilter(index);
-                userTable.getSelectionModel().setSelectionInterval(index+1, index+1);
+                if (index >= 0) {
+                    filterModel.moveDownFilter(index);
+                    userTable.getSelectionModel().setSelectionInterval(index+1, index+1);
+                }
             }
         });
@@ -221 +223 @@
             public void actionPerformed(ActionEvent e) {
                 int index = userTable.getSelectedRow();
-                if (index < 0) return;
-                Filter filter = filterModel.getFilter(index);
-                filterModel.setValueAt(!filter.enable, index, FilterTableModel.COL_ENABLED);
+                if (index >= 0) {
+                    Filter filter = filterModel.getFilter(index);
+                    filterModel.setValueAt(!filter.enable, index, FilterTableModel.COL_ENABLED);
+                }
             }
         });
@@ -232 +235 @@
             public void actionPerformed(ActionEvent e) {
                 int index = userTable.getSelectedRow();
-                if (index < 0) return;
-                Filter filter = filterModel.getFilter(index);
-                filterModel.setValueAt(!filter.hiding, index, FilterTableModel.COL_HIDING);
+                if (index >= 0) {
+                    Filter filter = filterModel.getFilter(index);
+                    filterModel.setValueAt(!filter.hiding, index, FilterTableModel.COL_HIDING);
+                }
             }
         });