Changeset 23166 in osm for applications/editors/josm

Timestamp:

2010-09-14T22:08:03+02:00 (14 years ago)

Author:

malcolmh

Message:

more lights

Location:

applications/editors/josm/plugins/toms/src/toms

Files:

• dialogs/SmpDialogAction.java (modified) (1 diff)
• seamarks/buoys/Buoy.java (modified) (2 diffs)

applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java

@@ -1141 +1141 @@
                                                 it = it.substring(0, i1) + it.substring(i2+1);
                                         }
-System.out.println(it + " " + c);
                                         if (!c.isEmpty())
                                                 buoy.setLightGroup(c);;

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

@@ -525 +525 @@
                                         tmp = c.substring(i1, c.length());
                                         c = c.substring(0, i1);
-                                }
-                                if (!getLightGroup().isEmpty())
+                                        if (!getLightGroup().isEmpty()) {
+                                                c = c + "(" + getLightGroup() + ")";
+                                        }
+                                        if (tmp != null)
+                                                c = c + tmp;
+                                }
+                                dlg.cbM01Kennung.setSelectedItem(c);
+                                if ((dlg.cbM01Kennung.getSelectedIndex() == 0) && !getLightGroup().isEmpty()) {
                                         c = c + "(" + getLightGroup() + ")";
-                                if (tmp != null)
-                                        c = c + tmp;
-                                dlg.cbM01Kennung.setSelectedItem(c);
+                                        dlg.cbM01Kennung.setSelectedItem(c);
+                                }
                                 c = c + " " + getLightColour();
                                 lp = getLightPeriod();
@@ -539 +544 @@
                                 dlg.lM01Kennung.setVisible(true);
                                 dlg.cbM01Kennung.setVisible(true);
-                                dlg.lM01Group.setVisible(true);
-                                dlg.tfM01Group.setVisible(true);
+                                if (((String)dlg.cbM01Kennung.getSelectedItem()).contains("(")) {
+                                        dlg.tfM01Group.setVisible(false);
+                                        dlg.lM01Group.setVisible(false);
+                                } else {
+                                        dlg.lM01Group.setVisible(true);
+                                        dlg.tfM01Group.setVisible(true);
+                                }
                                 dlg.tfM01Group.setText(getLightGroup());
                                 dlg.lM01RepeatTime.setVisible(true);