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

Timestamp:

2010-08-03T08:17:26+02:00 (15 years ago)

Author:

jttt

Message:

Adapt to latest josm

Location:

applications/editors/josm/plugins/piclayer

Files:

• build.xml (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromClipboardAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java (modified) (7 diffs)

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

@@ -24 +24 @@
 
         <property name="commit.message" value="Changed the constructor signature of the plugin main class" />
-        <property name="plugin.main.version" value="2830" />
+        <property name="plugin.main.version" value="3408" />
 
         <!--
@@ -138 +138 @@
 
         <!--
-                 ************************** Publishing the plugin *********************************** 
-                -->
-        <!--
-                ** extracts the JOSM release for the JOSM version in ../core and saves it in the 
+                 ************************** Publishing the plugin ***********************************
+                -->
+        <!--
+                ** extracts the JOSM release for the JOSM version in ../core and saves it in the
                 ** property ${coreversion.info.entry.revision}
                 **
@@ -190 +190 @@
 
         <!--
-                ** commits the plugin.jar 
+                ** commits the plugin.jar
                 -->
         <target name="commit-dist">
                 <echo>
         ***** Properties of published ${plugin.jar} *****
-        Commit message    : '${commit.message}'                                 
+        Commit message    : '${commit.message}'
         Plugin-Mainversion: ${plugin.main.version}
         JOSM build version: ${coreversion.info.entry.revision}
         Plugin-Version    : ${version.entry.commit.revision}
-        ***** / Properties of published ${plugin.jar} *****                                     
-                                                
+        ***** / Properties of published ${plugin.jar} *****
+
         Now commiting ${plugin.jar} ...
         </echo>

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

@@ -51 +51 @@
                 // Add layer only if successfully initialized
                 try {
-                        layer.Initialize();
+                        layer.initialize();
                 }
                 catch (IOException e) {

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

@@ -91 +91 @@
                         // Add layer only if successfully initialized
                         try {
-                                layer.Initialize();
+                                layer.initialize();
                         }
                         catch (IOException e) {

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

@@ -29 +29 @@
 import java.awt.Image;
 import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
+import java.util.List;
 import java.util.Properties;
 
+import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
 import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.JSeparator;
 
 import org.openstreetmap.josm.Main;
@@ -69 +71 @@
     // The scale that was set on the map during image creation
     private double m_initial_scale = 0;
-    // Popup menu items
-    private Component m_popupmenu[] = null;
     // Layer icon
     private Icon m_layericon = null;
@@ -93 +93 @@
         m_counter++;
 
-        // Create popup menu
-        // Reset submenu
-        JMenu reset_submenu = new JMenu(tr("Reset"));
-        reset_submenu.add( new ResetPictureAllAction( this ) );
-        reset_submenu.addSeparator();
-        reset_submenu.add( new ResetPicturePositionAction( this ) );
-        reset_submenu.add( new ResetPictureAngleAction( this ) );
-        reset_submenu.add( new ResetPictureScaleAction( this ) );
-        // Main menu
-        m_popupmenu = new Component[]{
-                reset_submenu,
-                new JSeparator(),
-                new JMenuItem( new SavePictureCalibrationAction(this)),
-                new JMenuItem( new LoadPictureCalibrationAction(this)),
-        };
-
         // Load layer icon
         m_layericon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(PicLayerAbstract.class.getResource("/images/layericon.png")));
@@ -117 +101 @@
      * initial parameters. Throws exception if something fails.
      */
-    public void Initialize() throws IOException {
+    public void initialize() throws IOException {
 
         // Create image
@@ -165 +149 @@
 
     @Override
-    public Component[] getMenuEntries() {
-        return m_popupmenu;
+    public Action[] getMenuEntries() {
+        // Main menu
+        return new Action[] {
+                new ResetSubmenuAction(),
+                SeparatorLayerAction.INSTANCE,
+                new SavePictureCalibrationAction(this),
+                new LoadPictureCalibrationAction(this),
+        };
     }
 
@@ -189 +179 @@
     public void paint(Graphics2D g2, MapView mv, Bounds bounds) {
 
-        if ( m_image != null && g2 instanceof Graphics2D) {
+        if ( m_image != null) {
 
             // Position image at the right graphical place
@@ -320 +310 @@
             Main.map.mapView.repaint();
     }
+
+    private class ResetSubmenuAction extends AbstractAction implements LayerAction {
+
+        public ResetSubmenuAction() {
+                super(tr("Reset"));
+                }
+
+                public void actionPerformed(ActionEvent e) {
+                }
+
+                public Component createMenuComponent() {
+                        JMenu reset_submenu = new JMenu(this);
+                reset_submenu.add( new ResetPictureAllAction( PicLayerAbstract.this ) );
+                reset_submenu.addSeparator();
+                reset_submenu.add( new ResetPicturePositionAction( PicLayerAbstract.this ) );
+                reset_submenu.add( new ResetPictureAngleAction( PicLayerAbstract.this ) );
+                reset_submenu.add( new ResetPictureScaleAction( PicLayerAbstract.this ) );
+                return reset_submenu;
+                }
+
+                public boolean supportLayers(List<Layer> layers) {
+                        return layers.size() == 1 && layers.get(0) instanceof PicLayerAbstract;
+                }
+
+    }
 }