Changeset 23268 in osm for applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java

Timestamp:

2010-09-19T14:59:53+02:00 (15 years ago)

Author:

malcolmh

Message:

bug fixes

File:

• applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java (modified) (7 diffs)

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

@@ -299 +299 @@
             dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.10")); //$NON-NLS-1$
             break;
-
         case STARBOARD_HAND:
             dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.03")); //$NON-NLS-1$
@@ -309 +308 @@
             dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.10")); //$NON-NLS-1$
             break;
-
         case PREF_PORT_HAND:
             dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.02")); //$NON-NLS-1$
@@ -318 +316 @@
             dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.07")); //$NON-NLS-1$
             break;
-
         case PREF_STARBOARD_HAND:
             dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.03")); //$NON-NLS-1$
@@ -327 +324 @@
             dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.07")); //$NON-NLS-1$
             break;
-
-        default:
-        }
+                }
 
         if (style >= dlg.cbM01StyleOfMark.getItemCount())
@@ -339 +334 @@
     }
 
-    public boolean isValid() {
-        return (getBuoyIndex() > 0) && (getStyleIndex() > 0);
-    }
-
-    public void paintSign() {
-        if (dlg.paintlock)
-            return;
-        super.paintSign();
+        public void refreshLights() {
+                super.refreshLights();
+        }
+
+        public boolean isValid() {
+                return (getBuoyIndex() > 0) && (getStyleIndex() > 0);
+        }
+
+        public void setLightColour() {
+                if (getRegion() == IALA_A) {
+                        if (getBuoyIndex() == PORT_HAND || getBuoyIndex() == PREF_PORT_HAND)
+                                super.setLightColour("R"); //$NON-NLS-1$
+                        else
+                                super.setLightColour("G"); //$NON-NLS-1$
+                } else {
+                        if (getBuoyIndex() == PORT_HAND || getBuoyIndex() == PREF_PORT_HAND)
+                                super.setLightColour("G"); //$NON-NLS-1$
+                        else
+                                super.setLightColour("R"); //$NON-NLS-1$
+                }
+        }
+
+        public void paintSign() {
+                if (dlg.paintlock)
+                        return;
+                super.paintSign();
 
         dlg.sM01StatusBar.setText(getErrMsg());
@@ -354 +367 @@
             dlg.tfM01Name.setText(getName());
 
-            int cat = getBuoyIndex();
-            boolean region = getRegion();
-            int style = getStyleIndex();
-
-            if (style == LAT_PERCH) {
-                dlg.cM01TopMark.setVisible(false);
-                dlg.cM01TopMark.setSelected(false);
-                dlg.cM01Radar.setVisible(false);
-                dlg.cM01Racon.setVisible(false);
-                dlg.cM01Fog.setVisible(false);
-                dlg.cM01Fired.setVisible(false);
-                dlg.cM01Fired.setSelected(false);
-            } else {
-                dlg.cM01TopMark.setEnabled(true);
-                dlg.cM01TopMark.setVisible(true);
-                dlg.cM01Radar.setVisible(true);
-                dlg.cM01Racon.setVisible(true);
-                dlg.cM01Fog.setVisible(true);
-                dlg.cM01Fired.setVisible(true);
-                dlg.cM01Fired.setEnabled(true);
-                dlg.cM01TopMark.setEnabled(true);
-            }
-            dlg.cbM01Colour.setVisible(false);
-            dlg.lM01Colour.setVisible(false);
-            dlg.rbM01Fired1.setVisible(false);
-            dlg.rbM01FiredN.setVisible(false);
-            dlg.lM01Height.setVisible(false);
-            dlg.tfM01Height.setVisible(false);
-            dlg.lM01Range.setVisible(false);
-            dlg.tfM01Range.setVisible(false);
-
-            if (isFired()) {
-                switch (style) {
-                case LAT_BEACON:
-                case LAT_TOWER:
-                    dlg.rbM01Fired1.setVisible(true);
-                    dlg.rbM01FiredN.setVisible(true);
-                    dlg.lM01Height.setVisible(true);
-                    dlg.tfM01Height.setVisible(true);
-                    dlg.lM01Range.setVisible(true);
-                    dlg.tfM01Range.setVisible(true);
-                    break;
-                case LAT_FLOAT:
-                    dlg.lM01Height.setVisible(true);
-                    dlg.tfM01Height.setVisible(true);
-                    dlg.lM01Range.setVisible(true);
-                    dlg.tfM01Range.setVisible(true);
-                    break;
-                default:
-                }
-            }
+                        boolean region = getRegion();
+                        int style = getStyleIndex();
+
+                        if (style == LAT_PERCH) {
+                                dlg.cM01TopMark.setVisible(false);
+                                dlg.cM01TopMark.setSelected(false);
+                                dlg.cM01Radar.setVisible(false);
+                                dlg.cM01Racon.setVisible(false);
+                                dlg.cM01Fog.setVisible(false);
+                                dlg.cM01Fired.setVisible(false);
+                                dlg.cM01Fired.setSelected(false);
+                        } else {
+                                dlg.cM01TopMark.setEnabled(true);
+                                dlg.cM01TopMark.setVisible(true);
+                                dlg.cM01Radar.setVisible(true);
+                                dlg.cM01Racon.setVisible(true);
+                                dlg.cM01Fog.setVisible(true);
+                                dlg.cM01Fired.setVisible(true);
+                                dlg.cM01Fired.setEnabled(true);
+                                dlg.cM01TopMark.setEnabled(true);
+                        }
+                        if (!isSectored()) {
+                                dlg.cbM01Colour.setVisible(false);
+                                dlg.lM01Colour.setVisible(false);
+                        }
+                        dlg.rbM01Fired1.setVisible(false);
+                        dlg.rbM01FiredN.setVisible(false);
+                        dlg.lM01Height.setVisible(false);
+                        dlg.tfM01Height.setVisible(false);
+                        dlg.lM01Range.setVisible(false);
+                        dlg.tfM01Range.setVisible(false);
+
+                        if (isFired()) {
+                                switch (style) {
+                                case LAT_BEACON:
+                                case LAT_TOWER:
+                                case LAT_FLOAT:
+                                        dlg.lM01Height.setVisible(true);
+                                        dlg.tfM01Height.setVisible(true);
+                                        dlg.lM01Range.setVisible(true);
+                                        dlg.tfM01Range.setVisible(true);
+                                        break;
+                                default:
+                                }
+                        }
 
             String image = "/images/Lateral"; //$NON-NLS-1$
@@ -1059 +1066 @@
         Main.pref.put("tomsplugin.IALA", getRegion() ? "B" : "A"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
-
-    public void setLightColour() {
-        if (getRegion() == IALA_A) {
-            if (getBuoyIndex() == PORT_HAND || getBuoyIndex() == PREF_PORT_HAND)
-                super.setLightColour("R"); //$NON-NLS-1$
-            else
-                super.setLightColour("G"); //$NON-NLS-1$
-        } else {
-            if (getBuoyIndex() == PORT_HAND || getBuoyIndex() == PREF_PORT_HAND)
-                super.setLightColour("G"); //$NON-NLS-1$
-            else
-                super.setLightColour("R"); //$NON-NLS-1$
-        }
-    }
-
 }