Changeset 27118 in osm for applications/editors/josm/plugins/smed

Timestamp:

2011-11-22T09:17:55+01:00 (13 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam

Files:

• panels/PanelLit.java (modified) (3 diffs)
• panels/PanelMore.java (modified) (4 diffs)
• panels/PanelSpec.java (modified) (1 diff)
• seamarks/SeaMark.java (modified) (2 diffs)

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java

@@ -298 +298 @@
                 rangeBox.setText((String)dlg.mark.getLightAtt(Att.RNG, 0));
                 orientationBox.setText((String)dlg.mark.getLightAtt(Att.ORT, 0));
+                orientationBox.setVisible(dlg.mark.getLightAtt(Att.LIT, 0) == Lit.DIR);
                 multipleBox.setText((String)dlg.mark.getLightAtt(Att.MLT, 0));
-                visibilityBox.setSelectedIndex(0);
+                multipleBox.setVisible((dlg.mark.getLightAtt(Att.LIT, 0) == Lit.VERT) || (dlg.mark.getLightAtt(Att.LIT, 0) == Lit.HORIZ));
                 for (Vis vis : visibilities.keySet()) {
                         int item = visibilities.get(vis);
@@ -305 +306 @@
                                 visibilityBox.setSelectedIndex(item);
                 }
-                categoryBox.setSelectedIndex(0);
                 for (Lit lit : categories.keySet()) {
                         int item = categories.get(lit);
@@ -311 +311 @@
                                 categoryBox.setSelectedIndex(item);
                 }
-                exhibitionBox.setSelectedIndex(0);
                 for (Exh exh : exhibitions.keySet()) {
                         int item = exhibitions.get(exh);

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMore.java

@@ -310 +310 @@
                 sourceBox.setText(dlg.mark.getSource());
                 infoBox.setText(dlg.mark.getInfo());
-                statusBox.setSelectedIndex(0);
                 for (Sts sts : statuses.keySet()) {
                         int item = statuses.get(sts);
@@ -316 +315 @@
                                 statusBox.setSelectedIndex(item);
                 }
-                constrBox.setSelectedIndex(0);
                 for (Cns cns : constructions.keySet()) {
                         int item = constructions.get(cns);
@@ -322 +320 @@
                                 constrBox.setSelectedIndex(item);
                 }
-                conBox.setSelectedIndex(0);
                 for (Con con : conspicuities.keySet()) {
                         int item = conspicuities.get(con);
@@ -328 +325 @@
                                 conBox.setSelectedIndex(item);
                 }
-                reflBox.setSelectedIndex(0);
                 for (Con con : reflectivities.keySet()) {
                         int item = reflectivities.get(con);

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java

@@ -142 +142 @@
                                 button.setBorderPainted(false);
                 }
-                categoryBox.setSelectedIndex(0);
                 for (Cat cat : categories.keySet()) {
                         int item = categories.get(cat);

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java

@@ -1377 +1377 @@
                         }
                         if (keys.containsKey("seamark:light" + secStr + ":character")) {
-                                String c = keys.get("seamark:light" + secStr + ":character");
-                                if (c.contains("(") && c.contains(")")) {
-                                        int i1 = c.indexOf("(");
-                                        int i2 = c.indexOf(")");
-                                        setLightAtt(Att.GRP, i, c.substring((i1+1), i2));
-                                        c = c.substring(0, i1) + c.substring((i2+1), c.length());
-                                        }
-                                setLightAtt(Att.CHR, i, c);
+                                str = keys.get("seamark:light" + secStr + ":character");
+                                if (str.contains("(") && str.contains(")")) {
+                                        int i1 = str.indexOf("(");
+                                        int i2 = str.indexOf(")");
+                                        setLightAtt(Att.GRP, i, str.substring((i1+1), i2));
+                                        str = str.substring(0, i1) + str.substring((i2+1), str.length());
+                                        }
+                                setLightAtt(Att.CHR, i, str);
                         }
                         if (keys.containsKey("seamark:light" + secStr + ":group"))
@@ -1423 +1423 @@
                                 setLightAtt(Att.ORT, i, keys.get("seamark:light" + secStr + ":orientation"));
                         if (keys.containsKey("seamark:light" + secStr + ":multiple"))
-                                setLightAtt(Att.HGT, i, keys.get("seamark:light" + secStr + ":multiple"));
+                                setLightAtt(Att.MLT, i, keys.get("seamark:light" + secStr + ":multiple"));
+                        
                         if (sectors.size() == i)
                                 break;