Changeset 29854 in osm for applications/editors/josm/plugins/canvec_helper

Timestamp:

2013-08-21T03:47:16+02:00 (11 years ago)

Author:

donvip

Message:

[josm_plugins] fix #8987 - bump min JOSM version of nearly all plugins to r6162 + code update/cleanup, fix warnings

Location:

applications/editors/josm/plugins/canvec_helper

Files:

• .settings (added)
• .settings/org.eclipse.jdt.core.prefs (added)
• build.xml (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/canvec_helper/CanVecTile.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/canvec_helper/CanvecHelper.java (moved) (moved from applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/canvec_helper.java ) (1 diff)
• src/org/openstreetmap/josm/plugins/canvec_helper/CanvecHelperAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/canvec_helper/CanvecLayer.java (moved) (moved from applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/canvec_layer.java ) (6 diffs)
• src/org/openstreetmap/josm/plugins/canvec_helper/SetMaxZoom.java (modified) (1 diff)

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-** This is a template build file for a JOSM  plugin.
-**
-** Maintaining versions
-** ====================
-** See README.template
-**
-** Usage
-** =====
-** Call "ant help" to get possible build targets.
-**
--->
 <project name="canvec_helper" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
     <property name="commit.message" value="JOSM/Canvec_helper: update to new menu structure"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6097"/>
+    <property name="plugin.main.version" value="6162"/>
     
     <!-- Configure these properties (replace "..." accordingly).
@@ -22 +10 @@
     -->
     <property name="plugin.author" value="Michael Bishop"/>
-    <property name="plugin.class" value="org.openstreetmap.josm.plugins.canvec_helper.canvec_helper"/>
+    <property name="plugin.class" value="org.openstreetmap.josm.plugins.canvec_helper.CanvecHelper"/>
     <property name="plugin.description" value="Overlays the canvec tile grid on the map and prints URL''s to the .zip files. Future goals: allow auto-downloading and loading of canvec .osm files"/>
 

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

@@ -23 +23 @@
 
 public class CanVecTile {
-        canvec_layer layer;
+        CanvecLayer layer;
         public boolean can_download = false;
         private ArrayList<String> sub_tile_ids = new ArrayList<String>();
@@ -39 +39 @@
         private Bounds bounds;
         public String tileid;
-        public CanVecTile(String tileid,canvec_layer layer) {
+        public CanVecTile(String tileid,CanvecLayer layer) {
                 String parta,partb,partc,partd;
                 parta = tileid.substring(0,3);
@@ -50 +50 @@
                 real_init(a,partb,c,partd,layer,new ArrayList<String>());
         }
-        public CanVecTile(int a,String b,int c,String d,canvec_layer layer,ArrayList<String> index) {
+        public CanVecTile(int a,String b,int c,String d,CanvecLayer layer,ArrayList<String> index) {
                 real_init(a,b,c,d,layer,index);
         }
-        public void real_init(int a,String b,int c,String d,canvec_layer layer, ArrayList<String> index) {
+        public void real_init(int a,String b,int c,String d,CanvecLayer layer, ArrayList<String> index) {
                 this.index = index;
                 this.layer = layer;

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

@@ -6 +6 @@
 import org.openstreetmap.josm.Main;
 
-public class canvec_helper extends Plugin {
-        public canvec_helper(PluginInformation info) {
+public class CanvecHelper extends Plugin {
+    
+        public CanvecHelper(PluginInformation info) {
                 super(info);
-                System.out.println("in constructor");
                 Main.main.menu.imagerySubMenu.add(new CanvecHelperAction(this));
         }
-        @Override
+        
+    @Override
         public void mapFrameInitialized(MapFrame old, MapFrame new1) {
                 updateLayer();
         }
+    
         private synchronized void updateLayer() {
         }
-        private canvec_layer layer;
 }

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

@@ -5 +5 @@
 
 public class CanvecHelperAction extends JosmAction {
-        private canvec_helper parent_temp;
-        public CanvecHelperAction(canvec_helper parent) {
+        private CanvecHelper parent_temp;
+        public CanvecHelperAction(CanvecHelper parent) {
                 super("CanVec Helper","layericon24",null,null,false);
                 parent_temp = parent;
@@ -12 +12 @@
         @Override
         public void actionPerformed(java.awt.event.ActionEvent action) {
-                canvec_layer layer;
-                layer = new canvec_layer("canvec tile helper",parent_temp);
+                CanvecLayer layer;
+                layer = new CanvecLayer("canvec tile helper",parent_temp);
                 Main.main.addLayer(layer);
         }

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

@@ -31 +31 @@
 
 // most of the layout was copied from the openstreetbugs plugin to get things started
-public class canvec_layer extends Layer implements MouseListener {
+public class CanvecLayer extends Layer implements MouseListener {
         private Icon layerIcon = null;
         private int max_zoom = 4;
-        public canvec_helper plugin_self;
+        public CanvecHelper plugin_self;
         private ArrayList<CanVecTile> tiles = new ArrayList<CanVecTile>();
         public ArrayList<CanVecTile> downloadable = new ArrayList<CanVecTile>();
         public ArrayList<CanVecTile> openable = new ArrayList<CanVecTile>();
 
-        public canvec_layer(String name,canvec_helper self){
+        public CanvecLayer(String name,CanvecHelper self){
                 super(name);
                 plugin_self = self;
@@ -71 +71 @@
                                 } else System.out.print("bad line '" + line + "'\n");
                         }
+                        br.close();
                         CanVecTile tile = new CanVecTile(last_cell,"",0,"",this,list);
                         if (tile.isValid()) tiles.add(tile);
@@ -92 +93 @@
         }
         public class MaxZoomAction extends AbstractAction implements LayerAction {
-                private canvec_layer parent;
-                public MaxZoomAction(canvec_layer parent) {
+                private CanvecLayer parent;
+                public MaxZoomAction(CanvecLayer parent) {
                         this.parent = parent;
                 }
@@ -124 +125 @@
         }
         private class OpenOsmAction extends AbstractAction implements LayerAction {
-                private canvec_layer layer;
-                public OpenOsmAction(canvec_layer layer) {
+                private CanvecLayer layer;
+                public OpenOsmAction(CanvecLayer layer) {
                         this.layer = layer;
                 }
@@ -155 +156 @@
         }
         private class DownloadCanvecAction extends AbstractAction implements LayerAction {
-                private canvec_layer parent;
-                public DownloadCanvecAction(canvec_layer parent) {
+                private CanvecLayer parent;
+                public DownloadCanvecAction(CanvecLayer parent) {
                         this.parent = parent;
                 }
@@ -207 +208 @@
                         tile.paint(g,mv,bounds,max_zoom);
                 }
-                long end = System.currentTimeMillis();
+                //long end = System.currentTimeMillis();
                 //System.out.println((end-start)+"ms spent");
         }

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

@@ -5 +5 @@
 
 class SetMaxZoom extends AbstractAction {
-        private canvec_layer parent;
+        private CanvecLayer parent;
         private int level;
-        public SetMaxZoom(canvec_layer parent,int level) {
+        public SetMaxZoom(CanvecLayer parent,int level) {
                 super(""+level);
                 this.level = level;