Changeset 23155 in osm for applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java

Timestamp:

2010-09-14T14:50:20+02:00 (14 years ago)

Author:

malcolmh

Message:

break

File:

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

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

@@ -26 +26 @@
 
                 resetMask();
+
+                dlg.cbM01TypeOfMark.setSelectedIndex(SAFE_WATER);
 
                 dlg.cbM01StyleOfMark.removeAllItems();
@@ -37 +39 @@
                 dlg.lM01StyleOfMark.setVisible(true);
 
-                refreshLights();
-                
                 setBuoyIndex(SAFE_WATER);
                 setColour(SeaMark.RED_WHITE);
@@ -74 +74 @@
                 }
 
-                if (keys.containsKey("seamark:light:colour")) { //$NON-NLS-1$
-                        str = keys.get("seamark:light:colour"); //$NON-NLS-1$
-
-                        if (keys.containsKey("seamark:light:character")) { //$NON-NLS-1$
-                                setLightGroup(keys);
-                                String c = keys.get("seamark:light:character"); //$NON-NLS-1$
-                                if (getLightGroup() != "") //$NON-NLS-1$
-                                        c = c + "(" + getLightGroup() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-                                setLightChar(c);
-                                setLightPeriod(keys);
-                        }
-
-                        if (str.equals("white")) { //$NON-NLS-1$
-                                setFired(true);
-                                setLightColour("W"); //$NON-NLS-1$
-                        }
-                }
-
+                if (getStyleIndex() >= dlg.cbM01StyleOfMark.getItemCount())
+                        setStyleIndex(0);
+                dlg.cbM01StyleOfMark.setSelectedIndex(getStyleIndex());
+                
                 if (keys.containsKey("seamark:topmark:shape") //$NON-NLS-1$
                                 || keys.containsKey("seamark:topmark:colour")) { //$NON-NLS-1$
                         setTopMark(true);
                 }
+
+                parseLights(keys);
+                refreshLights();
         }
 
@@ -104 +93 @@
                 dlg.cbM01Kennung.addItem("Oc"); //$NON-NLS-1$
                 dlg.cbM01Kennung.addItem("LFl"); //$NON-NLS-1$
-                dlg.cbM01Kennung.addItem("Mo()"); //$NON-NLS-1$
+                dlg.cbM01Kennung.addItem("Mo"); //$NON-NLS-1$
                 dlg.cbM01Kennung.setSelectedIndex(0);
         }