Changeset 30737 in osm for applications/editors/josm/plugins/lakewalker/src/org/openstreetmap

Timestamp:

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

Author:

donvip

Message:

[josm_plugins] fix Java 7 / unused code warnings

Location:

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

Files:

• Lakewalker.java (modified) (4 diffs)
• LakewalkerAction.java (modified) (3 diffs)
• LakewalkerWMS.java (modified) (1 diff)

applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java

@@ -93 +93 @@
             Boolean detect_loop = false;
 
-            ArrayList<double[]> nodelist = new ArrayList<double[]>();
+            ArrayList<double[]> nodelist = new ArrayList<>();
 
             int[] xy = geo_to_xy(lat,lon,this.resolution);
@@ -255 +255 @@
 
         double[] test_v = nodes.get(0);
-        ArrayList<double[]> reducednodes = new ArrayList<double[]>();
+        ArrayList<double[]> reducednodes = new ArrayList<>();
 
         double prox_sq = Math.pow(proximity, 2);
@@ -362 +362 @@
         double[] last = nodes.get(nodes.size()-1);
 
-        ArrayList<double[]> new_nodes = new ArrayList<double[]>();
+        ArrayList<double[]> new_nodes = new ArrayList<>();
 
         double d = 0;
@@ -391 +391 @@
 
     private ArrayList<double[]> sublist(ArrayList<double[]> l, int i, int f) throws ArrayIndexOutOfBoundsException {
-        ArrayList<double[]> sub = new ArrayList<double[]>();
+        ArrayList<double[]> sub = new ArrayList<>();
 
         if(f<i || i < 0 || f < 0 || f > l.size()){

applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java

@@ -46 +46 @@
     protected boolean active = false;
 
-    protected Collection<Command> commands = new LinkedList<Command>();
-    protected Collection<Way> ways = new ArrayList<Way>();
+    protected Collection<Command> commands = new LinkedList<>();
+    protected Collection<Way> ways = new ArrayList<>();
 
     public LakewalkerAction(String name) {
@@ -170 +170 @@
         progressMonitor.beginTask(null, 3);
         try {
-            ArrayList<double[]> nodelist = new ArrayList<double[]>();
+            ArrayList<double[]> nodelist = new ArrayList<>();
 
             Lakewalker lw = new Lakewalker(waylen,maxnode,threshold,epsilon,resolution,tilesize,startdir,wmslayer,workingdir);
@@ -291 +291 @@
             }
 
-            commands = new LinkedList<Command>();
-            ways = new ArrayList<Way>();
+            commands = new LinkedList<>();
+            ways = new ArrayList<>();
         } finally {
             progressMonitor.finishTask();

applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java

@@ -29 +29 @@
 
     // Vector to cache images in memory
-    private List<BufferedImage> images = new Vector<BufferedImage>();
+    private List<BufferedImage> images = new Vector<>();
     // Hashmap to hold the mapping of cached images
-    private Map<String,Integer> imageindex = new HashMap<String,Integer>();
+    private Map<String,Integer> imageindex = new HashMap<>();
 
     private int resolution;