Changeset 22683 in osm for applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySpec.java

Timestamp:

2010-08-18T19:05:24+02:00 (14 years ago)

Author:

malcolmh

Message:

added special purpose float

File:

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

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

@@ -25 +25 @@
                 dlg.cbM01StyleOfMark.addItem("Sphere Buoy");
                 dlg.cbM01StyleOfMark.addItem("Barrel");
+                dlg.cbM01StyleOfMark.addItem("Float");
                 dlg.cbM01StyleOfMark.addItem("Beacon");
 
                 dlg.cbM01Kennung.removeAllItems();
                 dlg.cbM01Kennung.addItem("Not set");
+                dlg.cbM01Kennung.addItem("Fl");
+                dlg.cbM01Kennung.addItem("Fl(2)");
+                dlg.cbM01Kennung.addItem("Fl(3)");
+                dlg.cbM01Kennung.addItem("Fl(4)");
+                dlg.cbM01Kennung.addItem("Fl(5)");
+                dlg.cbM01Kennung.addItem("Oc(2)");
+                dlg.cbM01Kennung.addItem("Oc(3)");
+                dlg.cbM01Kennung.addItem("Q");
+                dlg.cbM01Kennung.addItem("IQ");
+                dlg.cbM01Kennung.setSelectedIndex(0);
 
                 dlg.cM01Fired.setSelected(false);
@@ -66 +77 @@
                         image += "_Barrel";
                         break;
+                case SPEC_FLOAT:
+                        image += "_Float";
+                        break;
                 case SPEC_BEACON:
                         image += "_Beacon";
@@ -85 +99 @@
 
                                         dlg.cbM01Kennung.setSelectedItem(c);
-                                        if (dlg.cbM01Kennung.getSelectedItem() == "Not set")
+                                        if (dlg.cbM01Kennung.getSelectedItem().equals("Not set"))
                                                 c = "";
                                 }
@@ -132 +146 @@
                                         "seamark:buoy_special_purpose:colour", "yellow"));
                         break;
+                case SPEC_FLOAT:
+                        super.saveSign("light_Float");
+                        Main.main.undoRedo.add(new ChangePropertyCommand(node,
+                                        "seamark:light_float:colour", "yellow"));
+                        break;
                 case SPEC_BEACON:
                         super.saveSign("beacon_special_purpose");
@@ -161 +180 @@
                         str = keys.get("seamark:topmark:shape");
 
-                        if (str.compareTo("x-shape") == 0) {
+                        if (str.equals("x-shape")) {
                                 setTopMark(true);
 
@@ -193 +212 @@
                         }
 
-                        if (str.compareTo("white") == 0) {
+                        if (str.equals("white")) {
                                 setFired(true);
                                 setLightColour("W");
@@ -225 +244 @@
                         str = keys.get("seamark:buoy_special_purpose:shape");
 
-                        if (str.compareTo("pillar") == 0)
+                        if (str.equals("pillar"))
                                 setStyleIndex(SPEC_PILLAR);
-                        else if (str.compareTo("spar") == 0)
+                        else if (str.equals("spar"))
                                 setStyleIndex(SPEC_SPAR);
-                        else if (str.compareTo("sphere") == 0)
+                        else if (str.equals("sphere"))
                                 setStyleIndex(SPEC_SPHERE);
-                        else if (str.compareTo("barrel") == 0)
+                        else if (str.equals("barrel"))
                                 setStyleIndex(SPEC_BARREL);
                         else
@@ -239 +258 @@
                 if (keys.containsKey("seamark:beacon_special_purpose"))
                         setStyleIndex(SPEC_BEACON);
-                        return ret;
+                else if (keys.containsKey("seamark:light_float")
+                                && keys.containsKey("seamark:light_float:colour")
+                                && keys.get("seamark:light_float:colour").equals("yellow"))
+                        setStyleIndex(SPEC_FLOAT);
+
+                return ret;
         }