Index: /applications/editors/josm/plugins/seachart/jrender/src/jrender/Jrender.java =================================================================== --- /applications/editors/josm/plugins/seachart/jrender/src/jrender/Jrender.java (revision 32392) +++ /applications/editors/josm/plugins/seachart/jrender/src/jrender/Jrender.java (revision 32393) @@ -105,5 +105,5 @@ } writer.close(); - send = new ArrayList(); + send = new ArrayList<>(); } } @@ -146,6 +146,6 @@ xtile = Integer.parseInt(args[3]); ytile = Integer.parseInt(args[4]); - send = new ArrayList(); - deletes = new HashMap(); + send = new ArrayList<>(); + deletes = new HashMap<>(); BufferedReader in = new BufferedReader(new FileReader(srcdir + xtile + "-" + ytile + "-" + zoom + ".osm")); map = new S57map(true); Index: /applications/editors/josm/plugins/seachart/js57toosm/src/js57toosm/Js57toosm.java =================================================================== --- /applications/editors/josm/plugins/seachart/js57toosm/src/js57toosm/Js57toosm.java (revision 32392) +++ /applications/editors/josm/plugins/seachart/js57toosm/src/js57toosm/Js57toosm.java (revision 32393) @@ -30,5 +30,5 @@ static PrintStream out; static S57map map; - static final ArrayList typatts = new ArrayList(); static { + static final ArrayList typatts = new ArrayList<>(); static { typatts.add(Att.OBJNAM); typatts.add(Att.NOBJNM); typatts.add(Att.STATUS); typatts.add(Att.INFORM); typatts.add(Att.NINFOM); typatts.add(Att.PEREND); typatts.add(Att.PERSTA); typatts.add(Att.CONDTN); typatts.add(Att.CONRAD); typatts.add(Att.CONVIS); @@ -37,5 +37,5 @@ public static void main(String[] args) throws IOException { - ArrayList done = new ArrayList(); + ArrayList done = new ArrayList<>(); if (args.length < 3) { @@ -56,5 +56,5 @@ System.exit(-1); } - ArrayList types = new ArrayList(); + ArrayList types = new ArrayList<>(); try { Scanner tin = new Scanner(new FileInputStream(args[1])); Index: /applications/editors/josm/plugins/seachart/src/render/Rules.java =================================================================== --- /applications/editors/josm/plugins/seachart/src/render/Rules.java (revision 32392) +++ /applications/editors/josm/plugins/seachart/src/render/Rules.java (revision 32393) @@ -32,5 +32,5 @@ static final DecimalFormat df = new DecimalFormat("#.#"); - static final EnumMap bodyColours = new EnumMap(ColCOL.class); + static final EnumMap bodyColours = new EnumMap<>(ColCOL.class); static { bodyColours.put(ColCOL.COL_UNK, new Color(0, true)); @@ -50,5 +50,5 @@ } - static final EnumMap pattMap = new EnumMap(ColPAT.class); + static final EnumMap pattMap = new EnumMap<>(ColPAT.class); static { pattMap.put(ColPAT.PAT_UNKN, Patt.Z); @@ -144,9 +144,9 @@ @SuppressWarnings("unchecked") static Scheme getScheme(Obj obj) { - ArrayList colours = new ArrayList(); + ArrayList colours = new ArrayList<>(); for (ColCOL col : (ArrayList) getAttList(obj, Att.COLOUR)) { colours.add(bodyColours.get(col)); } - ArrayList patterns = new ArrayList(); + ArrayList patterns = new ArrayList<>(); for (ColPAT pat : (ArrayList) getAttList(obj, Att.COLPAT)) { patterns.add(pattMap.get(pat)); @@ -806,5 +806,5 @@ case BUISGL: if (Renderer.zoom >= 16) { - ArrayList symbols = new ArrayList(); + ArrayList symbols = new ArrayList<>(); ArrayList fncs = (ArrayList) getAttList(Obj.BUISGL, Att.FUNCTN); for (FncFNC fnc : fncs) { @@ -992,5 +992,5 @@ private static void marinas() { if (Renderer.zoom >= 16) { - ArrayList symbols = new ArrayList(); + ArrayList symbols = new ArrayList<>(); ArrayList scfs = (ArrayList) getAttList(Obj.SMCFAC, Att.CATSCF); for (CatSCF scf : scfs) { @@ -1248,5 +1248,5 @@ Renderer.lineVector(new LineStyle(Color.black, 2, null, new Color(0xffe000))); if ((Renderer.zoom >= 16) && feature.objs.containsKey(Obj.SMCFAC)) { - ArrayList symbols = new ArrayList(); + ArrayList symbols = new ArrayList<>(); ArrayList scfs = (ArrayList) getAttList(Obj.SMCFAC, Att.CATSCF); for (CatSCF scf : scfs) { Index: /applications/editors/josm/plugins/seachart/src/render/Signals.java =================================================================== --- /applications/editors/josm/plugins/seachart/src/render/Signals.java (revision 32392) +++ /applications/editors/josm/plugins/seachart/src/render/Signals.java (revision 32393) @@ -30,5 +30,5 @@ public class Signals extends Rules{ - static final EnumMap LightColours = new EnumMap(ColCOL.class); + static final EnumMap LightColours = new EnumMap<>(ColCOL.class); static { LightColours.put(ColCOL.COL_WHT, new Color(0xffff00)); @@ -43,5 +43,5 @@ } - static final EnumMap LightLetters = new EnumMap(ColCOL.class); + static final EnumMap LightLetters = new EnumMap<>(ColCOL.class); static { LightLetters.put(ColCOL.COL_WHT, "W"); @@ -55,5 +55,5 @@ } - static final EnumMap LightCharacters = new EnumMap(LitCHR.class); + static final EnumMap LightCharacters = new EnumMap<>(LitCHR.class); static { LightCharacters.put(LitCHR.CHR_F, "F"); @@ -84,5 +84,5 @@ } - static final EnumMap fogSignals = new EnumMap(CatFOG.class); + static final EnumMap fogSignals = new EnumMap<>(CatFOG.class); static { fogSignals.put(CatFOG.FOG_EXPL, "Explos"); @@ -553,5 +553,5 @@ } if (!found) { - ArrayList tmp = new ArrayList(); + ArrayList tmp = new ArrayList<>(); tmp.add(lit); groupings.add(tmp); Index: /applications/editors/josm/plugins/seachart/src/s57/S57att.java =================================================================== --- /applications/editors/josm/plugins/seachart/src/s57/S57att.java (revision 32392) +++ /applications/editors/josm/plugins/seachart/src/s57/S57att.java (revision 32393) @@ -32,5 +32,5 @@ } - private static final EnumMap AttS57 = new EnumMap(Att.class); + private static final EnumMap AttS57 = new EnumMap<>(Att.class); static { AttS57.put(Att.UNKATT, 0); AttS57.put(Att.AGENCY, 1); AttS57.put(Att.BCNSHP, 2); AttS57.put(Att.BUISHP, 3); AttS57.put(Att.BOYSHP, 4); AttS57.put(Att.BURDEP, 5); @@ -65,5 +65,5 @@ } - private static final EnumMap AttIENC = new EnumMap(Att.class); + private static final EnumMap AttIENC = new EnumMap<>(Att.class); static { AttIENC.put(Att.CATACH, 17000); AttIENC.put(Att.CATDIS, 17001); AttIENC.put(Att.CATSIT, 17002); AttIENC.put(Att.CATSIW, 17003); AttIENC.put(Att.RESTRN, 17004); @@ -88,5 +88,5 @@ } - private static final EnumMap AttStr = new EnumMap(Att.class); + private static final EnumMap AttStr = new EnumMap<>(Att.class); static { AttStr.put(Att.UNKATT, ""); AttStr.put(Att.AGENCY, "agency"); AttStr.put(Att.BCNSHP, "shape"); AttStr.put(Att.BUISHP, "shape"); AttStr.put(Att.BOYSHP, "shape"); @@ -307,5 +307,5 @@ private static final EnumMap Year = new EnumMap<>(Obj.class); static { Year.put(Obj.UNKOBJ, Att.RYRMGV); } - private static final HashMap> StrAtt = new HashMap>(); + private static final HashMap> StrAtt = new HashMap<>(); static { StrAtt.put("accuracy", Accuracy); StrAtt.put("addition", Addition); StrAtt.put("agency", Agency); StrAtt.put("anomaly", Anomaly); StrAtt.put("authority", Authority); Index: /applications/editors/josm/plugins/seachart/src/s57/S57map.java =================================================================== --- /applications/editors/josm/plugins/seachart/src/s57/S57map.java (revision 32392) +++ /applications/editors/josm/plugins/seachart/src/s57/S57map.java (revision 32393) @@ -84,5 +84,5 @@ first = 0; last = 0; - nodes = new ArrayList(); + nodes = new ArrayList<>(); } } Index: /applications/editors/josm/plugins/seachart/src/s57/S57osm.java =================================================================== --- /applications/editors/josm/plugins/seachart/src/s57/S57osm.java (revision 32392) +++ /applications/editors/josm/plugins/seachart/src/s57/S57osm.java (revision 32393) @@ -38,5 +38,5 @@ OSMtags.put("waterway=riverbank", new KeyVal<>(Obj.RIVERS, Att.UNKATT, null, null)); OSMtags.put("waterway=dock", new KeyVal<>(Obj.HRBBSN, Att.UNKATT, null, null)); OSMtags.put("waterway=lock", new KeyVal<>(Obj.HRBBSN, Att.UNKATT, null, null)); OSMtags.put("landuse=basin", new KeyVal<>(Obj.LAKARE, Att.UNKATT, null, null)); - OSMtags.put("wetland=tidalflat", new KeyVal(Obj.DEPARE, Att.DRVAL2, Conv.F, (Double)0.0)); OSMtags.put("tidal=yes", new KeyVal(Obj.DEPARE, Att.DRVAL2, Conv.F, (Double)0.0)); + OSMtags.put("wetland=tidalflat", new KeyVal<>(Obj.DEPARE, Att.DRVAL2, Conv.F, (Double)0.0)); OSMtags.put("tidal=yes", new KeyVal<>(Obj.DEPARE, Att.DRVAL2, Conv.F, (Double)0.0)); OSMtags.put("natural=mud", new KeyVal<>(Obj.DEPARE, Att.UNKATT, null, null)); OSMtags.put("natural=sand", new KeyVal<>(Obj.DEPARE, Att.UNKATT, null, null)); OSMtags.put("highway=motorway", new KeyVal<>(Obj.ROADWY, Att.CATROD, Conv.E, CatROD.ROD_MWAY)); OSMtags.put("highway=trunk", new KeyVal<>(Obj.ROADWY, Att.CATROD, Conv.E, CatROD.ROD_MAJR)); @@ -56,5 +56,5 @@ if (kv != null) { if (kv.conv == Conv.E) { - ArrayList> list = new ArrayList>(); + ArrayList> list = new ArrayList<>(); list.add((Enum)kv.val); osm.add(new KeyVal<>(kv.obj, kv.att, kv.conv, list)); Index: /applications/editors/josm/plugins/seachart/src/s57/S57val.java =================================================================== --- /applications/editors/josm/plugins/seachart/src/s57/S57val.java (revision 32392) +++ /applications/editors/josm/plugins/seachart/src/s57/S57val.java (revision 32393) @@ -1025,5 +1025,5 @@ } - private static final EnumMap keys = new EnumMap(Att.class); + private static final EnumMap keys = new EnumMap<>(Att.class); static { keys.put(Att.UNKATT, new S57key(Conv.A, null)); keys.put(Att.AGENCY, new S57key(Conv.A, null)); keys.put(Att.BCNSHP, new S57key(Conv.E, Bcnshp)); @@ -1143,11 +1143,11 @@ case A: case S: - return new AttVal(conv, val); + return new AttVal<>(conv, val); case E: - ArrayList> list = new ArrayList>(); + ArrayList> list = new ArrayList<>(); list.add(s57Enum(val, att)); return new AttVal>(Conv.E, list); case L: - list = new ArrayList>(); + list = new ArrayList<>(); for (String item : val.split(",")) { list.add(s57Enum(item, att)); @@ -1156,5 +1156,5 @@ case I: try { - return new AttVal(Conv.I, Long.parseLong(val)); + return new AttVal<>(Conv.I, Long.parseLong(val)); } catch (Exception e) { break; @@ -1162,5 +1162,5 @@ case F: try { - return new AttVal(Conv.F, Double.parseDouble(val)); + return new AttVal<>(Conv.F, Double.parseDouble(val)); } catch (Exception e) { break; @@ -1236,11 +1236,11 @@ case A: case S: - return new AttVal(Conv.S, val); + return new AttVal<>(Conv.S, val); case E: - ArrayList> list = new ArrayList>(); + ArrayList> list = new ArrayList<>(); list.add(osmEnum(val, att)); return new AttVal>(Conv.E, list); case L: - list = new ArrayList>(); + list = new ArrayList<>(); for (String item : val.split(";")) { list.add(osmEnum(item, att)); @@ -1249,5 +1249,5 @@ case I: try { - return new AttVal(Conv.I, Long.parseLong(val)); + return new AttVal<>(Conv.I, Long.parseLong(val)); } catch (Exception e) { break; @@ -1255,10 +1255,10 @@ case F: try { - return new AttVal(Conv.F, Double.parseDouble(val)); + return new AttVal<>(Conv.F, Double.parseDouble(val)); } catch (Exception e) { break; } } - return new AttVal(keys.get(att).conv, null); + return new AttVal<>(keys.get(att).conv, null); } Index: /applications/editors/josm/plugins/seachart/src/symbols/Beacons.java =================================================================== --- /applications/editors/josm/plugins/seachart/src/symbols/Beacons.java (revision 32392) +++ /applications/editors/josm/plugins/seachart/src/symbols/Beacons.java (revision 32393) @@ -182,5 +182,5 @@ } - public static final EnumMap Shapes = new EnumMap(BcnSHP.class); + public static final EnumMap Shapes = new EnumMap<>(BcnSHP.class); static { Shapes.put(BcnSHP.BCN_UNKN, Beacons.Beacon); Shapes.put(BcnSHP.BCN_STAK, Beacons.Stake); Shapes.put(BcnSHP.BCN_TOWR, Beacons.Tower); Index: /applications/editors/josm/plugins/seachart/src/symbols/Buoys.java =================================================================== --- /applications/editors/josm/plugins/seachart/src/symbols/Buoys.java (revision 32392) +++ /applications/editors/josm/plugins/seachart/src/symbols/Buoys.java (revision 32393) @@ -249,5 +249,5 @@ } - public static final EnumMap Shapes = new EnumMap(BoySHP.class); + public static final EnumMap Shapes = new EnumMap<>(BoySHP.class); static { Shapes.put(BoySHP.BOY_UNKN, Buoys.Pillar); Shapes.put(BoySHP.BOY_CONE, Buoys.Cone); Shapes.put(BoySHP.BOY_CAN, Buoys.Can); Index: /applications/editors/josm/plugins/seachart/src/symbols/Facilities.java =================================================================== --- /applications/editors/josm/plugins/seachart/src/symbols/Facilities.java (revision 32392) +++ /applications/editors/josm/plugins/seachart/src/symbols/Facilities.java (revision 32393) @@ -191,5 +191,5 @@ } - public static final EnumMap Cats = new EnumMap(CatSCF.class); + public static final EnumMap Cats = new EnumMap<>(CatSCF.class); static { Cats.put(CatSCF.SCF_BHST, Boatlift); Cats.put(CatSCF.SCF_BTYD, Boatyard); Cats.put(CatSCF.SCF_CHDR, Chandler); Cats.put(CatSCF.SCF_FUEL, Fuel); Cats.put(CatSCF.SCF_LAUN, Laundrette); Index: /applications/editors/josm/plugins/seachart/src/symbols/Landmarks.java =================================================================== --- /applications/editors/josm/plugins/seachart/src/symbols/Landmarks.java (revision 32392) +++ /applications/editors/josm/plugins/seachart/src/symbols/Landmarks.java (revision 32393) @@ -187,5 +187,5 @@ } - public static final EnumMap Shapes = new EnumMap(CatLMK.class); + public static final EnumMap Shapes = new EnumMap<>(CatLMK.class); static { Shapes.put(CatLMK.LMK_CARN, Beacons.Cairn); Shapes.put(CatLMK.LMK_CHMY, Landmarks.Chimney); @@ -198,5 +198,5 @@ } - public static final EnumMap Funcs = new EnumMap(FncFNC.class); + public static final EnumMap Funcs = new EnumMap<>(FncFNC.class); static { Funcs.put(FncFNC.FNC_CHCH, Landmarks.Church); Funcs.put(FncFNC.FNC_CHPL, Landmarks.Church); Funcs.put(FncFNC.FNC_TMPL, Landmarks.Temple); Index: /applications/editors/josm/plugins/seachart/src/symbols/Notices.java =================================================================== --- /applications/editors/josm/plugins/seachart/src/symbols/Notices.java (revision 32392) +++ /applications/editors/josm/plugins/seachart/src/symbols/Notices.java (revision 32393) @@ -1060,5 +1060,5 @@ } - public static final EnumMap NmkCevni = new EnumMap(CatNMK.class); + public static final EnumMap NmkCevni = new EnumMap<>(CatNMK.class); static { NmkCevni.put(CatNMK.NMK_UNKN, Notice); NmkCevni.put(CatNMK.NMK_NENT, NoticeA1); NmkCevni.put(CatNMK.NMK_CLSA, NoticeA1a); NmkCevni.put(CatNMK.NMK_NOVK, NoticeA2); @@ -1310,5 +1310,5 @@ NoticeBoptl.add(new Instr(Form.PGON, p)); } - public static final EnumMap NmkBniwr = new EnumMap(CatNMK.class); + public static final EnumMap NmkBniwr = new EnumMap<>(CatNMK.class); static { NmkBniwr.put(CatNMK.NMK_NANK, NoticeBnank); NmkBniwr.put(CatNMK.NMK_LMHR, NoticeBlmhr); NmkBniwr.put(CatNMK.NMK_OPTR, NoticeBoptr); NmkBniwr.put(CatNMK.NMK_OPTL, NoticeBoptl); @@ -1502,5 +1502,5 @@ } - public static final EnumMap NmkPpwbcl = new EnumMap(CatNMK.class); + public static final EnumMap NmkPpwbcl = new EnumMap<>(CatNMK.class); static { NmkPpwbcl.put(CatNMK.NMK_WRAL, NoticePwralL); NmkPpwbcl.put(CatNMK.NMK_WLAR, NoticePwlarL); NmkPpwbcl.put(CatNMK.NMK_KTPM, NoticePktmL); NmkPpwbcl.put(CatNMK.NMK_KTSM, NoticePktmL); @@ -1508,5 +1508,5 @@ } - public static final EnumMap NmkPpwbcr = new EnumMap(CatNMK.class); + public static final EnumMap NmkPpwbcr = new EnumMap<>(CatNMK.class); static { NmkPpwbcr.put(CatNMK.NMK_WRAL, NoticePwralR); NmkPpwbcr.put(CatNMK.NMK_WLAR, NoticePwlarR); NmkPpwbcr.put(CatNMK.NMK_KTPM, NoticePktmR); NmkPpwbcr.put(CatNMK.NMK_KTSM, NoticePktmR); @@ -1514,5 +1514,5 @@ } - public static final EnumMap NmkRiwr = new EnumMap(CatNMK.class); + public static final EnumMap NmkRiwr = new EnumMap<>(CatNMK.class); static { NmkRiwr.put(CatNMK.NMK_NPAS, NoticeRnpas); NmkRiwr.put(CatNMK.NMK_NANK, NoticeRnank); NmkRiwr.put(CatNMK.NMK_NWSH, NoticeRnwsh); NmkRiwr.put(CatNMK.NMK_LMHR, NoticeRlmhr); NmkRiwr.put(CatNMK.NMK_TRNA, NoticeRtrna); @@ -1521,5 +1521,5 @@ public static Scheme getScheme(MarSYS sys, BnkWTW bank) { - ArrayList colours = new ArrayList(); + ArrayList colours = new ArrayList<>(); Scheme scheme = new Scheme(colours); switch (sys) { Index: /applications/editors/josm/plugins/seachart/src/symbols/Symbols.java =================================================================== --- /applications/editors/josm/plugins/seachart/src/symbols/Symbols.java (revision 32392) +++ /applications/editors/josm/plugins/seachart/src/symbols/Symbols.java (revision 32393) @@ -69,5 +69,5 @@ public Scheme(ArrayList icol) { - pat = new ArrayList(); + pat = new ArrayList<>(); col = icol; } @@ -77,11 +77,11 @@ } public Scheme(Color icol) { - pat = new ArrayList(); - col = new ArrayList(); + pat = new ArrayList<>(); + col = new ArrayList<>(); col.add(icol); } public Scheme() { - pat = new ArrayList(); - col = new ArrayList(); + pat = new ArrayList<>(); + col = new ArrayList<>(); } } Index: /applications/editors/josm/plugins/seachart/src/symbols/Topmarks.java =================================================================== --- /applications/editors/josm/plugins/seachart/src/symbols/Topmarks.java (revision 32392) +++ /applications/editors/josm/plugins/seachart/src/symbols/Topmarks.java (revision 32393) @@ -475,5 +475,5 @@ } - public static final EnumMap Shapes = new EnumMap(TopSHP.class); + public static final EnumMap Shapes = new EnumMap<>(TopSHP.class); static { Shapes.put(TopSHP.TOP_BESM, TopBesom); Shapes.put(TopSHP.TOP_IBESM, TopIBesom); Shapes.put(TopSHP.TOP_BORD, TopBoard); Shapes.put(TopSHP.TOP_CAN, TopCan); @@ -489,5 +489,5 @@ } - public static final EnumMap BuoyDeltas = new EnumMap(BoySHP.class); + public static final EnumMap BuoyDeltas = new EnumMap<>(BoySHP.class); static { BuoyDeltas.put(BoySHP.BOY_PILR, new Delta(Handle.BC, new AffineTransform(0.948324, 0.317305, -0.3173047, 0.948324, 31.5, -95.0)));