Changeset 27061 in osm for applications/editors/josm/plugins/smed/plugs

Timestamp:

2011-11-15T18:54:44+01:00 (13 years ago)

Author:

malcolmh

Message:

save

File:

• applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java (modified) (9 diffs)

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

@@ -39 +39 @@
                         for (Cat cat : trafficCats.keySet()) {
                                 int idx = trafficCats.get(cat);
-                                if (dlg.mark != null && (idx == trafficCatBox.getSelectedIndex()))
+                                if (dlg.mark != null && (idx == trafficCatBox.getSelectedIndex())) {
                                         dlg.mark.setCategory(cat);
+                                        dlg.mark.testValid();
+                                        dlg.mark.paintSign();
+                                }
                         }
                 }
@@ -50 +53 @@
                         for (Cat cat : warningCats.keySet()) {
                                 int idx = warningCats.get(cat);
-                                if (dlg.mark != null && (idx == warningCatBox.getSelectedIndex()))
+                                if (dlg.mark != null && (idx == warningCatBox.getSelectedIndex())) {
                                         dlg.mark.setCategory(cat);
+                                        dlg.mark.testValid();
+                                        dlg.mark.paintSign();
+                                }
                         }
                 }
@@ -85 +91 @@
                                 trafficCatBox.setVisible(false);
                                 warningCatBox.setVisible(false);
+                                alLandCatBox.actionPerformed(null);
                         } else if (trafficButton.isSelected()) {
                                 categoryLabel.setVisible(true);
@@ -90 +97 @@
                                 landCatBox.setVisible(false);
                                 warningCatBox.setVisible(false);
+                                alTrafficCatBox.actionPerformed(null);
                         } else if (warningButton.isSelected()) {
                                 categoryLabel.setVisible(true);
@@ -95 +103 @@
                                 landCatBox.setVisible(false);
                                 trafficCatBox.setVisible(false);
+                                alWarningCatBox.actionPerformed(null);
                         } else {
                                 dlg.mark.setCategory(Cat.NONE);
@@ -188 +197 @@
                         trafficCatBox.setVisible(false);
                         warningCatBox.setVisible(false);
+                        for (Cat cat : landCats.keySet()) {
+                                int item = landCats.get(cat);
+                                if (dlg.mark.getCategory() == cat)
+                                        landCatBox.setSelectedIndex(item);
+                        }
                 } else if (dlg.mark.getObject() == Obj.SISTAT) {
                                 categoryLabel.setVisible(true);
@@ -193 +207 @@
                                 landCatBox.setVisible(false);
                                 warningCatBox.setVisible(false);
+                                for (Cat cat : trafficCats.keySet()) {
+                                        int item = trafficCats.get(cat);
+                                        if (dlg.mark.getCategory() == cat)
+                                                trafficCatBox.setSelectedIndex(item);
+                                }
                 } else if (dlg.mark.getObject() == Obj.SISTAW) {
                         categoryLabel.setVisible(true);
@@ -198 +217 @@
                         landCatBox.setVisible(false);
                         trafficCatBox.setVisible(false);
+                        for (Cat cat : warningCats.keySet()) {
+                                int item = warningCats.get(cat);
+                                if (dlg.mark.getCategory() == cat)
+                                        warningCatBox.setSelectedIndex(item);
+                        }
                 } else {
                         categoryLabel.setVisible(false);
@@ -203 +227 @@
                         trafficCatBox.setVisible(false);
                         warningCatBox.setVisible(false);
-                }
-                landCatBox.setSelectedIndex(0);
-                for (Cat cat : landCats.keySet()) {
-                        int item = landCats.get(cat);
-                        if (dlg.mark.getCategory() == cat)
-                                landCatBox.setSelectedIndex(item);
-                }
-                trafficCatBox.setSelectedIndex(0);
-                for (Cat cat : trafficCats.keySet()) {
-                        int item = trafficCats.get(cat);
-                        if (dlg.mark.getCategory() == cat)
-                                trafficCatBox.setSelectedIndex(item);
-                }
-                warningCatBox.setSelectedIndex(0);
-                for (Cat cat : warningCats.keySet()) {
-                        int item = warningCats.get(cat);
-                        if (dlg.mark.getCategory() == cat)
-                                warningCatBox.setSelectedIndex(item);
                 }
                 for (Obj obj : objects.keySet()) {