Changeset 32393 in osm for applications/editors/josm/plugins/seachart/src/s57/S57osm.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/s57/S57osm.java (modified) (2 diffs)

applications/editors/josm/plugins/seachart/src/s57/S57osm.java

@@ -38 +38 @@
                 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<Double>(Obj.DEPARE, Att.DRVAL2, Conv.F, (Double)0.0)); OSMtags.put("tidal=yes", new KeyVal<Double>(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 +56 @@
                 if (kv != null) {
                         if (kv.conv == Conv.E) {
-                                ArrayList<Enum<?>> list = new ArrayList<Enum<?>>();
+                                ArrayList<Enum<?>> list = new ArrayList<>();
                                 list.add((Enum<?>)kv.val);
                                 osm.add(new KeyVal<>(kv.obj, kv.att, kv.conv, list));