Changeset 30157 in osm for applications/editors/josm/plugins/smed2/src/s57/S57map.java

Timestamp:

2013-12-29T12:52:10+01:00 (11 years ago)

Author:

malcolmh

Message:

save

File:

• applications/editors/josm/plugins/smed2/src/s57/S57map.java (modified) (5 diffs)

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

@@ -13 +13 @@
 
 import s57.S57att;
+import s57.S57val.AttVal;
 import s57.S57att.*;
 import s57.S57obj;
@@ -351 +352 @@
                                         items.put(idx, atts);
                                 }
-                                AttVal attval = S57val.convertValue(val, att);
+                                AttVal<?> attval = S57val.convertValue(val, att);
                                 if (attval.val != null)
                                         atts.put(att, new AttItem(attval.conv, attval.val));
@@ -363 +364 @@
                                         Att att = S57att.enumAttribute(subkeys[1], Obj.UNKOBJ);
                                         if (att != Att.UNKATT) {
-                                                AttVal attval = S57val.convertValue(val, att);
+                                                AttVal<?> attval = S57val.convertValue(val, att);
                                                 if (attval.val != null)
                                                         feature.atts.put(att, new AttItem(attval.conv, attval.val));
@@ -436 +437 @@
                         areas.put(id, area);
                         break;
+                case UNKN:
+                default:
+                        break;
                 }
                 if ((feature.type != Obj.UNKOBJ) && !((edge != null) && (edge.last == 0))) {
@@ -556 +560 @@
                         }
                         return new Snode((sarc > 0.0 ? slat / sarc : 0.0), (sarc > 0.0 ? slon / sarc : 0.0));
+                default:
                 }
                 return null;