Changeset 23050 in osm for applications/editors/josm/plugins/toms

Timestamp:

2010-09-07T15:04:45+02:00 (14 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/toms/src/toms

Files:

• dialogs/SmpDialogAction.java (modified) (1 diff)
• msg/messages.properties (modified) (2 diffs)
• seamarks/SeaMark.java (modified) (1 diff)
• seamarks/buoys/Buoy.java (modified) (1 diff)
• seamarks/buoys/BuoySaw.java (modified) (1 diff)

applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java

@@ -814 +814 @@
                                                         buoy = new BuoySpec(dia, n);
                                                         cbM01TopMark.removeAllItems();
-                                                        cbM01TopMark.addItem("");
+                                                        cbM01TopMark.addItem(Messages.getString("SmpDialogAction.212"));
                                                         cbM01TopMark.addItem(Messages.getString("SmpDialogAction.210")); //$NON-NLS-1$
                                                         cbM01TopMark.addItem(Messages.getString("SmpDialogAction.211")); //$NON-NLS-1$

applications/editors/josm/plugins/toms/src/toms/msg/messages.properties

@@ -63 +63 @@
 SmpDialogAction.28=Please select only one node
 SmpDialogAction.4=Edit OpenSeaMap
-SmpDialogAction.82=Parse-Error: Invalid colour
 SmpDialogAction.9=Seamap Editor
 SmpDialogAction.91=Seamark not set
@@ -74 +73 @@
 SmpDialogAction.210=Yellow X
 SmpDialogAction.211=Red X
+SmpDialogAction.212=Not set
 

applications/editors/josm/plugins/toms/src/toms/seamarks/SeaMark.java

@@ -112 +112 @@
         
         public final static int UNKNOWN_RATYP = 0;
-        public final static int RATYP_RACON = 0;
-        public final static int RATYP_RAMARK = 0;
-        public final static int RATYP_LEADING = 0;
+        public final static int RATYP_RACON = 1;
+        public final static int RATYP_RAMARK = 2;
+        public final static int RATYP_LEADING = 3;
 
         /**

applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java

@@ -277 +277 @@
                         dlg.lM04Icon.setIcon(new ImageIcon(getClass().getResource("/images/Radar_Station.png")));
                         dlg.cbM01Racon.setVisible(true);
-                } else 
+                        if (getRatyp() == RATYP_RACON) {
+                                dlg.lM01Racon.setVisible(true);
+                                dlg.tfM01Racon.setVisible(true);
+                                dlg.tfM01Racon.setEnabled(true);
+                        } else {
+                                dlg.lM01Racon.setVisible(false);
+                                dlg.tfM01Racon.setVisible(false);
+                        }
+                } else {
                         dlg.cbM01Racon.setVisible(false);
+                        dlg.lM01Racon.setVisible(false);
+                        dlg.tfM01Racon.setVisible(false);
+                }
                 
                 if (isFired()) {

applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java

@@ -140 +140 @@
 
                 if (!image.equals("/images/Safe_Water")) {
+                        if (hasTopMark())
+                                image += "_Sphere";
                         image += ".png";
                         dlg.lM01Icon.setIcon(new ImageIcon(getClass().getResource(image)));
-
-                        if (hasTopMark())
-                                image += "_Sphere";
 
                         if (isFired()) {