Changeset 27964 in osm for applications/editors/josm

Timestamp:

2012-03-01T19:49:28+01:00 (13 years ago)

Author:

jttt

Message:

Use action instead of ActionListener for SideButton

Location:

applications/editors/josm/plugins/licensechange

Files:

• .classpath (added)
• .project (added)
• josm-licencechange.launch (added)
• src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java (modified) (19 diffs)

applications/editors/josm/plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.BorderLayout;
-import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -12 +10 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Enumeration;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Set;
-
+
+import javax.swing.AbstractAction;
 import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
 import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
-import javax.swing.SwingUtilities;
 import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
@@ -35 +27 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AutoScaleAction;
-import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -41 +32 @@
 import org.openstreetmap.josm.data.osm.WaySegment;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
-import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
-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;
 
 /**
@@ -54 +42 @@
  * the list while single click will make the clicked entry the only selection.
  */
-public class LicenseChangeDialog extends ToggleDialog implements ActionListener {
+public class LicenseChangeDialog extends ToggleDialog {
     private LicenseChangePlugin plugin;
 
@@ -72 +60 @@
      * Constructor
      */
-    public LicenseChangeDialog(LicenseChangePlugin plugin) 
+    public LicenseChangeDialog(LicenseChangePlugin plugin)
     {
         super(tr("Relicensing problems"), "licensechange", tr("Open the relicensing window."),
@@ -83 +71 @@
         JMenuItem zoomTo = new JMenuItem(tr("Zoom to problem"));
         zoomTo.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
+            @Override
+                        public void actionPerformed(ActionEvent e) {
                 zoomToProblem();
             }
@@ -93 +82 @@
         tree.addTreeSelectionListener(new SelectionWatch());
 
-        selectButton = new SideButton(marktr("Select"), "select", "LicenseChange",
-                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"));
+                        putValue("help", "Dialog/LicenseChange/select");
+                }
+                        @Override
+                        public void actionPerformed(ActionEvent e) {
+                                setSelectedItems();
+                        }
+        });
         selectButton.setEnabled(false);
 
@@ -103 +102 @@
 
     @Override
-    public void showNotify() 
+    public void showNotify()
     {
         DataSet ds = Main.main.getCurrentDataSet();
@@ -112 +111 @@
 
     @Override
-    public void setVisible(boolean v) 
+    public void setVisible(boolean v)
     {
         if (tree != null)
@@ -121 +120 @@
 
     @SuppressWarnings("unchecked")
-    private void showPopupMenu(MouseEvent e) 
+    private void showPopupMenu(MouseEvent e)
     {
         if (!e.isPopupTrigger())
@@ -136 +135 @@
     }
 
-    private void zoomToProblem() 
+    private void zoomToProblem()
     {
         if (popupMenuError == null)
@@ -152 +151 @@
      */
     @SuppressWarnings("unchecked")
-    private void setSelectedItems() 
+    private void setSelectedItems()
     {
         if (tree == null)
@@ -179 +178 @@
     }
 
-    public void actionPerformed(ActionEvent e) 
-    {
-        String actionCommand = e.getActionCommand();
-        if (actionCommand.equals("Select"))
-            setSelectedItems();
-    }
-
     /**
      * @param sel
@@ -230 +222 @@
      * Watches for clicks.
      */
-    public class ClickWatch extends MouseAdapter 
+    public class ClickWatch extends MouseAdapter
     {
         @Override
@@ -264 +256 @@
      * Watches for tree selection.
      */
-    public class SelectionWatch implements TreeSelectionListener 
-    {
-        public void valueChanged(TreeSelectionEvent e) {
+    public class SelectionWatch implements TreeSelectionListener
+    {
+        @Override
+                public void valueChanged(TreeSelectionEvent e) {
             selectButton.setEnabled(false);
 
@@ -279 +272 @@
     }
 
-    public static class LicenseChangeBoundingXYVisitor extends BoundingXYVisitor implements LicenseChangeVisitor 
-    {
-        public void visit(OsmPrimitive p) {
+    public static class LicenseChangeBoundingXYVisitor extends BoundingXYVisitor implements LicenseChangeVisitor
+    {
+        @Override
+                public void visit(OsmPrimitive p) {
             if (p.isUsable()) {
                 p.visit(this);
@@ -294 +288 @@
         }
 
-        public void visit(List<Node> nodes) {
+        @Override
+                public void visit(List<Node> nodes) {
             for (Node n: nodes) {
                 visit(n);
@@ -301 +296 @@
     }
 
-    public void updateSelection(Collection<? extends OsmPrimitive> newSelection) 
+    public void updateSelection(Collection<? extends OsmPrimitive> newSelection)
     {
         if (newSelection.isEmpty())