Changeset 30737 in osm for applications/editors/josm/plugins/namemanager/src/org/openstreetmap

Timestamp:

2014-10-18T23:07:52+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] fix Java 7 / unused code warnings

Location:

applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager

Files:

• countryData/CountryDataMemory.java (modified) (1 diff)
• dialog/NameManagerDialog.java (modified) (1 diff)
• utils/NameManagerUtils.java (modified) (1 diff)

applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/countryData/CountryDataMemory.java

@@ -10 +10 @@
     public static void instantiateCountryCache() {
         if (countryCache == null) {
-            countryCache = new HashMap<String, Country>();
+            countryCache = new HashMap<>();
         }
     }

applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java

@@ -244 +244 @@
     public void setCountryComboBox() {
         Set<String> keySetUnsorted = CountryDataMemory.getCountryCache().keySet();
-        List<String> keySet = new ArrayList<String>(keySetUnsorted);
+        List<String> keySet = new ArrayList<>(keySetUnsorted);
         Collections.sort(keySet);
         country.removeAllItems();

applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/utils/NameManagerUtils.java

@@ -43 +43 @@
 
     public static List<Way> getWaysInsideSelectedArea(Way areaBorder) {
-        List<Way> waysInsideSelectedArea = new ArrayList<Way>();
+        List<Way> waysInsideSelectedArea = new ArrayList<>();
         if (areaBorder != null) {
             Coordinate topLeftCorner = getTopLeftCorener(areaBorder);