Changeset 9070 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2015-11-30T08:36:35+01:00 (8 years ago)

Author:

Don-vip

Message:

Sonar - squid:S2293 - The diamond operator ("<>") should be used

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Preferences.java (modified) (1 diff)
• cache/CacheEntryAttributes.java (modified) (1 diff)
• cache/JCSCacheManager.java (modified) (1 diff)
• notes/Note.java (modified) (1 diff)
• validation/tests/DuplicateNode.java (modified) (1 diff)
• validation/tests/MapCSSTagChecker.java (modified) (2 diffs)
• validation/tests/MultipolygonTest.java (modified) (1 diff)
• validation/tests/SimilarNamedWays.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -1824 +1824 @@
                 Collection<Map<String, String>> data = getListOfStructs(key, (Collection<Map<String, String>>) null);
                 if (data != null) {
-                    List<Map<String, String>> newlist = new ArrayList<Map<String, String>>();
+                    List<Map<String, String>> newlist = new ArrayList<>();
                     boolean modified = false;
                     for (Map<String, String> map : data) {
-                         Map<String, String> newmap = new LinkedHashMap<String, String>();
+                         Map<String, String> newmap = new LinkedHashMap<>();
                          for (Entry<String, String> entry : map.entrySet()) {
                              String val = entry.getValue();

trunk/src/org/openstreetmap/josm/data/cache/CacheEntryAttributes.java

@@ -22 +22 @@
 public class CacheEntryAttributes extends ElementAttributes {
     private static final long serialVersionUID = 1L; //version
-    private final Map<String, String> attrs = new ConcurrentHashMap<String, String>(RESERVED_KEYS.size());
+    private final Map<String, String> attrs = new ConcurrentHashMap<>(RESERVED_KEYS.size());
     private static final String NO_TILE_AT_ZOOM = "noTileAtZoom";
     private static final String ETAG = "Etag";

trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java

@@ -169 +169 @@
             }
         }
-        return new CacheAccess<K, V>(cc);
+        return new CacheAccess<>(cc);
     }
 

trunk/src/org/openstreetmap/josm/data/notes/Note.java

@@ -21 +21 @@
     private Date closedAt;
     private State state;
-    private List<NoteComment> comments = new ArrayList<NoteComment>();
+    private List<NoteComment> comments = new ArrayList<>();
 
     /**

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

@@ -382 +382 @@
     public Command fixError(TestError testError) {
         if (!isFixable(testError)) return null;
-        Collection<OsmPrimitive> sel = new LinkedList<OsmPrimitive>(testError.getPrimitives());
+        Collection<OsmPrimitive> sel = new LinkedList<>(testError.getPrimitives());
         Set<Node> nodes = new LinkedHashSet<>(OsmPrimitive.getFilteredList(sel, Node.class));
 

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

@@ -583 +583 @@
          */
         public Set<TagCheck> getTagCheckDependencies(Collection<TagCheck> schecks) {
-            Set<TagCheck> result = new HashSet<MapCSSTagChecker.TagCheck>();
+            Set<TagCheck> result = new HashSet<>();
             Set<String> classes = getClassesIds();
             if (schecks != null && !classes.isEmpty()) {
@@ -770 +770 @@
                 final OsmPrimitive p = OsmUtils.createPrimitive(i.getKey());
                 // Build minimal ordered list of checks to run to test the assertion
-                List<Set<TagCheck>> checksToRun = new ArrayList<Set<TagCheck>>();
+                List<Set<TagCheck>> checksToRun = new ArrayList<>();
                 Set<TagCheck> checkDependencies = check.getTagCheckDependencies(schecks);
                 if (!checkDependencies.isEmpty()) {

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

@@ -302 +302 @@
                 }
             }
-            List<OsmPrimitive> newPrimitives = new ArrayList<OsmPrimitive>(primitives);
+            List<OsmPrimitive> newPrimitives = new ArrayList<>(primitives);
             newPrimitives.add(0, r);
             error.setPrimitives(newPrimitives);

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

@@ -41 +41 @@
     private MultiMap<Way, Way> errorWays;
 
-    private final List<NormalizeRule> rules = new ArrayList<NormalizeRule>();
+    private final List<NormalizeRule> rules = new ArrayList<>();
 
     /**