Index: src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java =================================================================== --- src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (revision 4279) +++ src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (working copy) @@ -117,17 +117,24 @@ private static final BooleanProperty PROP_FILL_DEFAULT = new BooleanProperty("taggingpreset.fill-default-for-tagged-primitives", false); public static abstract class Item { + protected void initAutoCompletionField(AutoCompletingTextField field, String key) { OsmDataLayer layer = Main.main.getEditLayer(); - if (layer == null) return; - AutoCompletionList list = new AutoCompletionList(); + if (layer == null) { + return; + } + AutoCompletionList list = new AutoCompletionList(); Main.main.getEditLayer().data.getAutoCompletionManager().populateWithTagValues(list, key); field.setAutoCompletionList(list); } abstract boolean addToPanel(JPanel p, Collection sel); + abstract void addCommands(List changedTags); - boolean requestFocusInWindow() {return false;} + + boolean requestFocusInWindow() { + return false; + } } public static class Usage { @@ -139,7 +146,7 @@ } public boolean unused() { - return values.size() == 0; + return values.isEmpty(); } public String getFirst() { return values.first(); @@ -289,24 +296,32 @@ return true; } - @Override public void addCommands(List changedTags) { + @Override + public void addCommands(List changedTags) { // return if unchanged - String v = (value instanceof JComboBox) ? - ((JComboBox)value).getEditor().getItem().toString() : - ((JTextField)value).getText(); + String v = (value instanceof JComboBox) + ? ((JComboBox) value).getEditor().getItem().toString() + : ((JTextField) value).getText(); + v = v.trim(); - if (!"false".equals(use_last_as_default)) { - lastValue.put(key, v); - } - if (v.equals(originalValue) || (originalValue == null && v.length() == 0)) return; + if (!"false".equals(use_last_as_default)) { + lastValue.put(key, v); + } + if (v.equals(originalValue) || (originalValue == null && v.length() == 0)) { + return; + } - if (delete_if_empty && v.length() == 0) { - v = null; - } - changedTags.add(new Tag(key, v)); + if (delete_if_empty && v.length() == 0) { + v = null; + } + changedTags.add(new Tag(key, v)); } - @Override boolean requestFocusInWindow() {return value.requestFocusInWindow();} + + @Override + boolean requestFocusInWindow() { + return value.requestFocusInWindow(); + } } public static class Check extends Item { @@ -394,7 +409,7 @@ @Override boolean requestFocusInWindow() {return check.requestFocusInWindow();} } - public static class Combo extends Item { + public static abstract class ComboMultiSelect extends Item { public String key; public String text; @@ -407,39 +422,48 @@ public String short_descriptions; public String locale_short_descriptions; public String default_; + public String delimiter = ";"; public boolean delete_if_empty = false; - public boolean editable = true; public String use_last_as_default = "false"; public boolean required = false; - private List short_description_list; - private JComboBox combo; - private Map lhm; - private Usage usage; - private PresetListEntry originalValue; + protected List short_description_list; + protected JComponent component; + protected Map lhm; + protected Usage usage; + protected Object originalValue; - @Override public boolean addToPanel(JPanel p, Collection sel) { + protected abstract Object getSelectedItem(); + protected abstract void addToPanelAnchor(JPanel p, String def, String[] display_array); + @Override + public boolean addToPanel(JPanel p, Collection sel) { + // find out if our key is already used in the selection. usage = determineTextUsage(sel, key); String def = default_; - String[] value_array = splitEscaped(',', values); + char delChar = ';'; + if (!delimiter.isEmpty()) { + delChar = delimiter.charAt(0); + } + + String[] value_array = splitEscaped(delChar, values); String[] display_array; String[] short_descriptions_array = null; - if(locale_display_values != null) { - display_array = splitEscaped(',', locale_display_values); + if (locale_display_values != null) { + display_array = splitEscaped(delChar, locale_display_values); } else if (display_values != null) { - display_array = splitEscaped(',', display_values); + display_array = splitEscaped(delChar, display_values); } else { display_array = value_array; } if (locale_short_descriptions != null) { - short_descriptions_array = splitEscaped(',', locale_short_descriptions); + short_descriptions_array = splitEscaped(delChar, locale_short_descriptions); } else if (short_descriptions != null) { - short_descriptions_array = splitEscaped(',', short_descriptions); + short_descriptions_array = splitEscaped(delChar, short_descriptions); } else if (short_description_list != null) { short_descriptions_array = short_description_list.toArray(new String[0]); } @@ -462,10 +486,10 @@ if (!usage.hasUniqueValue() && !usage.unused()) { lhm.put(DIFFERENT, new PresetListEntry(DIFFERENT)); } - for (int i=0; i changedTags) { - Object obj = combo.getSelectedItem(); + @Override + public void addCommands(List changedTags) { + Object obj = getSelectedItem(); String display = (obj == null) ? null : obj.toString(); String value = null; - if(display == null && combo.isEditable()) { - display = combo.getEditor().getItem().toString(); + if (display == null) { + display = getDisplayIfNull(display); } - if (display != null) - { + if (display != null) { for (String key : lhm.keySet()) { String k = lhm.get(key).toString(); if (k != null && k.equals(display)) { - value=key; + value = key; } } - if(value == null) { + if (value == null) { value = display; } } else { value = ""; } + value = value.trim(); // no change if same as before if (originalValue == null) { - if (value.length() == 0) + if (value.length() == 0) { return; - } else if (value.equals(originalValue.toString())) + } + } else if (value.equals(originalValue.toString())) { return; + } if (delete_if_empty && value.length() == 0) { value = null; @@ -616,11 +566,126 @@ short_description_list.add(tr(s)); } - @Override boolean requestFocusInWindow() {return combo.requestFocusInWindow();} + @Override + boolean requestFocusInWindow() { + return component.requestFocusInWindow(); + } + + protected ListCellRenderer getListCellRenderer() { + return new ListCellRenderer() { + + HtmlPanel lbl = new HtmlPanel(); + JComponent dummy = new JComponent() { + }; + + public Component getListCellRendererComponent( + JList list, + Object value, + int index, + boolean isSelected, + boolean cellHasFocus) { + if (isSelected) { + lbl.setBackground(list.getSelectionBackground()); + lbl.setForeground(list.getSelectionForeground()); + } else { + lbl.setBackground(list.getBackground()); + lbl.setForeground(list.getForeground()); + } + + PresetListEntry item = (PresetListEntry) value; + String s = item.getListDisplay(); + lbl.setText(s); + lbl.setEnabled(list.isEnabled()); + // We do not want the editor to have the maximum height of all + // entries. Return a dummy with bogus height. + if (index == -1) { + dummy.setPreferredSize(new Dimension(lbl.getPreferredSize().width, 10)); + return dummy; + } + return lbl; + } + }; + } } + public static class Combo extends ComboMultiSelect { + + public boolean editable = true; + protected JComboBox combo; + + public Combo() { + delimiter = ","; + } + + @Override + protected void addToPanelAnchor(JPanel p, String def, String[] display_array) { + if (!usage.unused()) { + for (String s : usage.values) { + if (!lhm.containsKey(s)) { + lhm.put(s, new PresetListEntry(s)); + } + } + } + if (def != null && !lhm.containsKey(def)) { + lhm.put(def, new PresetListEntry(def)); + } + lhm.put("", new PresetListEntry("")); + + combo = new JComboBox(lhm.values().toArray()); + component = combo; + combo.setRenderer(getListCellRenderer()); + combo.setEditable(editable); + combo.setMaximumRowCount(13); + AutoCompletingTextField tf = new AutoCompletingTextField(); + initAutoCompletionField(tf, key); + tf.getAutoCompletionList().add(Arrays.asList(display_array), AutoCompletionItemPritority.IS_IN_STANDARD); + combo.setEditor(tf); + + if (usage.hasUniqueValue()) { + // all items have the same value (and there were no unset items) + originalValue = lhm.get(usage.getFirst()); + combo.setSelectedItem(originalValue); + } else if (def != null && usage.unused()) { + // default is set and all items were unset + if (!usage.hadKeys() || PROP_FILL_DEFAULT.get() || "force".equals(use_last_as_default)) { + // selected osm primitives are untagged or filling default feature is enabled + combo.setSelectedItem(def); + } else { + // selected osm primitives are tagged and filling default feature is disabled + combo.setSelectedItem(""); + } + originalValue = lhm.get(DIFFERENT); + } else if (usage.unused()) { + // all items were unset (and so is default) + originalValue = lhm.get(""); + combo.setSelectedItem(originalValue); + } else { + originalValue = lhm.get(DIFFERENT); + combo.setSelectedItem(originalValue); + } + p.add(combo, GBC.eol().fill(GBC.HORIZONTAL)); + + } + + @Override + protected Object getSelectedItem() { + return combo.getSelectedItem(); + + } + + @Override + protected String getDisplayIfNull(String display) { + if (combo.isEditable()) { + return combo.getEditor().getItem().toString(); + } else { + return display; + } + + } + } + /** - * Class that allows list values to be assigned and retrived as a comma-delimited + * Class that allows list values to be assigned and retrieved as a comma-delimited * string. */ public static class ConcatenatingJList extends JList { @@ -664,216 +729,49 @@ } } - public static class MultiSelect extends Item { + public static class MultiSelect extends ComboMultiSelect { - public String key; - public String text; - public String text_context; - public String locale_text; - public String values; - public String values_context; - public String display_values; - public String locale_display_values; - public String short_descriptions; - public String locale_short_descriptions; - public String default_; - public String delimiter = ";"; - public boolean delete_if_empty = false; - public String use_last_as_default = "false"; - public boolean required = false; public long rows = -1; + protected ConcatenatingJList list; - private List short_description_list; - private ConcatenatingJList list; - private Map lhm; - private Usage usage; - private String originalValue; - - @Override public boolean addToPanel(JPanel p, Collection sel) { - - // find out if our key is already used in the selection. - usage = determineTextUsage(sel, key); - String def = default_; - - char delChar = ';'; - if (delimiter.length() > 0) { - delChar = delimiter.charAt(0); - } - - String[] value_array = splitEscaped(delChar, values); - String[] display_array; - String[] short_descriptions_array = null; - - if (locale_display_values != null) { - display_array = splitEscaped(delChar, locale_display_values); - } else if (display_values != null) { - display_array = splitEscaped(delChar, display_values); - } else { - display_array = value_array; - } - - if (locale_short_descriptions != null) { - short_descriptions_array = splitEscaped(delChar, locale_short_descriptions); - } else if (short_descriptions != null) { - short_descriptions_array = splitEscaped(delChar, short_descriptions); - } else if (short_description_list != null) { - short_descriptions_array = short_description_list.toArray(new String[0]); - } - - if (!"false".equals(use_last_as_default) && def == null && lastValue.containsKey(key)) { - def = lastValue.get(key); - } - - if (display_array.length != value_array.length) { - System.err.println(tr("Broken tagging preset \"{0}-{1}\" - number of items in ''display_values'' must be the same as in ''values''", key, text)); - display_array = value_array; - } - - if (short_descriptions_array != null && short_descriptions_array.length != value_array.length) { - System.err.println(tr("Broken tagging preset \"{0}-{1}\" - number of items in ''short_descriptions'' must be the same as in ''values''", key, text)); - short_descriptions_array = null; - } - - lhm = new LinkedHashMap(); - if (!usage.hasUniqueValue() && !usage.unused()) { - lhm.put(DIFFERENT, new PresetListEntry(DIFFERENT)); - } - for (int i=0; i changedTags) { - Object obj = list.getSelectedItem(); - String display = (obj == null) ? null : obj.toString(); - String value = null; - - if (display != null) - { - for (String key : lhm.keySet()) { - String k = lhm.get(key).toString(); - if (k != null && k.equals(display)) { - value=key; - } - } - if (value == null) { - value = display; - } - } else { - value = ""; - } - - // no change if same as before - if (originalValue == null) { - if (value.length() == 0) - return; - } else if (value.equals(originalValue.toString())) - return; - - if (delete_if_empty && value.length() == 0) { - value = null; - } - if (!"false".equals(use_last_as_default)) { - lastValue.put(key, value); - } - changedTags.add(new Tag(key, value)); + @Override + protected Object getSelectedItem() { + return list.getSelectedItem(); } - - public void setShort_description(String s) { - if (short_description_list == null) { - short_description_list = new ArrayList(); - } - short_description_list.add(tr(s)); - } - - @Override boolean requestFocusInWindow() {return list.requestFocusInWindow();} } /** @@ -908,13 +806,15 @@ } public static class Label extends Item { + public String text; public String text_context; public String locale_text; - @Override public boolean addToPanel(JPanel p, Collection sel) { - if(locale_text == null) { - if(text_context != null) { + @Override + public boolean addToPanel(JPanel p, Collection sel) { + if (locale_text == null) { + if (text_context != null) { locale_text = trc(text_context, fixPresetString(text)); } else { locale_text = tr(fixPresetString(text)); @@ -923,21 +823,26 @@ p.add(new JLabel(locale_text), GBC.eol()); return false; } - @Override public void addCommands(List changedTags) {} + + @Override + public void addCommands(List changedTags) { + } } public static class Link extends Item { + public String href; public String text; public String text_context; public String locale_text; public String locale_href; - @Override public boolean addToPanel(JPanel p, Collection sel) { - if(locale_text == null) { - if(text == null) { + @Override + public boolean addToPanel(JPanel p, Collection sel) { + if (locale_text == null) { + if (text == null) { locale_text = tr("More information about this feature"); - } else if(text_context != null) { + } else if (text_context != null) { locale_text = trc(text_context, fixPresetString(text)); } else { locale_text = tr(fixPresetString(text)); @@ -952,7 +857,10 @@ } return false; } - @Override public void addCommands(List changedTags) {} + + @Override + public void addCommands(List changedTags) { + } } public static class Role { @@ -1024,15 +932,17 @@ } public static class Roles extends Item { + public List roles = new LinkedList(); - @Override public boolean addToPanel(JPanel p, Collection sel) { + + @Override + public boolean addToPanel(JPanel p, Collection sel) { p.add(new JLabel(" "), GBC.eol()); // space - if(roles.size() > 0) - { + if (roles.size() > 0) { JPanel proles = new JPanel(new GridBagLayout()); - proles.add(new JLabel(tr("Available roles")), GBC.std().insets(0,0,10,0)); - proles.add(new JLabel(tr("role")), GBC.std().insets(0,0,10,0)); - proles.add(new JLabel(tr("count")), GBC.std().insets(0,0,10,0)); + proles.add(new JLabel(tr("Available roles")), GBC.std().insets(0, 0, 10, 0)); + proles.add(new JLabel(tr("role")), GBC.std().insets(0, 0, 10, 0)); + proles.add(new JLabel(tr("count")), GBC.std().insets(0, 0, 10, 0)); proles.add(new JLabel(tr("elements")), GBC.eol()); for (Role i : roles) { i.addToPanel(proles, sel); @@ -1041,36 +951,55 @@ } return false; } - @Override public void addCommands(List changedTags) {} + + @Override + public void addCommands(List changedTags) { + } } public static class Optional extends Item { + // TODO: Draw a box around optional stuff - @Override public boolean addToPanel(JPanel p, Collection sel) { + @Override + public boolean addToPanel(JPanel p, Collection sel) { p.add(new JLabel(" "), GBC.eol()); // space p.add(new JLabel(tr("Optional Attributes:")), GBC.eol()); p.add(new JLabel(" "), GBC.eol()); // space return false; } - @Override public void addCommands(List changedTags) {} + + @Override + public void addCommands(List changedTags) { + } } public static class Space extends Item { - @Override public boolean addToPanel(JPanel p, Collection sel) { + + @Override + public boolean addToPanel(JPanel p, Collection sel) { p.add(new JLabel(" "), GBC.eol()); // space return false; } - @Override public void addCommands(List changedTags) {} + + @Override + public void addCommands(List changedTags) { + } } public static class Key extends Item { + public String key; public String value; - @Override public boolean addToPanel(JPanel p, Collection sel) { return false; } - @Override public void addCommands(List changedTags) { - changedTags.add(new Tag(key, value != null && !value.equals("") ? value : null)); + @Override + public boolean addToPanel(JPanel p, Collection sel) { + return false; } + + @Override + public void addCommands(List changedTags) { + changedTags.add(new Tag(key, value)); + } } /**