Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java (revision 9466) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java (revision 9467) @@ -97,5 +97,5 @@ */ public Set types; - public transient List data = new LinkedList<>(); + public final List data = new LinkedList<>(); public transient Roles roles; public transient TemplateEntry nameTemplate; @@ -238,12 +238,33 @@ } + /** + * Returns the tags being directly applied (without UI element) by {@link Key} items + * + * @return a list of tags + */ + private List getDirectlyAppliedTags() { + List tags = new ArrayList<>(); + for (TaggingPresetItem item : data) { + if (item instanceof Key) { + tags.add(((Key) item).asTag()); + } + } + return tags; + } + + /** + * Creates a panel for this preset. This includes general information such as name and supported {@link TaggingPresetType types}. + * This includes the elements from the individual {@link TaggingPresetItem items}. + * + * @param selected the selected primitives + * @return the newly created panel + */ public PresetPanel createPanel(Collection selected) { - if (data == null) - return null; PresetPanel p = new PresetPanel(); List l = new LinkedList<>(); List presetLink = new LinkedList<>(); + + final JPanel pp = new JPanel(); if (types != null) { - JPanel pp = new JPanel(); for (TaggingPresetType t : types) { JLabel la = new JLabel(ImageProvider.get(t.getIconName())); @@ -251,4 +272,12 @@ pp.add(la); } + } + final List directlyAppliedTags = getDirectlyAppliedTags(); + if (!directlyAppliedTags.isEmpty()) { + final JLabel label = new JLabel(ImageProvider.get("pastetags")); + label.setToolTipText("" + tr("This preset also sets: {0}", Utils.joinAsHtmlUnorderedList(directlyAppliedTags))); + pp.add(label); + } + if (pp.getComponentCount() > 0) { p.add(pp, GBC.eol()); } Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Key.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Key.java (revision 9466) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Key.java (revision 9467) @@ -26,5 +26,13 @@ @Override public void addCommands(List changedTags) { - changedTags.add(new Tag(key, value)); + changedTags.add(asTag()); + } + + /** + * Returns the {@link Tag} set by this item + * @return the tag + */ + public Tag asTag() { + return new Tag(key, value); }