Changeset 27957 in osm

Timestamp:

2012-02-29T17:07:20+01:00 (13 years ago)

Author:

jttt

Message:

Use action instead of ActionListener for SideButton

File:

• applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java (modified) (6 diffs)

applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.text.DecimalFormat;
@@ -14 +12 @@
 import java.util.Collection;
 
+import javax.swing.AbstractAction;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -24 +23 @@
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
+import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -31 +32 @@
  * @author ramack
  */
-public class MeasurementDialog extends ToggleDialog implements ActionListener
-{
+public class MeasurementDialog extends ToggleDialog {
     private static final long serialVersionUID = 4708541586297950021L;
 
@@ -69 +69 @@
         KeyEvent.VK_U, Shortcut.CTRL_SHIFT), 150);
 
-        resetButton = new SideButton(marktr("Reset"), "select", "Measurement",
-                tr("Reset current measurement results and delete measurement path."), this);
+        resetButton = new SideButton(new AbstractAction() {
+                {
+                        putValue(NAME, marktr("Reset"));
+                        putValue(SMALL_ICON,ImageProvider.get("dialogs", "select"));
+                        putValue(SHORT_DESCRIPTION, tr("Reset current measurement results and delete measurement path."));
+                        putValue("help", HelpUtil.ht("/Dialog/Measurement#Reset"));
+                }
+            @Override
+            public void actionPerformed(ActionEvent e)
+            {
+                resetValues();
+            }
+        });
 
         JPanel valuePanel = new JPanel(new GridLayout(0,2));
@@ -149 +160 @@
     }
 
-    @Override
-    public void actionPerformed(ActionEvent e)
-    {
-        String actionCommand = e.getActionCommand();
-        if( actionCommand.equals("Reset")){
-            resetValues();
-        }
-    }
-
     /**
      * Cleans the active Meausurement Layer