Changeset 117 in josm for src/org/openstreetmap/josm/gui/dialogs

Timestamp:

2006-07-20T01:29:55+02:00 (19 years ago)

Author:

imi

Message:

• added <combo> as annotation item
• added CONTRIBUTION and java version to About dialog

File:

• src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java (modified) (5 diffs)

src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java

@@ -14 +14 @@
 
 import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -76 +77 @@
                 public void addCommands(Collection<OsmPrimitive> sel, List<Command> cmds) {
                         cmds.add(new ChangePropertyCommand(sel, key, check.isSelected() ? "true" : null));
+                }
+        }
+
+        public static class Combo implements Item {
+                String key;
+                String label;
+                JComboBox combo;
+
+                public void addToPanel(JPanel p) {
+                        p.add(new JLabel(label), GBC.std().insets(0,0,10,0));
+                        p.add(combo, GBC.eol().fill(GBC.HORIZONTAL));
+                }
+                public Combo(String key, String label, String def, String[] values, boolean editable) {
+                        this.key = key;
+                        this.label = label;
+                        combo = new JComboBox(values);
+                        combo.setEditable(editable);
+                        combo.setSelectedItem(def);
+                }
+                public void addCommands(Collection<OsmPrimitive> sel, List<Command> cmds) {
+                        String str = combo.isEditable()?combo.getEditor().getItem().toString() : combo.getSelectedItem().toString();
+                        cmds.add(new ChangePropertyCommand(sel, key, str));
                 }
         }
@@ -120 +143 @@
                                         currentName = "Unnamed Preset #"+(unknownCounter++);
                         } else if (qname.equals("text"))
-                                current.add(new Text(a.getValue("key"), a.getValue("label"), a.getValue("default")));
+                                current.add(new Text(a.getValue("key"), a.getValue("text"), a.getValue("default")));
                         else if (qname.equals("check")) {
                                 String s = a.getValue("default");
-                                boolean check = s == null || s.equals("0") || s.startsWith("off") || s.startsWith("false") || s.startsWith("no");
-                                current.add(new Check(a.getValue("key"), a.getValue("label"), check));
+                                boolean clear = s == null || s.equals("0") || s.startsWith("off") || s.startsWith("false") || s.startsWith("no");
+                                current.add(new Check(a.getValue("key"), a.getValue("text"), !clear));
                         } else if (qname.equals("label"))
-                                current.add(new Label(a.getValue("label")));
-                        else if (qname.equals("key"))
+                                current.add(new Label(a.getValue("text")));
+                        else if (qname.equals("combo")) {
+                                String[] values = a.getValue("values").split(",");
+                                String s = a.getValue("readonly");
+                                boolean editable = s == null || s.equals("0") || s.startsWith("off") || s.startsWith("false") || s.startsWith("no");
+                                current.add(new Combo(a.getValue("key"), a.getValue("text"), a.getValue("default"), values, editable));
+                        } else if (qname.equals("key"))
                                 current.add(new Key(a.getValue("key"), a.getValue("value")));
                         else
@@ -176 +204 @@
                 return p;
         }
-        
+
         @Override public String toString() {
                 return name;
@@ -191 +219 @@
                 else
                         return new SequenceCommand(tr("Change Properties"), cmds);
-    }
+        }
 }