Changeset 29412 in osm for applications/editors/josm/plugins/imagery_offset_db/src/iodb/ImageryOffsetPlugin.java

Timestamp:

2013-03-27T20:56:51+01:00 (12 years ago)

Author:

zverik

Message:

iodb: save last layer offset, update min josm version, reduce max button count

File:

• applications/editors/josm/plugins/imagery_offset_db/src/iodb/ImageryOffsetPlugin.java (modified) (2 diffs)

applications/editors/josm/plugins/imagery_offset_db/src/iodb/ImageryOffsetPlugin.java

@@ -5 +5 @@
 import javax.swing.JMenu;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -31 +32 @@
         storeAction = new StoreImageryOffsetAction();
         
-        JMenu offsetMenu = Main.main.menu.addMenu(marktr("Offset"), KeyEvent.VK_O, 6, "help");
+        // before 5803 imagery menu was constantly regenerated, erasing extra items
+        // before 5729 it was regenerated only when the imagery list was modified (also bad)
+        int version = Version.getInstance().getVersion();
+        JMenu offsetMenu = version < 5803
+                ? Main.main.menu.addMenu(marktr("Offset"), KeyEvent.VK_O, 6, "help")
+                : Main.main.menu.imageryMenu;
         offsetMenu.add(getAction);
         offsetMenu.add(storeAction);
+        if( version >= 5803 ) // todo: check if this is needed
+            offsetMenu.addSeparator();
 
         // an ugly hack to add this plugin to the toolbar
-        Collection<String> toolbar = new LinkedList<String>(Main.toolbar.getToolString());
-        if( !toolbar.contains("getoffset") && Main.pref.getBoolean("iodb.modify.toolbar", true) ) {
-            toolbar.add("getoffset");
-            Main.pref.putCollection("toolbar", toolbar);
+        if( Main.pref.getBoolean("iodb.modify.toolbar", true) ) {
+            Collection<String> toolbar = new LinkedList<String>(Main.toolbar.getToolString());
+            if( !toolbar.contains("getoffset") ) {
+                toolbar.add("getoffset");
+                Main.pref.putCollection("toolbar", toolbar);
+                Main.toolbar.refreshToolbarControl();
+            }
             Main.pref.put("iodb.modify.toolbar", false);
-            Main.toolbar.refreshToolbarControl();
         }
     }