Changeset 20079 in osm for applications/editors/josm

Timestamp:

2010-02-20T10:35:41+01:00 (14 years ago)

Author:

bastik

Message:

'Tageditor: fixed josm bug 2416'

Location:

applications/editors/josm/plugins/tageditor

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/tageditor/TagEditorPlugin.java (modified) (2 diffs)

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

@@ -28 +28 @@
 
 
-        <property name="commit.message" value="Tageditor plugin cleaned up" />
+        <property name="commit.message" value="Tageditor: fixed josm bug 2416" />
         <property name="plugin.main.version" value="3015" />
 

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java

@@ -21 +21 @@
 public class LaunchAction extends JosmAction implements SelectionChangedListener {
 
-        protected void registerAsMenuItem() {
-                JMenuBar menu = Main.main.menu;
-                JMenu edit = null;
-                JMenuItem item = new JMenuItem(this);
-
-                for (int i = 0; i < menu.getMenuCount(); ++i) {
-                        if (menu.getMenu(i) != null
-                                        && tr("Edit").equals(menu.getMenu(i).getText())) {
-                                edit = menu.getMenu(i);
-                                break;
-                        }
-                }
-
-                if (edit != null) {
-                        edit.insertSeparator(edit.getItemCount());
-                        JMenuItem mitem = edit.insert(this, edit.getItemCount());
-                        mitem.setAccelerator(KeyStroke.getKeyStroke('T'));
-                } else if (menu.getMenuCount() > 0) {
-                        edit = menu.getMenu(0);
-                        JMenuItem mitem = edit.insert(this, 0);
-                        mitem.setAccelerator(KeyStroke.getKeyStroke('T'));
-
-                }
-
-                item.setVisible(true);
-        }
-
         public LaunchAction()  {
                 super(
@@ -58 +31 @@
                                                 KeyEvent.VK_T,
                                                 Shortcut.GROUP_EDIT),
-                                                false // don't register, plugin will add the action to the menu
+                                                true
                 );
 
                 DataSet.selListeners.add(this);
-                registerAsMenuItem();
                 setEnabled(false);
         }

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorPlugin.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.tageditor;
 
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
 
 public class TagEditorPlugin extends Plugin {
-
-        LaunchAction action = null;
+        LaunchAction action;
         
         /**
@@ -14 +15 @@
                 super(info);
                 action = new LaunchAction();
+                MainMenu.add(Main.main.menu.editMenu, action);
         }
 }