Changeset 30231 in osm for applications/editors/josm/plugins/smed2/src/s57/S57val.java

Timestamp:

2014-01-26T19:10:42+01:00 (12 years ago)

Author:

malcolmh

Message:

save

File:

• applications/editors/josm/plugins/smed2/src/s57/S57val.java (modified) (1 diff)

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

@@ -1180 +1180 @@
         
         public static String stringValue(AttVal<?> attval) {                  // Convert OSeaM value object to OSeaM attribute value string
-                switch (attval.conv) {
-                case A:
-                case S:
-                        return (String)attval.val;
-                case E:
-                        EnumMap<?,?> map = keys.get(attval.att).map;
-                        return ((S57enum)map.get(attval.val)).val;
-                case L:
-                        String str = "";
-                        map = keys.get(attval.att).map;
-                        for (Object item : (ArrayList<?>)attval.val) {
-                                if (!str.isEmpty()) str += ";";
-                                str += ((S57enum)map.get(item)).val;
+                if (attval != null) {
+                        switch (attval.conv) {
+                        case A:
+                        case S:
+                                return (String) attval.val;
+                        case E:
+                                EnumMap<?, ?> map = keys.get(attval.att).map;
+                                return ((S57enum) map.get(attval.val)).val;
+                        case L:
+                                String str = "";
+                                map = keys.get(attval.att).map;
+                                for (Object item : (ArrayList<?>) attval.val) {
+                                        if (!str.isEmpty())
+                                                str += ";";
+                                        str += ((S57enum) map.get(item)).val;
+                                }
+                                return str;
+                        case I:
+                                return ((Long) attval.val).toString();
+                        case F:
+                                return ((Double) attval.val).toString();
                         }
-                        return str;
-                case I:
-                        return ((Long)attval.val).toString();
-                case F:
-                        return ((Double)attval.val).toString();
                 }
                 return "";