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

trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java

@@ -49 +49 @@
     private static DefaultNameFormatter instance;
 
-    private static final List<NameFormatterHook> formatHooks = new LinkedList<NameFormatterHook>();
+    private static final List<NameFormatterHook> formatHooks = new LinkedList<>();
 
     /**
@@ -108 +108 @@
     public static List<String> getNamingtagsForRelations() {
         if (namingTagsForRelations == null) {
-            namingTagsForRelations = new ArrayList<String>(
+            namingTagsForRelations = new ArrayList<>(
                     Main.pref.getCollection("relation.nameOrder", Arrays.asList(DEFAULT_NAMING_TAGS_FOR_RELATIONS))
                     );
@@ -498 +498 @@
         .append(primitive.getId())
         .append("<br>");
-        List<String> keyList = new ArrayList<String>(primitive.keySet());
+        List<String> keyList = new ArrayList<>(primitive.keySet());
         Collections.sort(keyList);
         for (int i = 0; i < keyList.size(); i++) {
@@ -629 +629 @@
         sb.append(" (");
         String nameTag = null;
-        Set<String> namingTags = new HashSet<String>(getNamingtagsForRelations());
+        Set<String> namingTags = new HashSet<>(getNamingtagsForRelations());
         for (String n : relation.getTags().keySet()) {
             // #3328: "note " and " note" are name tags too
@@ -671 +671 @@
         .append(primitive.getId())
         .append("<br>");
-        List<String> keyList = new ArrayList<String>(primitive.getTags().keySet());
+        List<String> keyList = new ArrayList<>(primitive.getTags().keySet());
         Collections.sort(keyList);
         for (int i = 0; i < keyList.size(); i++) {