Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/gui/bbox

Timestamp:

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

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

Location:

trunk/src/org/openstreetmap/josm/gui/bbox

Files:

• SlippyMapBBoxChooser.java (modified) (5 diffs)
• TileSelectionBBoxChooser.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

@@ -49 +49 @@
      */
     public static class TMSTileSourceProvider implements TileSourceProvider {
-        static final Set<String> existingSlippyMapUrls = new HashSet<String>();
+        static final Set<String> existingSlippyMapUrls = new HashSet<>();
         static {
             // Urls that already exist in the slippymap chooser and shouldn't be copied from TMS layer list
@@ -61 +61 @@
         public List<TileSource> getTileSources() {
             if (!TMSLayer.PROP_ADD_TO_SLIPPYMAP_CHOOSER.get()) return Collections.<TileSource>emptyList();
-            List<TileSource> sources = new ArrayList<TileSource>();
+            List<TileSource> sources = new ArrayList<>();
             for (ImageryInfo info : ImageryLayerInfo.instance.getLayers()) {
                 if (existingSlippyMapUrls.contains(info.getUrl())) {
@@ -95 +95 @@
     }
 
-    private static CopyOnWriteArrayList<TileSourceProvider> providers = new CopyOnWriteArrayList<TileSourceProvider>();
+    private static CopyOnWriteArrayList<TileSourceProvider> providers = new CopyOnWriteArrayList<>();
 
     static {
@@ -179 +179 @@
 
     private List<TileSource> getAllTileSources() {
-        List<TileSource> tileSources = new ArrayList<TileSource>();
+        List<TileSource> tileSources = new ArrayList<>();
         for (TileSourceProvider provider: providers) {
             tileSources.addAll(provider.getTileSources());
@@ -338 +338 @@
         MapMarkerDot xmax_ymax = new MapMarkerDot(bbox.getMaxLat(), bbox.getMaxLon());
 
-        List<MapMarker> marker = new ArrayList<MapMarker>(2);
+        List<MapMarker> marker = new ArrayList<>(2);
         marker.add(xmin_ymin);
         marker.add(xmax_ymax);

trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java

@@ -157 +157 @@
         MapMarkerDot xmax_ymax = new MapMarkerDot(bbox.getMaxLat(), bbox.getMaxLon());
 
-        List<MapMarker> marker = new ArrayList<MapMarker>(2);
+        List<MapMarker> marker = new ArrayList<>(2);
         marker.add(xmin_ymin);
         marker.add(xmax_ymax);
@@ -328 +328 @@
             add(buildTileGridInputPanel(), BorderLayout.CENTER);
 
-            Set<AWTKeyStroke> forwardKeys = new HashSet<AWTKeyStroke>(getFocusTraversalKeys(KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS));
+            Set<AWTKeyStroke> forwardKeys = new HashSet<>(getFocusTraversalKeys(KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS));
             forwardKeys.add(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0));
             setFocusTraversalKeys(KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS,forwardKeys);