Changeset 29461 in osm for applications/editors/josm/plugins/imagery-xml-bounds/src/org

Timestamp:

2013-04-02T00:59:43+02:00 (12 years ago)

Author:

donvip

Message:

[josm_plugins] Update xml-imagery-bounds and tag2link plugins to JOSM 5821

Location:

applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds

Files:

• ImageryXmlBoundsPlugin.java (modified) (5 diffs)
• actions/ShowBoundsAction.java (modified) (4 diffs)
• actions/ShowBoundsListAction.java (deleted)
• actions/ShowBoundsPropertiesAction.java (deleted)

applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/ImageryXmlBoundsPlugin.java

@@ -18 +18 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
-import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -24 +23 @@
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
-import org.openstreetmap.josm.plugins.imageryxmlbounds.actions.ShowBoundsListAction;
-import org.openstreetmap.josm.plugins.imageryxmlbounds.actions.ShowBoundsPropertiesAction;
+import org.openstreetmap.josm.plugins.imageryxmlbounds.actions.ShowBoundsAction;
 import org.openstreetmap.josm.plugins.imageryxmlbounds.actions.ShowBoundsSelectionAction;
 import org.openstreetmap.josm.plugins.imageryxmlbounds.actions.downloadtask.DownloadXmlBoundsTask;
@@ -46 +44 @@
      * Action showing bounds of the selected closed ways in Selection dialog 
      */
-        private final ShowBoundsListAction selectionListAction = new ShowBoundsListAction();
+        private final ShowBoundsAction selectionListAction = new ShowBoundsAction();
 
     /**
      * Action showing bounds of the selected multipolygons in Properties dialog 
      */
-    private final ShowBoundsPropertiesAction propertiesListAction = new ShowBoundsPropertiesAction();
+    private final ShowBoundsAction propertiesListAction = new ShowBoundsAction();
     
         /**
      * Action showing bounds of the selected multipolygons in Relations dialog
      */
-        private final ShowBoundsListAction relationListAction = new ShowBoundsListAction();
+        private final ShowBoundsAction relationListAction = new ShowBoundsAction();
 
     /**
@@ -82 +80 @@
                 Main.toolbar.register(selectionAction);
                 // Allow JOSM to download *.imagery.xml files
-                if (Version.getInstance().getVersion() >= 4523) {
-                    Main.main.menu.openLocation.addDownloadTaskClass(DownloadXmlBoundsTask.class);
-                }
+                Main.main.menu.openLocation.addDownloadTaskClass(DownloadXmlBoundsTask.class);
         }
         
@@ -102 +98 @@
                 if (newFrame != null) {
                     // Initialize dialogs actions only after the main frame is created 
-            newFrame.selectionListDialog.addPopupMenuSeparator();
-            newFrame.selectionListDialog.addPopupMenuAction(selectionListAction);
-            newFrame.propertiesDialog.addMembershipPopupMenuSeparator();
-            newFrame.propertiesDialog.addMembershipPopupMenuAction(propertiesListAction);
-                        newFrame.relationListDialog.addPopupMenuSeparator();
-                        newFrame.relationListDialog.addPopupMenuAction(relationListAction);
+            newFrame.selectionListDialog.getPopupMenuHandler().addSeparator();
+            newFrame.selectionListDialog.getPopupMenuHandler().addAction(selectionListAction);
+            newFrame.propertiesDialog.getMembershipPopupMenuHandler().addSeparator();
+            newFrame.propertiesDialog.getMembershipPopupMenuHandler().addAction(propertiesListAction);
+                        newFrame.relationListDialog.getPopupMenuHandler().addSeparator();
+                        newFrame.relationListDialog.getPopupMenuHandler().addAction(relationListAction);
+                } else if (oldFrame != null) {
+            // Remove listeners from previous frame to avoid memory leaks
+                    if (oldFrame.relationListDialog != null) {
+                        oldFrame.relationListDialog.getPopupMenuHandler().removeAction(relationListAction);
+                    }
+                    if (oldFrame.propertiesDialog != null) {
+                        oldFrame.propertiesDialog.getMembershipPopupMenuHandler().removeAction(propertiesListAction);
+                    }
+                    if (oldFrame.selectionListDialog != null) {
+                        oldFrame.selectionListDialog.getPopupMenuHandler().removeAction(selectionListAction);
+                    }
                 }
         }

applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ShowBoundsAction.java

@@ -19 +19 @@
 import java.awt.Font;
 import java.awt.event.ActionEvent;
+import java.util.Collection;
 
 import javax.swing.Box;
@@ -27 +28 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.OsmPrimitiveAction;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.plugins.imageryxmlbounds.XmlBoundsLayer;
 
@@ -34 +37 @@
  */
 @SuppressWarnings("serial")
-public class ShowBoundsAction extends ComputeBoundsAction {
+public class ShowBoundsAction extends ComputeBoundsAction implements OsmPrimitiveAction {
 
         public ShowBoundsAction() {
@@ -58 +61 @@
         JOptionPane.showMessageDialog(Main.parent, box, ACTION_NAME, JOptionPane.PLAIN_MESSAGE);
         }
+
+    @Override
+    public void setPrimitives(Collection<? extends OsmPrimitive> primitives) {
+        updateOsmPrimitives(primitives);
+    }
 }