Changeset 29074 in osm for applications/editors/josm/plugins/smed2/src

Timestamp:

2012-12-14T15:35:19+01:00 (12 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed2/src

Files:

• panels/PanelMain.java (modified) (1 diff)
• s57/S57dat.java (modified) (2 diffs)
• s57/S57val.java (modified) (4 diffs)
• smed2/Smed2Action.java (modified) (2 diffs)
• symbols (added)
• symbols/Areas.java (added)
• symbols/Beacons.java (added)
• symbols/Buoys.java (added)
• symbols/Facilities.java (added)
• symbols/Harbours.java (added)
• symbols/Landmarks.java (added)
• symbols/Notices.java (added)
• symbols/Symbols.java (added)
• symbols/Topmarks.java (added)

applications/editors/josm/plugins/smed2/src/panels/PanelMain.java

@@ -13 +13 @@
 
 import smed2.Smed2Action;
-
-import S57.S57dat;
 
 public class PanelMain extends JPanel {

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

@@ -1 @@
-package S57;
+package s57;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -20 +20 @@
 import smed2.Smed2Action;
 
-import S57.S57obj;
-import S57.S57att;
-import S57.S57val;
+import s57.S57obj;
+import s57.S57att;
+import s57.S57val;
 
 public class S57dat extends JPanel {

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

@@ -20 +20 @@
         static class S57key {
                 Conv conv;
-                EnumMap map;
-                S57key(Conv c, EnumMap m) {
+                EnumMap<?, ?> map;
+                S57key(Conv c, EnumMap<?, ?> m) {
                         conv = c; map = m;
                 }
@@ -1096 +1096 @@
 
         public static Integer encodeValue(String val, Att att) {        // Convert OSeaM attribute value string to S57 attribute value
-                EnumMap map = keys.get(att).map;
+                EnumMap<?, ?> map = keys.get(att).map;
                 for (Object item : map.keySet()) {
                         if (((S57enum)map.get(item)).val.equals(val))
@@ -1111 +1111 @@
                         return (String)attval.val;
                 case E:
-                        return (String)((EnumMap)attval.val).get(attval.att);
+                        return (String)((EnumMap<?, ?>)attval.val).get(attval.att);
                 case L:
                         String str = "";
-                        for (Object item : (ArrayList)attval.val) {
+                        for (Object item : (ArrayList<?>)attval.val) {
                                 if (!str.isEmpty()) str += ";";
                                 str += keys.get(attval.att).map.get(item);
@@ -1127 +1127 @@
         }
         
-        public static Enum enumValue(String val, Att att) {           // Convert OSeaM attribute value string to OSeaM enumeration
-                EnumMap map = keys.get(att).map;
-                Enum unkn = null;
+        public static Enum<?> enumValue(String val, Att att) {           // Convert OSeaM attribute value string to OSeaM enumeration
+                EnumMap<?, ?> map = keys.get(att).map;
+                Enum<?> unkn = null;
                 for (Object item : map.keySet()) {
-                        if (unkn == null) unkn = (Enum)item;
+                        if (unkn == null) unkn = (Enum<?>)item;
                         if (((S57enum)map.get(item)).val.equals(val))
-                                return (Enum)item;
+                                return (Enum<?>)item;
                 }
                 return unkn;

applications/editors/josm/plugins/smed2/src/smed2/Smed2Action.java

@@ -1 +1 @@
 package smed2;
 
-import java.awt.Dialog;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
@@ -15 +14 @@
 import org.openstreetmap.josm.Main;
 
-import S57.S57dat;
+import s57.S57dat;
 
 import panels.PanelMain;