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

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

@@ -69 +69 @@
     }
 
-    final List<TagCheck> checks = new ArrayList<TagCheck>();
+    final List<TagCheck> checks = new ArrayList<>();
 
     static class TagCheck implements Predicate<OsmPrimitive> {
         protected final MapCSSRule rule;
-        protected final List<PrimitiveToTag> change = new ArrayList<PrimitiveToTag>();
-        protected final Map<String, String> keyChange = new LinkedHashMap<String, String>();
-        protected final List<String> alternatives = new ArrayList<String>();
-        protected final Map<Instruction.AssignmentInstruction, Severity> errors = new HashMap<Instruction.AssignmentInstruction, Severity>();
-        protected final Map<String, Boolean> assertions = new HashMap<String, Boolean>();
+        protected final List<PrimitiveToTag> change = new ArrayList<>();
+        protected final Map<String, String> keyChange = new LinkedHashMap<>();
+        protected final List<String> alternatives = new ArrayList<>();
+        protected final Map<Instruction.AssignmentInstruction, Severity> errors = new HashMap<>();
+        protected final Map<String, Boolean> assertions = new HashMap<>();
 
         TagCheck(MapCSSRule rule) {
@@ -180 +180 @@
             // Ignore "meta" rule(s) from external rules of JOSM wiki
             removeMetaRules(source);
-            return new ArrayList<TagCheck>(Utils.transform(source.rules, new Utils.Function<MapCSSRule, TagCheck>() {
+            return new ArrayList<>(Utils.transform(source.rules, new Utils.Function<MapCSSRule, TagCheck>() {
                 @Override
                 public TagCheck apply(MapCSSRule x) {
@@ -297 +297 @@
             }
             final Selector matchingSelector = whichSelectorMatchesPrimitive(p);
-            Collection<Command> cmds = new LinkedList<Command>();
+            Collection<Command> cmds = new LinkedList<>();
             for (PrimitiveToTag toTag : change) {
                 final Tag tag = toTag.apply(p);
@@ -416 +416 @@
      */
     public Collection<TestError> getErrorsForPrimitive(OsmPrimitive p, boolean includeOtherSeverity) {
-        final ArrayList<TestError> r = new ArrayList<TestError>();
+        final ArrayList<TestError> r = new ArrayList<>();
         final Environment env = new Environment(p, new MultiCascade(), Environment.DEFAULT_LAYER, null);
         for (TagCheck check : checks) {