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

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

@@ -41 +41 @@
     public static final String XML_STYLE_MIME_TYPES = "application/xml, text/xml, text/plain; q=0.8, application/zip, application/octet-stream; q=0.5";
 
-    protected final Map<String, IconPrototype> icons = new HashMap<String, IconPrototype>();
-    protected final Map<String, LinePrototype> lines = new HashMap<String, LinePrototype>();
-    protected final Map<String, LinemodPrototype> modifiers = new HashMap<String, LinemodPrototype>();
-    protected final Map<String, AreaPrototype> areas = new HashMap<String, AreaPrototype>();
-    protected final List<IconPrototype> iconsList = new LinkedList<IconPrototype>();
-    protected final List<LinePrototype> linesList = new LinkedList<LinePrototype>();
-    protected final List<LinemodPrototype> modifiersList = new LinkedList<LinemodPrototype>();
-    protected final List<AreaPrototype> areasList = new LinkedList<AreaPrototype>();
+    protected final Map<String, IconPrototype> icons = new HashMap<>();
+    protected final Map<String, LinePrototype> lines = new HashMap<>();
+    protected final Map<String, LinemodPrototype> modifiers = new HashMap<>();
+    protected final Map<String, AreaPrototype> areas = new HashMap<>();
+    protected final List<IconPrototype> iconsList = new LinkedList<>();
+    protected final List<LinePrototype> linesList = new LinkedList<>();
+    protected final List<LinemodPrototype> modifiersList = new LinkedList<>();
+    protected final List<AreaPrototype> areasList = new LinkedList<>();
 
     public XmlStyleSource(String url, String name, String shortdescription) {
@@ -182 +182 @@
     private void get(OsmPrimitive primitive, boolean closed, WayPrototypesRecord p, Double scale, MultiCascade mc) {
         String lineIdx = null;
-        HashMap<String, LinemodPrototype> overlayMap = new HashMap<String, LinemodPrototype>();
+        HashMap<String, LinemodPrototype> overlayMap = new HashMap<>();
         boolean isNotArea = primitive.isKeyFalse("area");
         for (String key : primitive.keySet()) {
@@ -254 +254 @@
         overlayMap.remove(lineIdx); // do not use overlay if linestyle is from the same rule (example: railway=tram)
         if (!overlayMap.isEmpty()) {
-            List<LinemodPrototype> tmp = new LinkedList<LinemodPrototype>();
+            List<LinemodPrototype> tmp = new LinkedList<>();
             if (p.linemods != null) {
                 tmp.addAll(p.linemods);