Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java

Timestamp:

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

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

File:

• trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java

@@ -68 +68 @@
     }
 
-    private final Queue<AbstractDatasetChangedEvent> eventsInEDT = new LinkedBlockingQueue<AbstractDatasetChangedEvent>();
-    private final CopyOnWriteArrayList<ListenerInfo> inEDTListeners = new CopyOnWriteArrayList<ListenerInfo>();
-    private final CopyOnWriteArrayList<ListenerInfo> normalListeners = new CopyOnWriteArrayList<ListenerInfo>();
+    private final Queue<AbstractDatasetChangedEvent> eventsInEDT = new LinkedBlockingQueue<>();
+    private final CopyOnWriteArrayList<ListenerInfo> inEDTListeners = new CopyOnWriteArrayList<>();
+    private final CopyOnWriteArrayList<ListenerInfo> normalListeners = new CopyOnWriteArrayList<>();
     private final DataSetListener myListener = new DataSetListenerAdapter(this);
 
+    /**
+     * Constructs a new {@code DatasetEventManager}.
+     */
     public DatasetEventManager() {
         MapView.addEditLayerChangeListener(this);
@@ -139 +142 @@
         public void run() {
             while (!eventsInEDT.isEmpty()) {
-                List<AbstractDatasetChangedEvent> events = new ArrayList<AbstractDatasetChangedEvent>();
+                List<AbstractDatasetChangedEvent> events = new ArrayList<>();
                 events.addAll(eventsInEDT);
 
@@ -187 +190 @@
                             }
                         } else {
-                            consolidatedEvent = new DataChangedEvent(dataSet,
-                                    new ArrayList<AbstractDatasetChangedEvent>(Arrays.asList(consolidatedEvent)));
+                            consolidatedEvent = new DataChangedEvent(dataSet, new ArrayList<>(Arrays.asList(consolidatedEvent)));
                         }