Changeset 29461 in osm for applications/editors/josm

Timestamp:

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

Author:

donvip

Message:

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

Location:

applications/editors/josm/plugins

Files:

• imagery-xml-bounds/.classpath (modified) (1 diff)
• imagery-xml-bounds/build.xml (modified) (2 diffs)
• imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/ImageryXmlBoundsPlugin.java (modified) (5 diffs)
• imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ShowBoundsAction.java (modified) (4 diffs)
• imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ShowBoundsListAction.java (deleted)
• imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ShowBoundsPropertiesAction.java (deleted)
• tag2link/build.xml (modified) (2 diffs)
• tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkPlugin.java (modified) (1 diff)

applications/editors/josm/plugins/imagery-xml-bounds/.classpath

@@ -2 +2 @@
 <classpath>
         <classpathentry kind="src" path="src"/>
-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
         <classpathentry kind="output" path="bin"/>

applications/editors/josm/plugins/imagery-xml-bounds/build.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-** This is a template build file for the imagery-xml-bounds plugin.
-**
-** Maintaining versions
-** ====================
-** see README.template
-**
-** Usage
-** =====
-** To build it run
-**
-**    > ant  dist
-**
-** To install the generated plugin locally (in you default plugin directory) run
-**
-**    > ant  install
-**
-** The generated plugin jar is not automatically available in JOSMs plugin configuration
-** dialog. You have to check it in first.
-**
-** Use the ant target 'publish' to check in the plugin and make it available to other
-** JOSM users:
-**    set the properties commit.message and plugin.main.version
-** and run
-**    > ant  publish
-**
-**
--->
 <project name="imagery-xml-bounds" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="5459"/>
+    <property name="plugin.main.version" value="5821"/>
         
     <!-- Configure these properties (replace "..." accordingly).
@@ -42 +14 @@
     <property name="plugin.icon" value="images/xml_24.png"/>
     <property name="plugin.link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/Imagery-XML-Bounds"/>
-    <!--<property name="plugin.early" value="..."/>-->
-    <!--<property name="plugin.requires" value="..."/>-->
-    <!--<property name="plugin.stage" value="..."/>-->
 
     <!-- ** include targets that all plugins have in common ** -->

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);
+    }
 }

applications/editors/josm/plugins/tag2link/build.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-** This is a template build file for a JOSM  plugin.
-**
-** Maintaining versions
-** ====================
-** See README.template
-**
-** Usage
-** =====
-** Call "ant help" to get possible build targets.
-**
--->
 <project name="tag2link" default="dist" basedir=".">
 
@@ -17 +5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4968"/>
+    <property name="plugin.main.version" value="5821"/>
 
     <property name="plugin.author" value="Don-vip &amp; FrViPofm"/>

applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkPlugin.java

@@ -74 +74 @@
         if (newFrame != null) {
             // Initialize dialogs listeners only after the main frame is created
-            newFrame.selectionListDialog.addPopupMenuListener(selectionPopupListener = new SelectionPopupListener(newFrame));
-            newFrame.propertiesDialog.addMembershipPopupMenuListener(membershipPopupListener = new MembershipPopupListener(newFrame));
-            newFrame.propertiesDialog.addPropertyPopupMenuListener(propertyPopupListener = new PropertyPopupListener(newFrame));
-            newFrame.relationListDialog.addPopupMenuListener(relationPopupListener = new RelationPopupListener(newFrame));
+            newFrame.selectionListDialog.getPopupMenuHandler().addListener(selectionPopupListener = new SelectionPopupListener(newFrame));
+            newFrame.propertiesDialog.getMembershipPopupMenuHandler().addListener(membershipPopupListener = new MembershipPopupListener(newFrame));
+            newFrame.propertiesDialog.getPropertyPopupMenuHandler().addListener(propertyPopupListener = new PropertyPopupListener(newFrame));
+            newFrame.relationListDialog.getPopupMenuHandler().addListener(relationPopupListener = new RelationPopupListener(newFrame));
         } else if (oldFrame != null) {
             // Remove listeners from previous frame to avoid memory leaks
             if (oldFrame.selectionListDialog != null) {
-                oldFrame.selectionListDialog.removePopupMenuListener(selectionPopupListener);
+                oldFrame.selectionListDialog.getPopupMenuHandler().removeListener(selectionPopupListener);
             }
             if (oldFrame.propertiesDialog != null) {
-                oldFrame.propertiesDialog.removeMembershipPopupMenuListener(membershipPopupListener);
-                oldFrame.propertiesDialog.removePropertyPopupMenuListener(propertyPopupListener);
+                oldFrame.propertiesDialog.getMembershipPopupMenuHandler().removeListener(membershipPopupListener);
+                oldFrame.propertiesDialog.getPropertyPopupMenuHandler().removeListener(propertyPopupListener);
             }
             if (oldFrame.relationListDialog != null) {
-                oldFrame.relationListDialog.removePopupMenuListener(relationPopupListener);
+                oldFrame.relationListDialog.getPopupMenuHandler().removeListener(relationPopupListener);
             }
             selectionPopupListener = null;