");
- if (display_value != null) {
- res.append(display_value);
- } else {
- res.append(value);
- }
+ final StringBuilder res = new StringBuilder("");
+ final String displ = Utils.firstNonNull(locale_display_value, tr(display_value), value);
+ res.append(displ);
res.append("");
- if (short_description != null) {
+ final String descr = Utils.firstNonNull(locale_short_description, tr(short_description));
+ if (descr != null) {
// wrap in table to restrict the text width
- res.append("
| (").append(short_description).append(") |
");
+ res.append("").append(descr).append("
");
}
return res.toString();
}
- public PresetListEntry(String value) {
- this.value = value;
- this.display_value = value;
+ public ImageIcon getIcon() {
+ return icon == null ? null : ImageProvider.getIfAvailable(icon);
+ }
+
+ public PresetListEntry() {
}
- public PresetListEntry(String value, String display_value) {
+ public PresetListEntry(String value) {
this.value = value;
- this.display_value = display_value;
}
// toString is mainly used to initialize the Editor
@@ -234,7 +237,7 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
public String toString() {
if (value.equals(DIFFERENT))
return DIFFERENT;
- return display_value.replaceAll("<.*>", ""); // remove additional markup, e.g.
+ return display_value == null ? value : display_value.replaceAll("<.*>", ""); // remove additional markup, e.g.
}
}
@@ -430,9 +433,8 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
public String use_last_as_default = "false";
public boolean required = false;
- protected List short_description_list;
protected JComponent component;
- protected Map lhm;
+ protected Map lhm = new LinkedHashMap();
protected Usage usage;
protected Object originalValue;
@@ -444,37 +446,62 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
// find out if our key is already used in the selection.
usage = determineTextUsage(sel, key);
- String def = default_;
-
- 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(delChar, locale_display_values);
- } else if (display_values != null) {
- display_array = splitEscaped(delChar, display_values);
+ if (lhm.isEmpty()) {
+ display_array = initListEntriesFromAttributes();
} else {
- display_array = value_array;
+ if (values != null) {
+ System.err.println(tr("Warning in tagging preset \"{0}-{1}\": "
+ + "Ignoring ''{2}'' attribute as ''{3}'' elements are given.",
+ key, text, "values", "list_entry"));
+ }
+ if (display_values != null || locale_display_values != null) {
+ System.err.println(tr("Warning in tagging preset \"{0}-{1}\": "
+ + "Ignoring ''{2}'' attribute as ''{3}'' elements are given.",
+ key, text, "display_values", "list_entry"));
+ }
+ if (short_descriptions != null || locale_short_descriptions != null) {
+ System.err.println(tr("Warning in tagging preset \"{0}-{1}\": "
+ + "Ignoring ''{2}'' attribute as ''{3}'' elements are given.",
+ key, text, "short_descriptions", "list_entry"));
+ }
+ display_array = new String[lhm.values().size()];
+ int i = 0;
+ for (PresetListEntry e : lhm.values()) {
+ display_array[i++] = e.display_value;
+ }
}
- 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 (locale_text == null) {
+ if (text_context != null) {
+ locale_text = trc(text_context, fixPresetString(text));
+ } else {
+ locale_text = tr(fixPresetString(text));
+ }
}
+ p.add(new JLabel(locale_text + ":"), GBC.std().insets(0, 0, 10, 0));
+
+ addToPanelAnchor(p, default_, display_array);
- if (!"false".equals(use_last_as_default) && def == null && lastValue.containsKey(key)) {
- def = lastValue.get(key);
+ return true;
+
+ }
+
+ private String[] initListEntriesFromAttributes() {
+ char delChar = ';';
+ if (!delimiter.isEmpty()) {
+ delChar = delimiter.charAt(0);
}
+ String[] value_array = splitEscaped(delChar, values);
+
+ final String displ = Utils.firstNonNull(locale_display_values, display_values);
+ String[] display_array = displ == null ? value_array : splitEscaped(delChar, displ);
+
+ final String descr = Utils.firstNonNull(locale_short_descriptions, short_descriptions);
+ String[] short_descriptions_array = descr == null ? null : splitEscaped(delChar, descr);
+
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;
@@ -485,35 +512,23 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
short_descriptions_array = null;
}
- lhm = new LinkedHashMap();
if (!usage.hasUniqueValue() && !usage.unused()) {
lhm.put(DIFFERENT, new PresetListEntry(DIFFERENT));
}
for (int i = 0; i < value_array.length; i++) {
- PresetListEntry e = new PresetListEntry(value_array[i]);
- e.display_value = (locale_display_values == null)
- ? (values_context == null ? tr(fixPresetString(display_array[i]))
- : trc(values_context, fixPresetString(display_array[i]))) : display_array[i];
- if (short_descriptions_array != null) {
- e.short_description = locale_short_descriptions == null ? tr(fixPresetString(short_descriptions_array[i]))
- : fixPresetString(short_descriptions_array[i]);
- }
- lhm.put(value_array[i], e);
- }
-
- if (locale_text == null) {
- if (text_context != null) {
- locale_text = trc(text_context, fixPresetString(text));
- } else {
- locale_text = tr(fixPresetString(text));
+ final PresetListEntry e = new PresetListEntry(value_array[i]);
+ e.locale_display_value = locale_display_values != null
+ ? display_array[i]
+ : trc(values_context, fixPresetString(display_array[i]));
+ if (short_descriptions_array != null) {
+ e.locale_short_description = locale_short_descriptions != null
+ ? short_descriptions_array[i]
+ : tr(fixPresetString(short_descriptions_array[i]));
}
+ lhm.put(value_array[i], e);
}
- p.add(new JLabel(locale_text + ":"), GBC.std().insets(0, 0, 10, 0));
-
- addToPanelAnchor(p, def, display_array);
-
- return true;
+ return display_array;
}
protected String getDisplayIfNull(String display) {
@@ -560,11 +575,14 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
changedTags.add(new Tag(key, value));
}
- public void setShort_description(String s) {
- if (short_description_list == null) {
- short_description_list = new ArrayList();
+ public void addListEntry(PresetListEntry e) {
+ lhm.put(e.value, e);
+ }
+
+ public void addListEntries(Collection e) {
+ for (PresetListEntry i : e) {
+ addListEntry(i);
}
- short_description_list.add(tr(s));
}
@Override
@@ -575,7 +593,7 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
protected ListCellRenderer getListCellRenderer() {
return new ListCellRenderer() {
- HtmlPanel lbl = new HtmlPanel();
+ JLabel lbl = new JLabel();
JComponent dummy = new JComponent() {
};
@@ -594,8 +612,10 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
}
PresetListEntry item = (PresetListEntry) value;
- String s = item.getListDisplay();
- lbl.setText(s);
+ lbl.setOpaque(true);
+ lbl.setFont(lbl.getFont().deriveFont(Font.PLAIN));
+ lbl.setText("" + item.getListDisplay() + "");
+ lbl.setIcon(item.getIcon());
lbl.setEnabled(list.isEnabled());
// We do not want the editor to have the maximum height of all
// entries. Return a dummy with bogus height.
@@ -1140,9 +1160,11 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
parser.map("label", Label.class);
parser.map("space", Space.class);
parser.map("key", Key.class);
+ parser.map("list_entry", PresetListEntry.class);
LinkedList all = new LinkedList();
TaggingPresetMenu lastmenu = null;
Roles lastrole = null;
+ List listEntries = new LinkedList();
if (validate) {
parser.startWithValidation(in, "http://josm.openstreetmap.de/tagging-preset-1.0", "resource://data/tagging-preset.xsd");
@@ -1176,18 +1198,23 @@ public class TaggingPreset extends AbstractAction implements MapView.LayerChange
all.add(tp);
lastrole = null;
} else {
- if(all.size() != 0) {
- if(o instanceof Roles) {
- all.getLast().data.add((Item)o);
+ if (all.size() != 0) {
+ if (o instanceof Roles) {
+ all.getLast().data.add((Item) o);
lastrole = (Roles) o;
- }
- else if(o instanceof Role) {
- if(lastrole == null)
+ } else if (o instanceof Role) {
+ if (lastrole == null) {
throw new SAXException(tr("Preset role element without parent"));
+ }
lastrole.roles.add((Role) o);
- }
- else {
- all.getLast().data.add((Item)o);
+ } else if (o instanceof PresetListEntry) {
+ listEntries.add((PresetListEntry) o);
+ } else {
+ all.getLast().data.add((Item) o);
+ if (o instanceof ComboMultiSelect) {
+ ((ComboMultiSelect) o).addListEntries(listEntries);
+ }
+ listEntries = new LinkedList();
lastrole = null;
}
} else
diff --git a/src/org/openstreetmap/josm/tools/Utils.java b/src/org/openstreetmap/josm/tools/Utils.java
index 8c26f43..2ea3c7d 100644
--- a/src/org/openstreetmap/josm/tools/Utils.java
+++ b/src/org/openstreetmap/josm/tools/Utils.java
@@ -62,9 +62,18 @@ public class Utils {
return null;
}
- public static Collection filter(Collection collection, Predicate predicate) {
- return new FilteredCollection(collection, predicate);
- }
+ public static Collection filter(Collection collection, Predicate predicate) {
+ return new FilteredCollection(collection, predicate);
+ }
+
+ public static T firstNonNull(T... items) {
+ for (T i : items) {
+ if (i != null) {
+ return i;
+ }
+ }
+ return null;
+ }
/**
* Filter a collection by (sub)class.