Changeset 30737 in osm for applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java

Timestamp:

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

Author:

donvip

Message:

[josm_plugins] fix Java 7 / unused code warnings

File:

• applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java (modified) (11 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);