Index: applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanVecTile.java
===================================================================
--- applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanVecTile.java	(revision 30736)
+++ applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanVecTile.java	(revision 30737)
@@ -25,8 +25,8 @@
 	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,5 +232,5 @@
 	}
 	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,5 +250,5 @@
 				} 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,5 +271,5 @@
 				} 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));
 				}
Index: applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecLayer.java
===================================================================
--- applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecLayer.java	(revision 30736)
+++ applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecLayer.java	(revision 30737)
@@ -36,7 +36,7 @@
 	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,5 +56,5 @@
 			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,5 +66,5 @@
 						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,6 +205,6 @@
 		//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);