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

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

@@ -1025 +1025 @@
  }
 
- private static final EnumMap<Att, S57key> keys = new EnumMap<Att, S57key>(Att.class);
+ private static final EnumMap<Att, S57key> 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 +1143 @@
   case A:
   case S:
-   return new AttVal<String>(conv, val);
+   return new AttVal<>(conv, val);
   case E:
-   ArrayList<Enum<?>> list = new ArrayList<Enum<?>>();
+   ArrayList<Enum<?>> list = new ArrayList<>();
    list.add(s57Enum(val, att));
    return new AttVal<ArrayList<?>>(Conv.E, list);
   case L:
-   list = new ArrayList<Enum<?>>();
+   list = new ArrayList<>();
    for (String item : val.split(",")) {
     list.add(s57Enum(item, att));
@@ -1156 +1156 @@
   case I:
    try {
-    return new AttVal<Long>(Conv.I, Long.parseLong(val));
+    return new AttVal<>(Conv.I, Long.parseLong(val));
    } catch (Exception e) {
     break;
@@ -1162 +1162 @@
   case F:
    try {
-    return new AttVal<Double>(Conv.F, Double.parseDouble(val));
+    return new AttVal<>(Conv.F, Double.parseDouble(val));
    } catch (Exception e) {
     break;
@@ -1236 +1236 @@
   case A:
   case S:
-   return new AttVal<String>(Conv.S, val);
+   return new AttVal<>(Conv.S, val);
   case E:
-   ArrayList<Enum<?>> list = new ArrayList<Enum<?>>();
+   ArrayList<Enum<?>> list = new ArrayList<>();
    list.add(osmEnum(val, att));
    return new AttVal<ArrayList<?>>(Conv.E, list);
   case L:
-   list = new ArrayList<Enum<?>>();
+   list = new ArrayList<>();
    for (String item : val.split(";")) {
     list.add(osmEnum(item, att));
@@ -1249 +1249 @@
   case I:
    try {
-    return new AttVal<Long>(Conv.I, Long.parseLong(val));
+    return new AttVal<>(Conv.I, Long.parseLong(val));
    } catch (Exception e) {
     break;
@@ -1255 +1255 @@
   case F:
    try {
-    return new AttVal<Double>(Conv.F, Double.parseDouble(val));
+    return new AttVal<>(Conv.F, Double.parseDouble(val));
    } catch (Exception e) {
     break;
    }
   }
-  return new AttVal<Object>(keys.get(att).conv, null);
+  return new AttVal<>(keys.get(att).conv, null);
  }