Changeset 29805 in osm for applications/editors/josm/plugins/piclayer

Timestamp:

2013-08-01T18:46:11+02:00 (11 years ago)

Author:

akks

Message:

[josm/plugins]: more imagery layer adding actions to Imagery/More submenu

Location:

applications/editors/josm/plugins/piclayer

Files:

• build.xml (modified) (1 diff)
• nbproject (added)
• nbproject/project.xml (added)
• src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java (modified) (5 diffs)

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

@@ -3 +3 @@
     <property name="commit.message" value="PicLayer - #8743 - fixed NPE when removing last layer"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6088"/>
+    <property name="plugin.main.version" value="6097"/>
         
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java

@@ -21 +21 @@
 package org.openstreetmap.josm.plugins.piclayer;
 
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
-import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.event.KeyEvent;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.swing.JMenu;
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.gui.IconToggleButton;
+import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
@@ -64 +62 @@
 
     // Plugin menu
-    private JMenu menu = null;
-
+    JosmAction newLayerFromFileAction = new NewLayerFromFileAction();
+    JosmAction newLayerFromClipboardAction = new NewLayerFromClipboardAction();
     /**
      * Constructor...
@@ -73 +71 @@
 
         // Create menu entry
-        if ( Main.main.menu != null ) {
-            menu = Main.main.menu.addMenu(marktr("PicLayer") , KeyEvent.VK_L, Main.main.menu.getDefaultMenuPos(), ht("/Plugin/PicLayer"));
-        }
-
+        
         // Add menu items
-        if ( menu != null ) {
-            menu.add(new NewLayerFromFileAction());
-            menu.add(new NewLayerFromClipboardAction());
-            menu.setEnabled(false);
-        }
-
+        MainMenu.add(Main.main.menu.imagerySubMenu, newLayerFromFileAction);
+        MainMenu.add(Main.main.menu.imagerySubMenu, newLayerFromClipboardAction);
         // Listen to layers
         MapView.addLayerChangeListener(this);
@@ -154 +145 @@
     @Override
     public void layerAdded(Layer arg0) {
-        menu.setEnabled(true);
+        newLayerFromClipboardAction.setEnabled(true);
+        newLayerFromClipboardAction.setEnabled(true);
     }
 
@@ -171 +163 @@
         // Why should I do all these checks now?
         boolean enable = Main.map != null && Main.map.mapView != null && Main.map.mapView.getAllLayers() != null && Main.map.mapView.getAllLayers().size() != 0;
-        menu.setEnabled(enable);
+        newLayerFromClipboardAction.setEnabled(enable);
+        newLayerFromClipboardAction.setEnabled(enable);
     }
 };