Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (revision 5155)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (revision 5158)
@@ -8,4 +8,5 @@
import java.awt.Component;
import java.awt.Dimension;
+import java.awt.Font;
import java.awt.GridBagLayout;
import java.awt.Image;
@@ -72,5 +73,4 @@
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.gui.widgets.HtmlPanel;
import org.openstreetmap.josm.io.MirroredInputStream;
import org.openstreetmap.josm.tools.GBC;
@@ -263,8 +263,9 @@
}
- protected static class PresetListEntry {
- String value;
- String display_value;
- String short_description;
+ public static class PresetListEntry {
+ public String value;
+ public String display_value;
+ public String short_description;
+ public String icon;
public String getListDisplay() {
@@ -284,7 +285,14 @@
if (short_description != null) {
// wrap in table to restrict the text width
- res.append("
| (").append(short_description).append(") |
");
+ res.append("").append(short_description).append("
");
}
return res.toString();
+ }
+
+ public ImageIcon getIcon() {
+ return icon == null ? null : ImageProvider.getIfAvailable(icon);
+ }
+
+ public PresetListEntry() {
}
@@ -304,5 +312,5 @@
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.
}
}
@@ -525,7 +533,6 @@
public String match = MatchType.NONE.getValue();
- protected List short_description_list;
protected JComponent component;
- protected Map lhm;
+ protected Map lhm = new LinkedHashMap();
protected Usage usage;
protected Object originalValue;
@@ -543,5 +550,47 @@
// find out if our key is already used in the selection.
usage = determineTextUsage(sel, key);
- String def = default_;
+
+ String[] display_array;
+ if (lhm.isEmpty()) {
+ display_array = initListEntriesFromAttributes();
+ } else {
+ 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_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);
+
+ return true;
+
+ }
+
+ private String[] initListEntriesFromAttributes() {
char delChar = getDelChar();
@@ -563,10 +612,4 @@
} 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);
}
@@ -581,5 +624,4 @@
}
- lhm = new LinkedHashMap();
if (!usage.hasUniqueValue() && !usage.unused()) {
lhm.put(DIFFERENT, new PresetListEntry(DIFFERENT));
@@ -597,17 +639,5 @@
}
- 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, def, display_array);
-
- return true;
-
+ return display_array;
}
@@ -653,9 +683,12 @@
}
- public void setShort_description(String s) {
- if (short_description_list == null) {
- short_description_list = new ArrayList();
- }
- short_description_list.add(tr(s));
+ public void addListEntry(PresetListEntry e) {
+ lhm.put(e.value, e);
+ }
+
+ public void addListEntries(Collection e) {
+ for (PresetListEntry i : e) {
+ addListEntry(i);
+ }
}
@@ -668,5 +701,5 @@
return new ListCellRenderer() {
- HtmlPanel lbl = new HtmlPanel();
+ JLabel lbl = new JLabel();
JComponent dummy = new JComponent() {
};
@@ -687,6 +720,8 @@
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
@@ -1292,7 +1327,9 @@
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) {
@@ -1328,16 +1365,21 @@
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;
}