Changeset 29854 in osm for applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecLayer.java

Timestamp:

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

Author:

donvip

Message:

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

File:

• applications/editors/josm/plugins/canvec_helper/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)

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");
         }