Changeset 30737 in osm for applications/editors/josm/plugins/alignways

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/alignways/src/com/tilusnet/josm/plugins/alignways

Files:

• AlignWaysAlgnSegment.java (modified) (3 diffs)
• AlignWaysCmdKeepAngles.java (modified) (2 diffs)
• AlignWaysCmdKeepLength.java (modified) (3 diffs)
• AlignWaysSegment.java (modified) (1 diff)
• geometry/AlignWaysGeomPoint.java (modified) (1 diff)

applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysAlgnSegment.java

@@ -41 +41 @@
 
     private PivotLocations currPivot;
-    Map<PivotLocations, EastNorth> pivotList = new EnumMap<PivotLocations, EastNorth>(
+    Map<PivotLocations, EastNorth> pivotList = new EnumMap<>(
             PivotLocations.class);
     private final Color pivotColor = Color.YELLOW;
     private final Color crossColor = pivotColor;
-    private final Map<Node,ArrayList<WaySegment>> adjWaySegs = new HashMap<Node,ArrayList<WaySegment>>();
+    private final Map<Node,ArrayList<WaySegment>> adjWaySegs = new HashMap<>();
 
     public AlignWaysAlgnSegment(MapView mapview, Point p)
@@ -70 +70 @@
         // Update the list of adjacent waysegments to the endpoints
         for (Node nA : getSegmentEndPoints()) {
-            adjWaySegs.put(nA, new ArrayList<WaySegment>(determineAdjacentWaysegments(nA)));
+            adjWaySegs.put(nA, new ArrayList<>(determineAdjacentWaysegments(nA)));
         }
     }
@@ -182 +182 @@
      */
     private Collection<WaySegment> determineAdjacentWaysegments(Node node) {
-        Collection<WaySegment> wsSet = new HashSet<WaySegment>();
+        Collection<WaySegment> wsSet = new HashSet<>();
         final double radius = 10.0;
         final int stepsOnCircle = 24;

applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysCmdKeepAngles.java

@@ -71 +71 @@
                 
                 // In order have a chance to align, (enAdjOther1, enAdjOther2 and endpoint) must be collinear
-                ArrayList<EastNorth> enAdjPts = new ArrayList<EastNorth>(3);
+                ArrayList<EastNorth> enAdjPts = new ArrayList<>(3);
                 enAdjPts.add(enAdjOther1);
                 enAdjPts.add(endpoint.getEastNorth());
@@ -154 +154 @@
 
     private boolean isEnSetCollinear(ArrayList<EastNorth> enAdjPts) {
-        ArrayList<AlignWaysGeomPoint> awAdjPts = new ArrayList<AlignWaysGeomPoint>();
+        ArrayList<AlignWaysGeomPoint> awAdjPts = new ArrayList<>();
         
         for (EastNorth en : enAdjPts) {

applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysCmdKeepLength.java

@@ -51 +51 @@
      * Useful for validation.
      */
-    final Map<Node,EastNorth> calculatedNodes = new HashMap<Node,EastNorth>();
+    final Map<Node,EastNorth> calculatedNodes = new HashMap<>();
 
 
@@ -73 +73 @@
      * List of all old states of the objects.
      */
-    final Map<Node, Node> oldNodes = new HashMap<Node, Node>();
+    final Map<Node, Node> oldNodes = new HashMap<>();
 
     /**
@@ -148 +148 @@
 
         // "Backup" state
-        lastAffectedNodes = new HashSet<Node>();
+        lastAffectedNodes = new HashSet<>();
         for (Node n : this.displaceableNodes) {
             Node nodeBackup = new Node(n);

applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysSegment.java

@@ -57 +57 @@
             Node node2 = segment.way.getNode(segment.lowerIndex + 1);
 
-            segmentEndPoints = new HashSet<Node>();
+            segmentEndPoints = new HashSet<>();
             segmentEndPoints.add(node1);
             segmentEndPoints.add(node2);

applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/geometry/AlignWaysGeomPoint.java

@@ -99 +99 @@
         
         Double[] dValues = {d1, d2, d3};
-        ArrayList<Double> alValues = new ArrayList<Double>(Arrays.asList(dValues));
+        ArrayList<Double> alValues = new ArrayList<>(Arrays.asList(dValues));
         Collections.sort(alValues);