Changeset 27920 in osm for applications/editors/josm/plugins/canvec_helper/src/org

Timestamp:

2012-02-22T19:59:29+01:00 (13 years ago)

Author:

clever

Message:

moved it to a proper action on the imagery menu

Location:

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

Files:

• CanvecHelperAction.java (added)
• canvec_helper.java (modified) (2 diffs)
• canvec_layer.java (modified) (4 diffs)

applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/canvec_helper.java

@@ -10 +10 @@
                 super(info);
                 System.out.println("in constructor");
+                Main.main.menu.imageryMenu.add(new CanvecHelperAction(this));
         }
         public void mapFrameInitialized(MapFrame old, MapFrame new1) {
@@ -16 +17 @@
         }
         private synchronized void updateLayer() {
-                if(layer == null) {
-                        layer = new canvec_layer("canvec tile helper",this);
-                        Main.main.addLayer(layer);
-                }
         }
         private canvec_layer layer;

applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/canvec_layer.java

@@ -8 +8 @@
 import java.awt.Point;
 import java.awt.Color;
+import java.awt.Toolkit;
 import java.io.IOException;
 
 import javax.swing.Action;
 import javax.swing.Icon;
+import javax.swing.ImageIcon;
 import org.openstreetmap.josm.actions.RenameLayerAction;
 import org.openstreetmap.josm.data.Bounds;
@@ -23 +25 @@
 // most of the layout was copied from the openstreetbugs plugin to get things started
 public class canvec_layer extends Layer implements MouseListener {
+        private Icon layerIcon = null;
         canvec_helper plugin_self;
         private ArrayList<CanVecTile> tiles = new ArrayList<CanVecTile>();
+
         public canvec_layer(String name,canvec_helper self){
                 super(name);
@@ -33 +37 @@
                         if (tile.isValid()) tiles.add(tile);
                 }
+                layerIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(getClass().getResource("/images/layericon.png")));
         }
         public Action[] getMenuEntries() {
@@ -52 +57 @@
         }
         public void mergeFrom(Layer from) {}
-        public Icon getIcon() {
-                return null; // FIXME
-        }
+        public Icon getIcon() { return layerIcon; }
         public void paint(Graphics2D g, MapView mv, Bounds bounds) {
                 long start = System.currentTimeMillis();