Changeset 30737 in osm for applications/editors/josm/plugins/cadastre-fr/src

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/cadastre-fr/src/cadastre_fr

Files:

• Address.java (modified) (11 diffs)
• CacheControl.java (modified) (1 diff)
• CadastreInterface.java (modified) (3 diffs)
• CadastrePlugin.java (modified) (1 diff)
• CheckSourceUploadHook.java (modified) (1 diff)
• DownloadSVGBuilding.java (modified) (2 diffs)
• DownloadSVGTask.java (modified) (2 diffs)
• GrabThread.java (modified) (2 diffs)
• SVGParser.java (modified) (1 diff)
• SimplifyWay.java (modified) (1 diff)
• WMSDownloadAction.java (modified) (1 diff)
• WMSLayer.java (modified) (3 diffs)

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java

@@ -131 +131 @@
         MapView mv = Main.map.mapView;
         Point mousePos = e.getPoint();
-        List<Way> mouseOnExistingWays = new ArrayList<Way>();
-        List<Way> mouseOnExistingBuildingWays = new ArrayList<Way>();
-        mouseOnExistingWays = new ArrayList<Way>();
+        List<Way> mouseOnExistingWays = new ArrayList<>();
+        List<Way> mouseOnExistingBuildingWays = new ArrayList<>();
+        mouseOnExistingWays = new ArrayList<>();
         Node currentMouseNode = mv.getNearestNode(mousePos, OsmPrimitive.isSelectablePredicate);
         if (currentMouseNode != null) {
@@ -144 +144 @@
                     && !inputStreet.getText().equals("")) {
                 // house number already present but not linked to a street
-                Collection<Command> cmds = new LinkedList<Command>();
+                Collection<Command> cmds = new LinkedList<>();
                 addStreetNameOrRelation(currentMouseNode, cmds);
                 Command c = new SequenceCommand("Add node address", cmds);
@@ -164 +164 @@
                         inputStreet.setText(currentMouseNode.get(tagHouseStreet));
                         if (ctrl) {
-                            Collection<Command> cmds = new LinkedList<Command>();
+                            Collection<Command> cmds = new LinkedList<>();
                             addAddrToPrimitive(currentMouseNode, cmds);
                             if (num == null)
@@ -179 +179 @@
                             applyInputNumberChange();
                         }
-                        Collection<Command> cmds = new LinkedList<Command>();
+                        Collection<Command> cmds = new LinkedList<>();
                         addAddrToPrimitive(currentMouseNode, cmds);
                     } else {
@@ -206 +206 @@
                     Toolkit.getDefaultToolkit().beep();
                 } else {
-                    Collection<Command> cmds = new LinkedList<Command>();
+                    Collection<Command> cmds = new LinkedList<>();
                     if (ctrl) {
                         applyInputNumberChange();
@@ -305 +305 @@
         cmds.add(new AddCommand(n));
         List<WaySegment> wss = Main.map.mapView.getNearestWaySegments(e.getPoint(), OsmPrimitive.isSelectablePredicate);
-        Map<Way, List<Integer>> insertPoints = new HashMap<Way, List<Integer>>();
+        Map<Way, List<Integer>> insertPoints = new HashMap<>();
         for (WaySegment ws : wss) {
             List<Integer> is;
@@ -311 +311 @@
                 is = insertPoints.get(ws.way);
             } else {
-                is = new ArrayList<Integer>();
+                is = new ArrayList<>();
                 insertPoints.put(ws.way, is);
             }
@@ -317 +317 @@
             is.add(ws.lowerIndex);
         }
-        Set<Pair<Node,Node>> segSet = new HashSet<Pair<Node,Node>>();
-        ArrayList<Way> replacedWays = new ArrayList<Way>();
-        ArrayList<Way> reuseWays = new ArrayList<Way>();
+        Set<Pair<Node,Node>> segSet = new HashSet<>();
+        ArrayList<Way> replacedWays = new ArrayList<>();
+        ArrayList<Way> reuseWays = new ArrayList<>();
         for (Map.Entry<Way, List<Integer>> insertPoint : insertPoints.entrySet()) {
             Way w = insertPoint.getKey();
@@ -326 +326 @@
             pruneSuccsAndReverse(is);
             for (int i : is) {
-                segSet.add(Pair.sort(new Pair<Node,Node>(w.getNode(i), w.getNode(i+1))));
+                segSet.add(Pair.sort(new Pair<>(w.getNode(i), w.getNode(i+1))));
             }
             for (int i : is) {
@@ -403 +403 @@
         //if (is.size() < 2) return;
 
-        HashSet<Integer> is2 = new HashSet<Integer>();
+        HashSet<Integer> is2 = new HashSet<>();
         for (int i : is) {
             if (!is2.contains(i - 1) && !is2.contains(i + 1)) {
@@ -541 +541 @@
     
     private void setNewSelection(OsmPrimitive osm) {
-        Collection<OsmPrimitive> newSelection = new LinkedList<OsmPrimitive>(Main.main.getCurrentDataSet().getSelected());
+        Collection<OsmPrimitive> newSelection = new LinkedList<>(Main.main.getCurrentDataSet().getSelected());
         newSelection.clear();
         newSelection.add(osm);

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CacheControl.java

@@ -44 +44 @@
     public WMSLayer wmsLayer = null;
 
-    private ArrayList<GeorefImage> imagesToSave = new ArrayList<GeorefImage>();
+    private ArrayList<GeorefImage> imagesToSave = new ArrayList<>();
     private Lock imagesLock = new ReentrantLock();
 

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java

@@ -33 +33 @@
     private String lastWMSLayerName = null;
     private URL searchFormURL;
-    private Vector<String> listOfCommunes = new Vector<String>();
-    private Vector<String> listOfTA = new Vector<String>();
+    private Vector<String> listOfCommunes = new Vector<>();
+    private Vector<String> listOfTA = new Vector<>();
     class PlanImage {
         String name;
@@ -43 +43 @@
         }
     }
-    private Vector<PlanImage> listOfFeuilles = new Vector<PlanImage>();
+    private Vector<PlanImage> listOfFeuilles = new Vector<>();
     private long cookieTimestamp;
 
@@ -435 +435 @@
     private int selectFeuilleDialog() {
         JPanel p = new JPanel(new GridBagLayout());
-        Vector<String> imageNames = new Vector<String>();
+        Vector<String> imageNames = new Vector<>();
         for (PlanImage src : listOfFeuilles) {
             imageNames.add(src.name);

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java

@@ -422 +422 @@
                     zone = code - 27561;
                 } else {                                            // UTM_France_DOM
-                    Map<Integer, Integer> utmfr = new HashMap<Integer, Integer>();
+                    Map<Integer, Integer> utmfr = new HashMap<>();
                     utmfr.put(2969, 0);
                     utmfr.put(2970, 1);

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java

@@ -39 +39 @@
     {
         if (CadastrePlugin.autoSourcing && CadastrePlugin.pluginUsed && !apiDataSet.getPrimitivesToAdd().isEmpty()) {
-            Collection<OsmPrimitive> sel = new HashSet<OsmPrimitive>();
+            Collection<OsmPrimitive> sel = new HashSet<>();
             for (OsmPrimitive osm : apiDataSet.getPrimitivesToAdd()) {
                 if ((osm instanceof Way && (osm.getKeys().size() == 0 || !tagSourceExist(osm)))

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java

@@ -99 +99 @@
     private void createBuildings(String svg) {
         String[] SVGpaths = new SVGParser().getClosedPaths(svg);
-        ArrayList<ArrayList<EastNorth>> eastNorths = new ArrayList<ArrayList<EastNorth>>();
+        ArrayList<ArrayList<EastNorth>> eastNorths = new ArrayList<>();
 
         // convert SVG nodes to eastNorth coordinates
         for (int i=0; i< SVGpaths.length; i++) {
-            ArrayList<EastNorth> eastNorth = new ArrayList<EastNorth>();
+            ArrayList<EastNorth> eastNorth = new ArrayList<>();
             createNodes(SVGpaths[i], eastNorth);
             if (eastNorth.size() > 2)
@@ -156 +156 @@
         }
 
-        Collection<Command> cmds = new LinkedList<Command>();
+        Collection<Command> cmds = new LinkedList<>();
         for (Node node : svgDataSet.getNodes())
             if (!node.isDeleted())

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java

@@ -104 +104 @@
     private void createWay(String svg) {
         String[] SVGpaths = new SVGParser().getClosedPaths(svg);
-        ArrayList<Double> fitViewBox = new ArrayList<Double>();
-        ArrayList<ArrayList<EastNorth>> eastNorths = new ArrayList<ArrayList<EastNorth>>();
+        ArrayList<Double> fitViewBox = new ArrayList<>();
+        ArrayList<ArrayList<EastNorth>> eastNorths = new ArrayList<>();
         for (int i=0; i< SVGpaths.length; i++) {
-            ArrayList<EastNorth> eastNorth = new ArrayList<EastNorth>();
+            ArrayList<EastNorth> eastNorth = new ArrayList<>();
             fitViewBox.add( createNodes(SVGpaths[i], eastNorth) );
             eastNorths.add(eastNorth);
@@ -114 +114 @@
         Double min = Collections.min(fitViewBox);
         int bestPath = fitViewBox.indexOf(min);
-        List<Node> nodeList = new ArrayList<Node>();
+        List<Node> nodeList = new ArrayList<>();
         for (EastNorth eastNorth : eastNorths.get(bestPath)) {
             nodeList.add(new Node(Main.getProjection().eastNorth2latlon(eastNorth)));
         }
         Way wayToAdd = new Way();
-        Collection<Command> cmds = new LinkedList<Command>();
+        Collection<Command> cmds = new LinkedList<>();
         for (Node node : nodeList) {
             cmds.add(new AddCommand(node));

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/GrabThread.java

@@ -25 +25 @@
     private Lock lockImagesToGrag = new ReentrantLock();
 
-    private ArrayList<EastNorthBound> imagesToGrab = new ArrayList<EastNorthBound>();
+    private ArrayList<EastNorthBound> imagesToGrab = new ArrayList<>();
 
     private CacheControl cacheControl = null;
@@ -58 +58 @@
     
     public ArrayList<EastNorthBound> getImagesToGrabCopy() {
-        ArrayList<EastNorthBound> copyList = new ArrayList<EastNorthBound>(); 
+        ArrayList<EastNorthBound> copyList = new ArrayList<>(); 
         lockImagesToGrag.lock();
         for (EastNorthBound img : imagesToGrab) {

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/SVGParser.java

@@ -47 +47 @@
      */
     public String [] getClosedPaths(String svg) {
-        ArrayList<String> path = new ArrayList<String>();
+        ArrayList<String> path = new ArrayList<>();
         int i = 0;
         while (svg.indexOf(cPathStart, i) != -1) {

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java

@@ -23 +23 @@
     public void simplifyWayRange(Way wnew, int from, int to, double thr) {
         if (to - from >= 2) {
-            ArrayList<Node> ns = new ArrayList<Node>();
+            ArrayList<Node> ns = new ArrayList<>();
             simplifyWayRange(wnew, from, to, ns, thr);
             List<Node> nodes = wnew.getNodes();

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java

@@ -25 +25 @@
     public static WMSLayer getLayer() {
         // check if we already have a layer created. if not, create; if yes, reuse.
-        ArrayList<WMSLayer> existingWMSlayers = new ArrayList<WMSLayer>();
+        ArrayList<WMSLayer> existingWMSlayers = new ArrayList<>();
         if (Main.map != null) {
             Layer activeLayer = Main.map.mapView.getActiveLayer();

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java

@@ -54 +54 @@
             CadastrePlugin.class.getResource("/images/cadastre_small.png")));
 
-    private Vector<GeorefImage> images = new Vector<GeorefImage>();
+    private Vector<GeorefImage> images = new Vector<>();
 
     public Lock imagesLock = new ReentrantLock();
@@ -67 +67 @@
     public static int currentFormat;
 
-    private ArrayList<EastNorthBound> dividedBbox = new ArrayList<EastNorthBound>();
+    private ArrayList<EastNorthBound> dividedBbox = new ArrayList<>();
 
     private String location = "";
@@ -540 +540 @@
             int oldImgWidth = images.get(0).image.getWidth();
             int oldImgHeight = images.get(0).image.getHeight();
-            HashSet<Double> lx = new HashSet<Double>();
-            HashSet<Double> ly = new HashSet<Double>();
+            HashSet<Double> lx = new HashSet<>();
+            HashSet<Double> ly = new HashSet<>();
             for (GeorefImage img : images) {
                 lx.add(img.min.east());