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

Timestamp:

2010-09-18T12:03:10+02:00 (14 years ago)

Author:

malcolmh

Message:

bug fixes

Location:

applications/editors/josm/plugins/toms/src/toms/seamarks/buoys

Files:

• Buoy.java (modified) (1 diff)
• BuoyLat.java (modified) (1 diff)

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

@@ -178 +178 @@
 
         public void setLightChar(String lightChar) {
-                if (SectorIndex == 0)
+                if (SectorIndex == 0) {
                         LightChar = new String[10];
-                LightChar[SectorIndex] = lightChar;
+                        LightChar[0] = lightChar;
+                } else if (LightChar[0].isEmpty())
+                        LightChar[SectorIndex] = lightChar;
         }
 

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

@@ -1074 +1074 @@
         }
 
-        public void setLightColour(String str) {
-                int cat = getBuoyIndex();
-
-                if (str == null) {
-                        return;
-                }
-
-                switch (cat) {
-                case PORT_HAND:
-                case PREF_PORT_HAND:
-                        if (getRegion() == IALA_A) {
-                                if (str.equals("red")) { //$NON-NLS-1$
-                                        setFired(true);
-                                        super.setLightColour("R"); //$NON-NLS-1$
-                                } else {
-                                        super.setLightColour(""); //$NON-NLS-1$
-                                }
-                        } else {
-                                if (str.equals("green")) { //$NON-NLS-1$
-                                        setFired(true);
-                                        super.setLightColour("G"); //$NON-NLS-1$
-                                } else {
-                                        super.setLightColour(""); //$NON-NLS-1$
-                                }
-                        }
-                        break;
-
-                case STARBOARD_HAND:
-                case PREF_STARBOARD_HAND:
-                        if (getRegion() == IALA_A) {
-                                if (str.equals("green")) { //$NON-NLS-1$
-                                        setFired(true);
-                                        super.setLightColour("G"); //$NON-NLS-1$
-                                } else {
-                                        super.setLightColour(""); //$NON-NLS-1$
-                                }
-                        } else {
-                                if (str.equals("red")) { //$NON-NLS-1$
-                                        setFired(true);
-                                        super.setLightColour("R"); //$NON-NLS-1$
-                                } else {
-                                        super.setLightColour(""); //$NON-NLS-1$
-                                }
-                        }
-                        break;
-                default:
-                }
-        }
-
 }