Changeset 27927 in osm for applications

Timestamp:

2012-02-23T10:17:25+01:00 (12 years ago)

Author:

akks

Message:

reltoolbox, turnlanes: fix shortcut and toolbar warnings

Location:

applications/editors/josm/plugins

Files:

• reltoolbox/build.xml (modified) (2 diffs)
• reltoolbox/src/relcontext/RelContextDialog.java (modified) (7 diffs)
• reltoolbox/src/relcontext/RelContextPlugin.java (modified) (2 diffs)
• reltoolbox/src/relcontext/actions/AddRemoveMemberAction.java (modified) (1 diff)
• reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java (modified) (1 diff)
• reltoolbox/src/relcontext/actions/CreateRelationAction.java (modified) (1 diff)
• reltoolbox/src/relcontext/actions/FindRelationAction.java (modified) (1 diff)
• turnlanes/build.xml (modified) (1 diff)
• turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java (modified) (2 diffs)

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

@@ -30 +30 @@
 <project name="reltoolbox" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="RelToolbox"/>
+    <property name="commit.message" value="RelToolbox: fix redifinition warnings"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4980"/>
+    <property name="plugin.main.version" value="5018"/>
     <!--
       ************************************************
@@ -243 +243 @@
     <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
     </target>
+    <target name="runjosm" depends="install">
+        <java jar="${josm}" fork="true">
+            <arg line="e:/test.osm"/>
+        </java>
+    </target>
+    
 </project>

applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java

@@ -58 +58 @@
 
     public final static String PREF_PREFIX = "reltoolbox";
-
+    
     private final DefaultTableModel relationsData;
     private ChosenRelation chosenRelation;
@@ -66 +66 @@
     private RoleComboBoxModel roleBoxModel;
     private SortAndFixAction sortAndFixAction;
+    // actions saved for unregistering on dialog destroying
+    private final EnterRoleAction enterRoleAction;
+    private final FindRelationAction findRelationAction;
+    private final CreateMultipolygonAction createMultipolygonAction;
+    private final CreateRelationAction createRelationAction;
+    private final AddRemoveMemberAction addRemoveMemberAction;
 
     public RelContextDialog() {
@@ -101 +107 @@
         });
         roleBox.setVisible(false);
-        final Action enterRoleAction = new EnterRoleAction(); // just for the shortcut
+        enterRoleAction = new EnterRoleAction(); // just for the shortcut
 
         // [±][X] relation U [AZ][Down][Edit]
         chosenRelationPanel = new JPanel(new GridBagLayout());
-        chosenRelationPanel.add(new JButton(new AddRemoveMemberAction(chosenRelation)), GBC.std());
+        addRemoveMemberAction = new AddRemoveMemberAction(chosenRelation);
+        chosenRelationPanel.add(new JButton(addRemoveMemberAction), GBC.std());
         chosenRelationPanel.add(sizeButton(new JButton(new ClearChosenRelationAction(chosenRelation)), 32, 0), GBC.std());
         final ChosenRelationComponent chosenRelationComponent = new ChosenRelationComponent(chosenRelation);
@@ -147 +154 @@
         // [+][Multi] [X]Adm [X]Tags [X]1
         JPanel bottomLine = new JPanel(new GridBagLayout());
-        bottomLine.add(new JButton(new CreateRelationAction(chosenRelation)), GBC.std());
-        final JButton multipolygonButton = new JButton(new CreateMultipolygonAction(chosenRelation));
+        createRelationAction = new CreateRelationAction(chosenRelation);
+        bottomLine.add(new JButton(createRelationAction), GBC.std());
+        createMultipolygonAction = new CreateMultipolygonAction(chosenRelation);
+        final JButton multipolygonButton = new JButton(createMultipolygonAction);
         bottomLine.add(multipolygonButton, GBC.std());
 //        bottomLine.add(sizeButton(new JButton(new MultipolygonSettingsAction()), 16, 0), GBC.std().fill(GBC.VERTICAL));
         bottomLine.add(Box.createHorizontalGlue(), GBC.std().fill());
-        bottomLine.add(new JButton(new FindRelationAction(chosenRelation)), GBC.eol());
+        findRelationAction = new FindRelationAction(chosenRelation);
+        bottomLine.add(new JButton(findRelationAction), GBC.eol());
         rcPanel.add(sizeButton(bottomLine, 0, 24), BorderLayout.SOUTH);
 
@@ -351 +361 @@
     }
 
+    @Override
+    public void destroy() {
+        enterRoleAction.destroy();
+        findRelationAction.destroy();
+        createMultipolygonAction.destroy();
+        createRelationAction.destroy();
+        addRemoveMemberAction.destroy();
+        super.destroy();
+    }
+    
     private static final String POSSIBLE_ROLES_FILE = "relcontext/possible_roles.txt";
     private static final Map<String, List<String>> possibleRoles = loadRoles();
@@ -545 +565 @@
             super(tr("Change role"), null, tr("Enter role for selected members"),
                     Shortcut.registerShortcut("reltoolbox:changerole", tr("Relation Toolbox: {0}", tr("Enter role for selected members")),
-                    KeyEvent.VK_R, Shortcut.ALT_CTRL), true, "relcontext/enterrole", true);
+                    KeyEvent.VK_R, Shortcut.ALT_CTRL), false, "relcontext/enterrole", true);
             chosenRelation.addChosenRelationListener(this);
             updateEnabledState();
@@ -561 +581 @@
             setEnabled(newRelation != null);
         }
-    }
-
+        }
+        
     private class RoleComboBoxModel extends AbstractListModel implements ComboBoxModel {
         private List<String> roles = new ArrayList<String>();

applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextPlugin.java

@@ -1 +1 @@
 package relcontext;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -17 +18 @@
     public void mapFrameInitialized( MapFrame oldFrame, MapFrame newFrame ) {
         if( oldFrame == null && newFrame != null ) {
+//            if (dialog!=null) dialog.destroy();
             dialog = new RelContextDialog();
             newFrame.addToggleDialog(dialog);

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/AddRemoveMemberAction.java

@@ -34 +34 @@
         super(null, "relcontext/addremove", tr("Add/remove members from the chosen relation"),
                 Shortcut.registerShortcut("reltoolbox:addremove", tr("Relation Toolbox: {0}", tr("Add/remove members from the chosen relation")),
-                KeyEvent.VK_EQUALS, Shortcut.DIRECT), true);
+                KeyEvent.VK_EQUALS, Shortcut.DIRECT), false);
         this.rel = rel;
         rel.addChosenRelationListener(this);

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java

@@ -31 +31 @@
         super("Multi", "data/multipolygon", tr("Create a multipolygon from selected objects"),
                 Shortcut.registerShortcut("reltoolbox:multipolygon", tr("Relation Toolbox: {0}", tr("Create multipolygon")),
-                KeyEvent.VK_B, Shortcut.CTRL), true);
+                KeyEvent.VK_B, Shortcut.CTRL), false);
         this.chRel = chRel;
         updateEnabledState();

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java

@@ -39 +39 @@
         super(tr("New"), "data/relation", tr("Create a relation from selected objects"),
                 Shortcut.registerShortcut("reltoolbox:create", tr("Relation Toolbox: {0}", tr("Create a new relation")),
-                KeyEvent.VK_N, Shortcut.ALT_CTRL), true);
+                KeyEvent.VK_N, Shortcut.ALT_CTRL), false);
         this.chRel = chRel;
         updateEnabledState();

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/FindRelationAction.java

@@ -29 +29 @@
         super("Find", "relcontext/find", tr("Find a relation"),
                 Shortcut.registerShortcut("reltoolbox:find", tr("Relation Toolbox: {0}", tr("Find a relation")),
-                KeyEvent.VK_F, Shortcut.ALT_CTRL), true);
+                KeyEvent.VK_F, Shortcut.ALT_CTRL), false);
         this.chRel = chRel;
     }

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

@@ -30 +30 @@
 <project name="turnlanes" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="Commit message"/>
+    <property name="commit.message" value="fix toolbar warnings - toolbar still does not work"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4980"/>
+    <property name="plugin.main.version" value="5018"/>
     <!--
       ************************************************

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java

@@ -47 +47 @@
             super(tr("Edit"), "dialogs/edit", tr("Edit turn relations and lane lengths for selected node."), null,
                     false);
-            putValue("toolbar", "turnlanes/edit");
-            Main.toolbar.register(this);
+            //putValue("toolbar", "turnlanes/edit");            Main.toolbar.register(this);
+            // did not work in 5018
+
         }
         
@@ -67 +68 @@
             super(tr("Validate"), "dialogs/validator", tr("Validate turn- and lane-length-relations for consistency."),
                     null, false);
-            putValue("toolbar", "turnlanes/validate");
-            Main.toolbar.register(this);
+            // putValue("toolbar", "turnlanes/validate");            Main.toolbar.register(this);
+            // did not work in 5018
         }