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

trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java

@@ -141 +141 @@
     }
 
-    private final Set<Tag> tags = new HashSet<Tag>();
+    private final Set<Tag> tags = new HashSet<>();
 
     /**
@@ -469 +469 @@
      */
     public Set<Tag> asSet() {
-        return new HashSet<Tag>(tags);
+        return new HashSet<>(tags);
     }
 
@@ -479 +479 @@
      */
     public List<Tag> asList() {
-        return new ArrayList<Tag>(tags);
+        return new ArrayList<>(tags);
     }
 
@@ -498 +498 @@
      */
     public Set<String> getKeys() {
-        HashSet<String> ret = new HashSet<String>();
+        HashSet<String> ret = new HashSet<>();
         for (Tag tag: tags) {
             ret.add(tag.getKey());
@@ -511 +511 @@
      */
     public Set<String> getKeysWithMultipleValues() {
-        HashMap<String, Integer> counters = new HashMap<String, Integer>();
+        HashMap<String, Integer> counters = new HashMap<>();
         for (Tag tag: tags) {
             Integer v = counters.get(tag.getKey());
             counters.put(tag.getKey(),(v==null) ? 1 : v+1);
         }
-        Set<String> ret = new HashSet<String>();
+        Set<String> ret = new HashSet<>();
         for (Entry<String, Integer> e : counters.entrySet()) {
             if (e.getValue() > 1) {
@@ -556 +556 @@
      */
     public Set<String> getValues() {
-        HashSet<String> ret = new HashSet<String>();
+        HashSet<String> ret = new HashSet<>();
         for (Tag tag: tags) {
             ret.add(tag.getValue());
@@ -572 +572 @@
      */
     public Set<String> getValues(String key) {
-        HashSet<String> ret = new HashSet<String>();
+        HashSet<String> ret = new HashSet<>();
         if (key == null) return ret;
         for (Tag tag: tags) {
@@ -733 +733 @@
         }
 
-        Set<String> values = new LinkedHashSet<String>();
-        Map<String, Collection<String>> originalSplitValues = new LinkedHashMap<String, Collection<String>>();
+        Set<String> values = new LinkedHashSet<>();
+        Map<String, Collection<String>> originalSplitValues = new LinkedHashMap<>();
         for (String v : originalValues) {
             List<String> vs = Arrays.asList(SPLIT_VALUES_PATTERN.split(v));