Changeset 23140 in osm for applications/editors/josm

Timestamp:

2010-09-13T17:39:49+02:00 (14 years ago)

Author:

malcolmh

Message:

break

Location:

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

Files:

• Buoy.java (modified) (3 diffs)
• BuoyCard.java (modified) (1 diff)
• BuoyIsol.java (modified) (1 diff)
• BuoyLat.java (modified) (1 diff)
• BuoyNota.java (modified) (2 diffs)
• BuoySaw.java (modified) (1 diff)
• BuoySpec.java (modified) (1 diff)

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

@@ -406 +406 @@
 
                         dlg.tfM01Name.setText(getName());
+                        dlg.tfM01Name.setEnabled(true);
 
                         if (hasRadar()) {
@@ -569 +570 @@
                 } else {
                         dlg.bM01Save.setEnabled(false);
+                        dlg.tfM01Name.setEnabled(false);
                         dlg.cM01TopMark.setVisible(false);
                         dlg.cbM01TopMark.setVisible(false);
@@ -618 +620 @@
         }
 
-        protected void saveLightData(String colour) {
-                if (colour.isEmpty()) {
-                        return;
-                }
+        protected void saveLightData() {
 
                 if (dlg.cM01Fired.isSelected()) {
-                        if (colour.equals("red")) {
+                        setSectorIndex(0);
+                        String colour = getLightColour();
+                        if (colour.equals("R")) {
                                 Main.main.undoRedo.add(new ChangePropertyCommand(Node,
                                                 "seamark:light:colour", "red"));
-                                setLightColour("R");
-                        } else if (colour.equals("green")) {
+                        } else if (colour.equals("G")) {
                                 Main.main.undoRedo.add(new ChangePropertyCommand(Node,
                                                 "seamark:light:colour", "green"));
-                                setLightColour("G");
-                        } else if (colour.equals("white")) {
+                        } else if (colour.equals("W")) {
                                 Main.main.undoRedo.add(new ChangePropertyCommand(Node,
                                                 "seamark:light:colour", "white"));
-                                setLightColour("W");
-                        }
-                        if (getLightPeriod() != "" && getLightPeriod() != " "
-                                        && getLightChar() != "Q")
+                        }
+
+                        if (!getLightPeriod().isEmpty())
                                 Main.main.undoRedo.add(new ChangePropertyCommand(Node,
                                                 "seamark:light:period", getLightPeriod()));
 
-                        if (getLightChar() != "")
+                        if (!getLightChar().isEmpty())
                                 Main.main.undoRedo.add(new ChangePropertyCommand(Node,
                                                 "seamark:light:character", getLightChar()));
 
-                        if (getLightGroup() != "")
+                        if (!getLightGroup().isEmpty())
                                 Main.main.undoRedo.add(new ChangePropertyCommand(Node,
                                                 "seamark:light:group", getLightGroup()));
+
+                        if (!getHeight().isEmpty())
+                                Main.main.undoRedo.add(new ChangePropertyCommand(Node,
+                                                "seamark:light:height", getHeight()));
+
+                        if (!getRange().isEmpty())
+                                Main.main.undoRedo.add(new ChangePropertyCommand(Node,
+                                                "seamark:light:range", getRange()));
+
+                        for (int i = 1; i < 10; i++) {
+                                setSectorIndex(i);
+                                
+                                colour = getLightColour();
+                                if (colour.equals("R")) {
+                                        Main.main.undoRedo.add(new ChangePropertyCommand(Node,
+                                                        "seamark:light:colour:" + i, "red"));
+                                } else if (colour.equals("G")) {
+                                        Main.main.undoRedo.add(new ChangePropertyCommand(Node,
+                                                        "seamark:light:colour:" + i, "green"));
+                                } else if (colour.equals("W")) {
+                                        Main.main.undoRedo.add(new ChangePropertyCommand(Node,
+                                                        "seamark:light:colour:" + i, "white"));
+                                }
+
+                                if (!getLightPeriod().isEmpty())
+                                        Main.main.undoRedo.add(new ChangePropertyCommand(Node,
+                                                        "seamark:light:period:" + i, getLightPeriod()));
+
+                                if (!getLightChar().isEmpty())
+                                        Main.main.undoRedo.add(new ChangePropertyCommand(Node,
+                                                        "seamark:light:character:" + i, getLightChar()));
+
+                                if (!getLightGroup().isEmpty())
+                                        Main.main.undoRedo.add(new ChangePropertyCommand(Node,
+                                                        "seamark:light:group:" + i, getLightGroup()));
+
+                                if (!getHeight().isEmpty())
+                                        Main.main.undoRedo.add(new ChangePropertyCommand(Node,
+                                                        "seamark:light:height:" + i, getHeight()));
+
+                                if (!getRange().isEmpty())
+                                        Main.main.undoRedo.add(new ChangePropertyCommand(Node,
+                                                        "seamark:light:range:" + i, getRange()));
+                        }
                 }
         }

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

@@ -409 +409 @@
                 }
                 saveTopMarkData(shape, "black"); //$NON-NLS-1$
-                saveLightData("white"); //$NON-NLS-1$
+                saveLightData(); //$NON-NLS-1$
                 saveRadarFogData();
         }

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

@@ -225 +225 @@
 
                 saveTopMarkData("2 spheres", "black"); //$NON-NLS-1$ //$NON-NLS-2$
-                saveLightData("white"); //$NON-NLS-1$
+                saveLightData(); //$NON-NLS-1$
                 saveRadarFogData();
 

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

@@ -951 +951 @@
                 }
                 saveTopMarkData(shape, colour);
-                saveLightData(colour);
+                saveLightData();
                 saveRadarFogData();
 

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

@@ -96 +96 @@
                 }
 
-                switch (getStyleIndex()) {
+                switch (getBuoyIndex()) {
                 case LIGHT_HOUSE:
                         super.saveSign("lighthouse"); //$NON-NLS-1$
@@ -108 +108 @@
                 default:
                 }
-                saveLightData("white"); //$NON-NLS-1$
+                saveLightData(); //$NON-NLS-1$
                 saveRadarFogData();
         }

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

@@ -217 +217 @@
                 }
                 saveTopMarkData("spherical", "red"); //$NON-NLS-1$ //$NON-NLS-2$
-                saveLightData("white"); //$NON-NLS-1$
+                saveLightData(); //$NON-NLS-1$
                 saveRadarFogData();
         }

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

@@ -250 +250 @@
                 }
                 saveTopMarkData("x-shape", "yellow"); //$NON-NLS-1$ //$NON-NLS-2$
-                saveLightData("white"); //$NON-NLS-1$
+                saveLightData(); //$NON-NLS-1$
                 saveRadarFogData();
         }