Changeset 16844 in josm for trunk/src/org/openstreetmap/josm/gui/preferences

Timestamp:

2020-08-03T22:46:16+02:00 (4 years ago)

Author:

simon04

Message:

fix #12484 - Disable inappropriate AdvancedPreference actions

Edit requires exactly one selected row.
Reset requires at least one selected row.

Location:

trunk/src/org/openstreetmap/josm/gui/preferences/advanced

Files:

• AdvancedPreference.java (modified) (1 diff)
• PreferencesTable.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java

@@ -219 +219 @@
                 applyFilter();
         });
+        table.getSelectionModel().addListSelectionListener(event -> edit.setEnabled(table.getSelectedRowCount() == 1));
 
         JButton reset = new JButton(tr("Reset"));
         p.add(reset, GBC.std().insets(0, 5, 0, 0));
         reset.addActionListener(e -> table.resetPreferences(gui));
+        table.getSelectionModel().addListSelectionListener(event -> reset.setEnabled(table.getSelectedRowCount() > 0));
 
         JButton read = new JButton(tr("Read from file"));

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java

@@ -21 +21 @@
 import javax.swing.JComponent;
 import javax.swing.JLabel;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
@@ -93 +92 @@
     public boolean editPreference(final JComponent gui) {
         if (getSelectedRowCount() != 1) {
-            JOptionPane.showMessageDialog(
-                    gui,
-                    tr("Please select the row to edit."),
-                    tr("Warning"),
-                    JOptionPane.WARNING_MESSAGE
-                    );
             return false;
         }
@@ -277 +270 @@
     public void resetPreferences(final JComponent gui) {
         if (getSelectedRowCount() == 0) {
-            JOptionPane.showMessageDialog(
-                    gui,
-                    tr("Please select the row to delete."),
-                    tr("Warning"),
-                    JOptionPane.WARNING_MESSAGE
-                    );
             return;
         }