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

Timestamp:

2010-09-27T11:55:45+02:00 (14 years ago)

Author:

malcolmh

Message:

bug fix

Location:

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

Files:

• Buoy.java (modified) (2 diffs)
• BuoyCard.java (modified) (1 diff)
• BuoyLat.java (modified) (1 diff)

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

@@ -634 +634 @@
 
                                 c = getLightChar();
+                                dlg.cbM01Kennung.setSelectedItem(c);
                                 if (c.contains("+")) {
                                         i1 = c.indexOf("+");
@@ -643 +644 @@
                                         if (tmp != null)
                                                 c = c + tmp;
-                                }
-                                dlg.cbM01Kennung.setSelectedItem(c);
-                                if ((dlg.cbM01Kennung.getSelectedIndex() != 0)
-                                                && (!getLightGroup().isEmpty())
-                                                || (((String) dlg.cbM01Kennung.getSelectedItem()).contains("("))
-                                                && !(((String) dlg.cbM01Kennung.getSelectedItem()).contains("+"))) {
+                                        dlg.cbM01Kennung.setSelectedItem(c);
+                                } else if (!getLightGroup().isEmpty())
                                         c = c + "(" + getLightGroup() + ")";
+                                if (dlg.cbM01Kennung.getSelectedIndex() == 0)
                                         dlg.cbM01Kennung.setSelectedItem(c);
-                                }
                                 c = c + " " + getLightColour();
                                 lp = getLightPeriod();

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

@@ -193 +193 @@
                         dlg.cM01Fired.setEnabled(true);
                         dlg.cM01Fired.setVisible(true);
+                        dlg.tfM01Group.setVisible(false);
+                        dlg.lM01Group.setVisible(false);
                         if (!isSectored()) {
                                 dlg.cbM01Colour.setVisible(false);

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

@@ -277 +277 @@
                 refreshStyles();
                 refreshLights();
-                setLightColour();
                 parseLights(keys);
                 parseFogRadar(keys);
+                setLightColour();
 
                 dlg.cbM01CatOfMark.setSelectedIndex(getBuoyIndex());