Changeset 32393 in osm for applications/editors/josm/plugins/seachart/src/render/Rules.java

Timestamp:

2016-06-24T02:19:11+02:00 (10 years ago)

Author:

donvip

Message:

use diamond operator

File:

• applications/editors/josm/plugins/seachart/src/render/Rules.java (modified) (6 diffs)

applications/editors/josm/plugins/seachart/src/render/Rules.java

@@ -32 +32 @@
         static final DecimalFormat df = new DecimalFormat("#.#");
 
-        static final EnumMap<ColCOL, Color> bodyColours = new EnumMap<ColCOL, Color>(ColCOL.class);
+        static final EnumMap<ColCOL, Color> bodyColours = new EnumMap<>(ColCOL.class);
         static {
                 bodyColours.put(ColCOL.COL_UNK, new Color(0, true));
@@ -50 +50 @@
         }
 
-        static final EnumMap<ColPAT, Patt> pattMap = new EnumMap<ColPAT, Patt>(ColPAT.class);
+        static final EnumMap<ColPAT, Patt> pattMap = new EnumMap<>(ColPAT.class);
         static {
                 pattMap.put(ColPAT.PAT_UNKN, Patt.Z);
@@ -144 +144 @@
         @SuppressWarnings("unchecked")
         static Scheme getScheme(Obj obj) {
-                ArrayList<Color> colours = new ArrayList<Color>();
+                ArrayList<Color> colours = new ArrayList<>();
                 for (ColCOL col : (ArrayList<ColCOL>) getAttList(obj, Att.COLOUR)) {
                         colours.add(bodyColours.get(col));
                 }
-                ArrayList<Patt> patterns = new ArrayList<Patt>();
+                ArrayList<Patt> patterns = new ArrayList<>();
                 for (ColPAT pat : (ArrayList<ColPAT>) getAttList(obj, Att.COLPAT)) {
                         patterns.add(pattMap.get(pat));
@@ -806 +806 @@
                 case BUISGL:
                         if (Renderer.zoom >= 16) {
-                                ArrayList<Symbol> symbols = new ArrayList<Symbol>();
+                                ArrayList<Symbol> symbols = new ArrayList<>();
                                 ArrayList<FncFNC> fncs = (ArrayList<FncFNC>) getAttList(Obj.BUISGL, Att.FUNCTN);
                                 for (FncFNC fnc : fncs) {
@@ -992 +992 @@
         private static void marinas() {
                 if (Renderer.zoom >= 16) {
-                        ArrayList<Symbol> symbols = new ArrayList<Symbol>();
+                        ArrayList<Symbol> symbols = new ArrayList<>();
                         ArrayList<CatSCF> scfs = (ArrayList<CatSCF>) getAttList(Obj.SMCFAC, Att.CATSCF);
                         for (CatSCF scf : scfs) {
@@ -1248 +1248 @@
                                         Renderer.lineVector(new LineStyle(Color.black, 2, null, new Color(0xffe000)));
                                         if ((Renderer.zoom >= 16) && feature.objs.containsKey(Obj.SMCFAC)) {
-                                                ArrayList<Symbol> symbols = new ArrayList<Symbol>();
+                                                ArrayList<Symbol> symbols = new ArrayList<>();
                                                 ArrayList<CatSCF> scfs = (ArrayList<CatSCF>) getAttList(Obj.SMCFAC, Att.CATSCF);
                                                 for (CatSCF scf : scfs) {