Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/ac

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/tagging/ac

Files:

• AutoCompletionList.java (modified) (1 diff)
• AutoCompletionManager.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java

@@ -43 +43 @@
      */
     public AutoCompletionList() {
-        list = new ArrayList<AutoCompletionListItem>();
-        filtered = new ArrayList<AutoCompletionListItem>();
-        valutToItemMap = new HashMap<String, AutoCompletionListItem>();
+        list = new ArrayList<>();
+        filtered = new ArrayList<>();
+        valutToItemMap = new HashMap<>();
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java

@@ -66 +66 @@
      * can be accessed directly
      */
-    protected static final MultiMap<String, String> presetTagCache = new MultiMap<String, String>();
+    protected static final MultiMap<String, String> presetTagCache = new MultiMap<>();
     /**
      * the cached list of member roles
@@ -77 +77 @@
      * can be accessed directly
      */
-    protected static final Set<String> presetRoleCache = new HashSet<String>();
+    protected static final Set<String> presetRoleCache = new HashSet<>();
 
     public AutoCompletionManager(DataSet ds) {
@@ -105 +105 @@
      */
     protected void rebuild() {
-        tagCache = new MultiMap<String, String>();
-        roleCache = new HashSet<String>();
+        tagCache = new MultiMap<>();
+        roleCache = new HashSet<>();
         cachePrimitives(ds.allNonDeletedCompletePrimitives());
     }
@@ -178 +178 @@
      */
     protected List<String> getDataKeys() {
-        return new ArrayList<String>(getTagCache().keySet());
+        return new ArrayList<>(getTagCache().keySet());
     }
 
     protected List<String> getPresetKeys() {
-        return new ArrayList<String>(presetTagCache.keySet());
+        return new ArrayList<>(presetTagCache.keySet());
     }
 
@@ -193 +193 @@
      */
     protected List<String> getDataValues(String key) {
-        return new ArrayList<String>(getTagCache().getValues(key));
+        return new ArrayList<>(getTagCache().getValues(key));
     }
 
     protected static List<String> getPresetValues(String key) {
-        return new ArrayList<String>(presetTagCache.getValues(key));
+        return new ArrayList<>(presetTagCache.getValues(key));
     }
 
@@ -206 +206 @@
      */
     public List<String> getMemberRoles() {
-        return new ArrayList<String>(getRoleCache());
+        return new ArrayList<>(getRoleCache());
     }