Changeset 30737 in osm for applications/editors/josm/plugins/canvec_helper/src

Timestamp:

2014-10-18T23:07:52+02:00 (11 years ago)

Author:

donvip

Message:

[josm_plugins] fix Java 7 / unused code warnings

Location:

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

Files:

• CanVecTile.java (modified) (4 diffs)
• CanvecLayer.java (modified) (4 diffs)

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

@@ -25 +25 @@
         CanvecLayer layer;
         public boolean can_download = false;
-        private ArrayList<String> sub_tile_ids = new ArrayList<String>();
+        private ArrayList<String> sub_tile_ids = new ArrayList<>();
         private boolean zip_scanned = false;
         
-        private ArrayList<CanVecTile> sub_tiles = new ArrayList<CanVecTile>();
+        private ArrayList<CanVecTile> sub_tiles = new ArrayList<>();
         private boolean sub_tiles_made = false;
 
@@ -232 +232 @@
         }
         private void make_sub_tiles(int layer) {
-                ArrayList<String> buffer = new ArrayList<String>();
+                ArrayList<String> buffer = new ArrayList<>();
                 Pattern p;
                 if (sub_tiles_made) return;
@@ -250 +250 @@
                                 } else {
                                         sub_tiles.add(new CanVecTile(corda,last_cell,0,"",this.layer,buffer));
-                                        buffer = new ArrayList<String>();
+                                        buffer = new ArrayList<>();
                                         buffer.add(m.group(0));
                                 }
@@ -271 +271 @@
                                 } else {
                                         sub_tiles.add(new CanVecTile(corda,cordb,last_cell2,"",this.layer,buffer));
-                                        buffer = new ArrayList<String>();
+                                        buffer = new ArrayList<>();
                                         buffer.add(m.group(0));
                                 }

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

@@ -36 +36 @@
         private int max_zoom = 4;
         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>();
+        private ArrayList<CanVecTile> tiles = new ArrayList<>();
+        public ArrayList<CanVecTile> downloadable = new ArrayList<>();
+        public ArrayList<CanVecTile> openable = new ArrayList<>();
 
         public CanvecLayer(String name,CanvecHelper self){
@@ -56 +56 @@
                         String line;
                         int last_cell = -1;
-                        ArrayList<String> list = new ArrayList<String>();
+                        ArrayList<String> list = new ArrayList<>();
                         while ((line = br.readLine()) != null) {
                                 Matcher m = p.matcher(line);
@@ -66 +66 @@
                                                 CanVecTile tile = new CanVecTile(last_cell,"",0,"",this,list);
                                                 if (tile.isValid()) tiles.add(tile);
-                                                list = new ArrayList<String>();
+                                                list = new ArrayList<>();
                                                 list.add(m.group(0));
                                         }
@@ -205 +205 @@
                 //long start = System.currentTimeMillis();
                 //System.out.println("painting the area covered by "+bounds.toString());
-                downloadable = new ArrayList<CanVecTile>();
-                openable = new ArrayList<CanVecTile>();
+                downloadable = new ArrayList<>();
+                openable = new ArrayList<>();
                 // loop over each canvec tile in the db and check bounds.intersects(Bounds)
                 g.setColor(Color.red);