Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java

Timestamp:

2014-04-26T17:39:23+02:00 (12 years ago)

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java

@@ -65 +65 @@
     }
 
-    private static Collection<TaggingPreset> relationpresets = new LinkedList<TaggingPreset>();
+    private static Collection<TaggingPreset> relationpresets = new LinkedList<>();
 
     /**
@@ -87 +87 @@
     private static class RoleInfo {
         private int total = 0;
-        private Collection<Node> nodes = new LinkedList<Node>();
-        private Collection<Way> ways = new LinkedList<Way>();
-        private Collection<Way> openways = new LinkedList<Way>();
-        private Collection<Relation> relations = new LinkedList<Relation>();
+        private Collection<Node> nodes = new LinkedList<>();
+        private Collection<Way> ways = new LinkedList<>();
+        private Collection<Way> openways = new LinkedList<>();
+        private Collection<Relation> relations = new LinkedList<>();
     }
 
@@ -96 +96 @@
     @Override
     public void visit(Relation n) {
-        LinkedList<Role> allroles = new LinkedList<Role>();
+        LinkedList<Role> allroles = new LinkedList<>();
         for (TaggingPreset p : relationpresets) {
             boolean matches = true;
@@ -124 +124 @@
                     RELATION_UNKNOWN, n) );
         } else {
-            HashMap<String,RoleInfo> map = new HashMap<String, RoleInfo>();
+            HashMap<String,RoleInfo> map = new HashMap<>();
             for (RelationMember m : n.getMembers()) {
                 String s = "";
@@ -152 +152 @@
                         RELATION_EMPTY, n) );
             } else {
-                LinkedList<String> done = new LinkedList<String>();
+                LinkedList<String> done = new LinkedList<>();
                 for (Role r : allroles) {
                     done.add(r.key);
@@ -180 +180 @@
                     if (ri != null) {
                         if (r.types != null) {
-                            Set<OsmPrimitive> wrongTypes = new HashSet<OsmPrimitive>();
+                            Set<OsmPrimitive> wrongTypes = new HashSet<>();
                             if (!r.types.contains(TaggingPresetType.WAY)) {
                                 wrongTypes.addAll(r.types.contains(TaggingPresetType.CLOSEDWAY) ? ri.openways : ri.ways);
@@ -192 +192 @@
                             if (!wrongTypes.isEmpty()) {
                                 String s = marktr("Member for role {0} of wrong type");
-                                LinkedList<OsmPrimitive> highlight = new LinkedList<OsmPrimitive>(wrongTypes);
+                                LinkedList<OsmPrimitive> highlight = new LinkedList<>(wrongTypes);
                                 highlight.addFirst(n);
                                 errors.add(new TestError(this, Severity.WARNING, ROLE_VERIF_PROBLEM_MSG,
@@ -200 +200 @@
                         }
                         if (r.memberExpression != null) {
-                            Set<OsmPrimitive> notMatching = new HashSet<OsmPrimitive>();
+                            Set<OsmPrimitive> notMatching = new HashSet<>();
                             for (Collection<OsmPrimitive> c : Arrays.asList(new Collection[]{ri.nodes, ri.ways, ri.relations})) {
                                 for (OsmPrimitive p : c) {
@@ -210 +210 @@
                             if (!notMatching.isEmpty()) {
                                 String s = marktr("Member for role ''{0}'' does not match ''{1}''");
-                                LinkedList<OsmPrimitive> highlight = new LinkedList<OsmPrimitive>(notMatching);
+                                LinkedList<OsmPrimitive> highlight = new LinkedList<>(notMatching);
                                 highlight.addFirst(n);
                                 errors.add(new TestError(this, Severity.WARNING, ROLE_VERIF_PROBLEM_MSG,