Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/Main.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/Main.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -209 +209 @@
     private GettingStarted gettingStarted = new GettingStarted();
 
-    private static final Collection<MapFrameListener> mapFrameListeners = new ArrayList<MapFrameListener>();
-
-    protected static final Map<String, Throwable> NETWORK_ERRORS = new HashMap<String, Throwable>();
+    private static final Collection<MapFrameListener> mapFrameListeners = new ArrayList<>();
+
+    protected static final Map<String, Throwable> NETWORK_ERRORS = new HashMap<>();
 
     /**
@@ -519 +519 @@
 
         // contains several initialization tasks to be executed (in parallel) by a ExecutorService
-        List<Callable<Void>> tasks = new ArrayList<Callable<Void>>();
+        List<Callable<Void>> tasks = new ArrayList<>();
 
         tasks.add(new InitializationTask(tr("Initializing OSM API")) {
@@ -835 +835 @@
     protected static void postConstructorProcessCmdLine(Map<Option, Collection<String>> args) {
         if (args.containsKey(Option.DOWNLOAD)) {
-            List<File> fileList = new ArrayList<File>();
+            List<File> fileList = new ArrayList<>();
             for (String s : args.get(Option.DOWNLOAD)) {
                 File f = null;
@@ -918 +918 @@
     public static boolean saveUnsavedModifications(Iterable<? extends Layer> selectedLayers, boolean exit) {
         SaveLayersDialog dialog = new SaveLayersDialog(parent);
-        List<OsmDataLayer> layersWithUnmodifiedChanges = new ArrayList<OsmDataLayer>();
+        List<OsmDataLayer> layersWithUnmodifiedChanges = new ArrayList<>();
         for (Layer l: selectedLayers) {
             if (!(l instanceof OsmDataLayer)) {
@@ -962 +962 @@
             // Remove all layers because somebody may rely on layerRemoved events (like AutosaveTask)
             if (Main.isDisplayingMapView()) {
-                Collection<Layer> layers = new ArrayList<Layer>(Main.map.mapView.getAllLayers());
+                Collection<Layer> layers = new ArrayList<>(Main.map.mapView.getAllLayers());
                 for (Layer l: layers) {
                     Main.main.removeLayer(l);
@@ -1189 +1189 @@
      * created dataset as projection change listener.
      */
-    private static final List<WeakReference<ProjectionChangeListener>> listeners = new ArrayList<WeakReference<ProjectionChangeListener>>();
+    private static final List<WeakReference<ProjectionChangeListener>> listeners = new ArrayList<>();
 
     private static void fireProjectionChanged(Projection oldValue, Projection newValue, Bounds oldBounds) {
@@ -1226 +1226 @@
                 if (wr.get() == listener) return;
             }
-            listeners.add(new WeakReference<ProjectionChangeListener>(listener));
+            listeners.add(new WeakReference<>(listener));
         }
     }
@@ -1269 +1269 @@
     }
 
-    private static final List<WeakReference<WindowSwitchListener>> windowSwitchListeners = new ArrayList<WeakReference<WindowSwitchListener>>();
+    private static final List<WeakReference<WindowSwitchListener>> windowSwitchListeners = new ArrayList<>();
 
     /**
@@ -1284 +1284 @@
             }
             boolean wasEmpty = windowSwitchListeners.isEmpty();
-            windowSwitchListeners.add(new WeakReference<WindowSwitchListener>(listener));
+            windowSwitchListeners.add(new WeakReference<>(listener));
             if (wasEmpty) {
                 // The following call will have no effect, when there is no window
@@ -1480 +1480 @@
      */
     public static Map<String, Throwable> getNetworkErrors() {
-        return new HashMap<String, Throwable>(NETWORK_ERRORS);
+        return new HashMap<>(NETWORK_ERRORS);
     }