Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

Timestamp:

2014-04-26T17:39:23+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

File:

• trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) (14 diffs)

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -90 +90 @@
      * the zoom listeners
      */
-    private static final CopyOnWriteArrayList<ZoomChangeListener> zoomChangeListeners = new CopyOnWriteArrayList<ZoomChangeListener>();
+    private static final CopyOnWriteArrayList<ZoomChangeListener> zoomChangeListeners = new CopyOnWriteArrayList<>();
 
     /**
@@ -118 +118 @@
     }
 
-    private static final CopyOnWriteArrayList<SoMChangeListener> somChangeListeners = new CopyOnWriteArrayList<SoMChangeListener>();
+    private static final CopyOnWriteArrayList<SoMChangeListener> somChangeListeners = new CopyOnWriteArrayList<>();
 
     /**
@@ -533 +533 @@
     }
 
-    private Stack<ZoomData> zoomUndoBuffer = new Stack<ZoomData>();
-    private Stack<ZoomData> zoomRedoBuffer = new Stack<ZoomData>();
+    private Stack<ZoomData> zoomUndoBuffer = new Stack<>();
+    private Stack<ZoomData> zoomRedoBuffer = new Stack<>();
     private Date zoomTimestamp = new Date();
 
@@ -588 +588 @@
     private Map<Double, List<Node>> getNearestNodesImpl(Point p,
             Predicate<OsmPrimitive> predicate) {
-        TreeMap<Double, List<Node>> nearestMap = new TreeMap<Double, List<Node>>();
+        TreeMap<Double, List<Node>> nearestMap = new TreeMap<>();
         DataSet ds = getCurrentDataSet();
 
@@ -603 +603 @@
                         nlist = nearestMap.get(dist);
                     } else {
-                        nlist = new LinkedList<Node>();
+                        nlist = new LinkedList<>();
                         nearestMap.put(dist, nlist);
                     }
@@ -647 +647 @@
                     if (!nlist.isEmpty()) {
                         minDistSq = distSq;
-                        nearestList = new ArrayList<Node>();
+                        nearestList = new ArrayList<>();
                         nearestList.addAll(nlist);
                     }
@@ -798 +798 @@
     private Map<Double, List<WaySegment>> getNearestWaySegmentsImpl(Point p,
             Predicate<OsmPrimitive> predicate) {
-        Map<Double, List<WaySegment>> nearestMap = new TreeMap<Double, List<WaySegment>>();
+        Map<Double, List<WaySegment>> nearestMap = new TreeMap<>();
         DataSet ds = getCurrentDataSet();
 
@@ -841 +841 @@
                             wslist = nearestMap.get(perDistSq);
                         } else {
-                            wslist = new LinkedList<WaySegment>();
+                            wslist = new LinkedList<>();
                             nearestMap.put(perDistSq, wslist);
                         }
@@ -869 +869 @@
     public final List<WaySegment> getNearestWaySegments(Point p,
             Collection<WaySegment> ignore, Predicate<OsmPrimitive> predicate) {
-        List<WaySegment> nearestList = new ArrayList<WaySegment>();
-        List<WaySegment> unselected = new LinkedList<WaySegment>();
+        List<WaySegment> nearestList = new ArrayList<>();
+        List<WaySegment> unselected = new LinkedList<>();
 
         for (List<WaySegment> wss : getNearestWaySegmentsImpl(p, predicate).values()) {
@@ -1010 +1010 @@
     public final List<Way> getNearestWays(Point p,
             Collection<Way> ignore, Predicate<OsmPrimitive> predicate) {
-        List<Way> nearestList = new ArrayList<Way>();
-        Set<Way> wset = new HashSet<Way>();
+        List<Way> nearestList = new ArrayList<>();
+        Set<Way> wset = new HashSet<>();
 
         for (List<WaySegment> wss : getNearestWaySegmentsImpl(p, predicate).values()) {
@@ -1256 +1256 @@
     public final List<OsmPrimitive> getAllNearest(Point p,
             Collection<OsmPrimitive> ignore, Predicate<OsmPrimitive> predicate) {
-        List<OsmPrimitive> nearestList = new ArrayList<OsmPrimitive>();
-        Set<Way> wset = new HashSet<Way>();
+        List<OsmPrimitive> nearestList = new ArrayList<>();
+        Set<Way> wset = new HashSet<>();
 
         // add nearby ways
@@ -1274 +1274 @@
 
         // add parent relations of nearby nodes and ways
-        Set<OsmPrimitive> parentRelations = new HashSet<OsmPrimitive>();
+        Set<OsmPrimitive> parentRelations = new HashSet<>();
         for (OsmPrimitive o : nearestList) {
             for (OsmPrimitive r : o.getReferrers()) {
@@ -1369 +1369 @@
     }
 
-    private LinkedList<CursorInfo> cursors = new LinkedList<CursorInfo>();
+    private LinkedList<CursorInfo> cursors = new LinkedList<>();
     
     /**
@@ -1409 +1409 @@
 
     private void stripCursors(Object reference) {
-        LinkedList<CursorInfo> c = new LinkedList<CursorInfo>();
+        LinkedList<CursorInfo> c = new LinkedList<>();
         for(CursorInfo i : cursors) {
             if(i.object != reference) {