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

trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java

@@ -201 +201 @@
      */
     public static void exportPreferencesKeysToFile(String filename, boolean append, String... keys) {
-        HashSet<String> keySet = new HashSet<String>();
+        HashSet<String> keySet = new HashSet<>();
         Collections.addAll(keySet, keys);
         exportPreferencesKeysToFile(filename, append, keySet);
@@ -215 +215 @@
      */
     public static void exportPreferencesKeysByPatternToFile(String fileName, boolean append, String pattern) {
-        List<String> keySet = new ArrayList<String>();
+        List<String> keySet = new ArrayList<>();
         Map<String, Setting> allSettings = Main.pref.getAllSettings();
         for (String key: allSettings.keySet()) {
@@ -317 +317 @@
 
     public static void pluginOperation(String install, String uninstall, String delete)  {
-        final List<String> installList = new ArrayList<String>();
-        final List<String> removeList = new ArrayList<String>();
-        final List<String> deleteList = new ArrayList<String>();
+        final List<String> installList = new ArrayList<>();
+        final List<String> removeList = new ArrayList<>();
+        final List<String> deleteList = new ArrayList<>();
         Collections.addAll(installList, install.toLowerCase().split(";"));
         Collections.addAll(removeList, uninstall.toLowerCase().split(";"));
@@ -351 +351 @@
                     public void run() {
                         List<PluginInformation> availablePlugins = task.getAvailablePlugins();
-                        List<PluginInformation> toInstallPlugins = new ArrayList<PluginInformation>();
-                        List<PluginInformation> toRemovePlugins = new ArrayList<PluginInformation>();
-                        List<PluginInformation> toDeletePlugins = new ArrayList<PluginInformation>();
+                        List<PluginInformation> toInstallPlugins = new ArrayList<>();
+                        List<PluginInformation> toRemovePlugins = new ArrayList<>();
+                        List<PluginInformation> toDeletePlugins = new ArrayList<>();
                         for (PluginInformation pi: availablePlugins) {
                             String name = pi.name.toLowerCase();
@@ -364 +364 @@
                             Main.worker.submit(pluginDownloadTask);
                         }
-                        Collection<String> pls = new ArrayList<String>(Main.pref.getCollection("plugins"));
+                        Collection<String> pls = new ArrayList<>(Main.pref.getCollection("plugins"));
                         for (PluginInformation pi: toInstallPlugins) {
                             if (!pls.contains(pi.name)) {
@@ -415 +415 @@
 
         Preferences mainPrefs;
-        Map<String,Element> tasksMap = new HashMap<String,Element>();
+        Map<String,Element> tasksMap = new HashMap<>();
 
         private boolean lastV; // last If condition result
@@ -888 +888 @@
         }
         if (existing != null)
-            return new ArrayList<String>(existing.getValue());
+            return new ArrayList<>(existing.getValue());
         else
-            return defaults.getValue() == null ? null : new ArrayList<String>(defaults.getValue());
+            return defaults.getValue() == null ? null : new ArrayList<>(defaults.getValue());
     }
 
@@ -917 +917 @@
 
         if (existing != null)
-            return new ArrayList<Map<String, String>>(existing.getValue());
+            return new ArrayList<>(existing.getValue());
         else
-            return defaults.getValue() == null ? null : new ArrayList<Map<String, String>>(defaults.getValue());
+            return defaults.getValue() == null ? null : new ArrayList<>(defaults.getValue());
     }
 
@@ -1003 +1003 @@
         tmpPref.settingsMap.clear();
 
-        Map<String, Setting> tmp = new HashMap<String, Setting>();
+        Map<String, Setting> tmp = new HashMap<>();
         for (Entry<String, String> e : stringMap.entrySet()) {
             tmp.put(e.getKey(), new StringSetting(e.getValue()));
@@ -1033 +1033 @@
      */
     public static void loadPrefsToJS(ScriptEngine engine, Preferences tmpPref, String whereToPutInJS, boolean includeDefaults) throws ScriptException {
-        Map<String, String> stringMap =  new TreeMap<String, String>();
-        Map<String, List<String>> listMap = new TreeMap<String, List<String>>();
-        Map<String, List<List<String>>> listlistMap = new TreeMap<String, List<List<String>>>();
-        Map<String, List<Map<String, String>>> listmapMap = new TreeMap<String, List<Map<String, String>>>();
+        Map<String, String> stringMap =  new TreeMap<>();
+        Map<String, List<String>> listMap = new TreeMap<>();
+        Map<String, List<List<String>>> listlistMap = new TreeMap<>();
+        Map<String, List<Map<String, String>>> listmapMap = new TreeMap<>();
 
         if (includeDefaults) {