Changeset 5028 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

Timestamp:

2012-02-28T11:29:30+01:00 (12 years ago)

Author:

jttt

Message:

Add possibility to hide side buttons in toggle dialogs permanently, show actions from buttons in popup menu

File:

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

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

@@ -20 +20 @@
 import java.util.Set;
 
+import javax.swing.AbstractAction;
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
@@ -51 +52 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.OsmTransferException;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.xml.sax.SAXException;
@@ -61 +63 @@
  * @author frsantos
  */
-public class ValidatorDialog extends ToggleDialog implements ActionListener, SelectionChangedListener, LayerChangeListener {
+public class ValidatorDialog extends ToggleDialog implements SelectionChangedListener, LayerChangeListener {
     /** Serializable ID */
     private static final long serialVersionUID = 2952292777351992696L;
@@ -105 +107 @@
 
         List<SideButton> buttons = new LinkedList<SideButton>();
-        selectButton = new SideButton(marktr("Select"), "select", "Validator",
-                tr("Set the selected elements on the map to the selected items in the list above."), this);
+
+        selectButton = new SideButton(new AbstractAction() {
+            {
+                putValue(NAME, marktr("Select"));
+                putValue(SHORT_DESCRIPTION,  tr("Set the selected elements on the map to the selected items in the list above."));
+                putValue(SMALL_ICON, ImageProvider.get("dialogs","select"));
+            }
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                setSelectedItems();
+            }
+        });
         selectButton.setEnabled(false);
         buttons.add(selectButton);
@@ -112 +124 @@
         buttons.add(new SideButton(Main.main.validator.validateAction));
 
-        fixButton = new SideButton(marktr("Fix"), "fix", "Validator", tr("Fix the selected issue."), this);
+        fixButton = new SideButton(new AbstractAction() {
+            {
+                putValue(NAME, marktr("Fix"));
+                putValue(SHORT_DESCRIPTION,  tr("Fix the selected issue."));
+                putValue(SMALL_ICON, ImageProvider.get("dialogs","fix"));
+            }
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                fixErrors(e);
+            }
+        });
         fixButton.setEnabled(false);
         buttons.add(fixButton);
 
         if (Main.pref.getBoolean(ValidatorPreference.PREF_USE_IGNORE, true)) {
-            ignoreButton = new SideButton(marktr("Ignore"), "delete", "Validator",
-                    tr("Ignore the selected issue next time."), this);
+            ignoreButton = new SideButton(new AbstractAction() {
+                {
+                    putValue(NAME, marktr("Ignore"));
+                    putValue(SHORT_DESCRIPTION,  tr("Ignore the selected issue next time."));
+                    putValue(SMALL_ICON, ImageProvider.get("dialogs","fix"));
+                }
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    ignoreErrors(e);
+                }
+            });
             ignoreButton.setEnabled(false);
             buttons.add(ignoreButton);
@@ -332 +363 @@
         }
         Main.main.getCurrentDataSet().setSelected(sel);
-    }
-
-    @Override
-    public void actionPerformed(ActionEvent e) {
-        String actionCommand = e.getActionCommand();
-        if (actionCommand.equals("Select")) {
-            setSelectedItems();
-        } else if (actionCommand.equals("Fix")) {
-            fixErrors(e);
-        } else if (actionCommand.equals("Ignore")) {
-            ignoreErrors(e);
-        }
     }