Changeset 29769 in osm for applications/editors/josm/plugins/opendata/src/org

Timestamp:

2013-07-24T18:01:58+02:00 (11 years ago)

Author:

akks

Message:

[josm_utilsplugin2. josm_commandline, josm_livegps, josm_reverter, josm_opendata, josm_videomapping]:
rearrange menu items and change menu accelerators, add Netbeans projects, fix some syntax warnings

Location:

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata

Files:

• OdPlugin.java (modified) (1 diff)
• core/actions/OpenPreferencesActions.java (modified) (1 diff)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java

@@ -96 +96 @@
         loadModules();
         // Add menu
-        menu = Main.main.menu.addMenu(marktr("Open Data"), KeyEvent.VK_O, Main.main.menu.defaultMenuPos, ht("/Plugin/OpenData"));
+        boolean oldMenu = org.openstreetmap.josm.data.Version.getInstance().getVersion() < 6082;
+        
+        menu = oldMenu?
+            Main.main.menu.addMenu(marktr("Open Data"), KeyEvent.VK_O, Main.main.menu.defaultMenuPos, ht("/Plugin/OpenData"))
+            : Main.main.menu.dataMenu;
         buildMenu();
         // Add download task

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/OpenPreferencesActions.java

@@ -31 +31 @@
     public OpenPreferencesActions() {
         super(false);
-        putValue(NAME, tr("Preferences"));
+        putValue(NAME, tr("OpenData preferences"));
         putValue(SMALL_ICON, ImageProvider.get("dialogs", ICON_CORE_24));
                 putValue("toolbar", "opendata_open_preferences");