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

Timestamp:

2011-09-28T14:18:15+02:00 (13 years ago)

Author:

malcolmh

Message:

save

File:

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

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

@@ -43 +43 @@
                                                 dlg.mark.setColour(ent, col);
                                                 if (ent != Ent.LIGHT) {
-                                                        stackCol.get(stackIdx).setBackground(dlg.mark.ColMAP.get(dlg.mark.getColour(ent, stackIdx)));
+                                                        if (button == offButton) {
+                                                                stack.remove(stackCol.get(stackIdx));
+                                                                stackCol.remove(stackIdx);
+                                                        } else if (button == addButton) {
+                                                                stackCol.add(stackIdx, new JRadioButton());
+                                                                stackCol.get(stackIdx).setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
+                                                                stack.add(stackCol.get(stackIdx));
+                                                        }
+                                                        for (int i = 0; stackCol.size() > i; i++) {
+                                                                stackCol.get(i).setBounds(37, (89 + (i * (60 / stackCol.size()))), 30, (60 / stackCol.size()));
+                                                                stackCol.get(i).setBackground(dlg.mark.ColMAP.get(dlg.mark.getColour(ent, i)));
+                                                        }
                                                 }
                                         }
@@ -95 +106 @@
                         stack.setBounds(37, 89, 30, 60);
                         this.add(stack);
-                        Col col;
-                        for (int i = 0; (col = dlg.mark.getColour(ent, i)) != Col.UNKNOWN; i++) {
-                                stackCol.add(new JRadioButton());
+                        if (dlg.mark != null) {
+                                for (int i = 0; dlg.mark.getColour(ent, i) != Col.UNKNOWN; i++) {
+                                        stackCol.add(new JRadioButton());
+                                }
                         }
-
                 }
         }