Index: applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/countryData/CountryDataMemory.java
===================================================================
--- applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/countryData/CountryDataMemory.java	(revision 30532)
+++ applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/countryData/CountryDataMemory.java	(revision 30737)
@@ -10,5 +10,5 @@
     public static void instantiateCountryCache() {
         if (countryCache == null) {
-            countryCache = new HashMap<String, Country>();
+            countryCache = new HashMap<>();
         }
     }
Index: applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java
===================================================================
--- applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java	(revision 30532)
+++ applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java	(revision 30737)
@@ -244,5 +244,5 @@
     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();
Index: applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/utils/NameManagerUtils.java
===================================================================
--- applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/utils/NameManagerUtils.java	(revision 30532)
+++ applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/utils/NameManagerUtils.java	(revision 30737)
@@ -43,5 +43,5 @@
 
     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);