Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.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/gui/layer/geoimage/GeoImageLayer.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -102 +102 @@
         private GeoImageLayer layer;
         private Collection<File> selection;
-        private Set<String> loadedDirectories = new HashSet<String>();
+        private Set<String> loadedDirectories = new HashSet<>();
         private Set<String> errorMessages;
         private GpxLayer gpxLayer;
@@ -114 +114 @@
             this.selection = selection;
             this.gpxLayer = gpxLayer;
-            errorMessages = new LinkedHashSet<String>();
+            errorMessages = new LinkedHashSet<>();
         }
 
@@ -120 +120 @@
 
             progressMonitor.subTask(tr("Starting directory scan"));
-            Collection<File> files = new ArrayList<File>();
+            Collection<File> files = new ArrayList<>();
             try {
                 addRecursiveFiles(files, selection);
@@ -136 +136 @@
 
             // read the image files
-            List<ImageEntry> data = new ArrayList<ImageEntry>(files.size());
+            List<ImageEntry> data = new ArrayList<>(files.size());
 
             for (File f : files) {
@@ -311 +311 @@
     }
 
-    private static List<Action> menuAdditions = new LinkedList<Action>();
+    private static List<Action> menuAdditions = new LinkedList<>();
     public static void registerMenuAddition(Action addition) {
         menuAdditions.add(addition);
@@ -319 +319 @@
     public Action[] getMenuEntries() {
 
-        List<Action> entries = new ArrayList<Action>();
+        List<Action> entries = new ArrayList<>();
         entries.add(LayerListDialog.getInstance().createShowHideLayerAction());
         entries.add(LayerListDialog.getInstance().createDeleteLayerAction());
@@ -831 +831 @@
     public static void registerSupportedMapMode(MapMode mapMode) {
         if (supportedMapModes == null) {
-            supportedMapModes = new ArrayList<MapMode>();
+            supportedMapModes = new ArrayList<>();
         }
         supportedMapModes.add(mapMode);
@@ -981 +981 @@
 
     public List<ImageEntry> getImages() {
-        List<ImageEntry> copy = new ArrayList<ImageEntry>(data.size());
+        List<ImageEntry> copy = new ArrayList<>(data.size());
         for (ImageEntry ie : data) {
             copy.add(ie.clone());