t = convertPresets(presets, source.title + " ", false);
Logging.info("Converted {0} presets of {1} to {2} tags", presets.size(), source.title, t.size());
tags.addAll(t);
@@ -355,7 +352,7 @@
* @throws ParseException in case of parsing error
*/
private void parseStyleSheet() throws IOException, ParseException {
- try (BufferedReader reader = options.inputFile.getContentReader()) {
+ try (BufferedReader reader = new CachedFile(options.inputUrl).getContentReader()) {
MapCSSParser parser = new MapCSSParser(reader, MapCSSParser.LexicalState.DEFAULT);
styleSource = new MapCSSStyleSource("");
styleSource.url = "";
Index: src/org/openstreetmap/josm/actions/UploadAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/UploadAction.java (revision 18366)
+++ src/org/openstreetmap/josm/actions/UploadAction.java (working copy)
@@ -240,8 +240,7 @@
ChangesetUpdater.check();
final UploadDialog dialog = UploadDialog.getUploadDialog();
- dialog.setUploadedPrimitives(apiData);
- dialog.initLifeCycle(layer.getDataSet());
+ dialog.initLifeCycle(layer.getDataSet(), apiData);
dialog.setVisible(true);
dialog.rememberUserInput();
if (dialog.isCanceled()) {
Index: src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java
===================================================================
--- src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java (revision 18366)
+++ src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java (working copy)
@@ -184,7 +184,7 @@
}
name.append(n);
} else {
- preset.nameTemplate.appendText(name, (TemplateEngineDataProvider) node);
+ preset.getNameTemplate().appendText(name, (TemplateEngineDataProvider) node);
}
if (node.isLatLonKnown() && Config.getPref().getBoolean("osm-primitives.showcoor")) {
name.append(" \u200E(");
@@ -252,7 +252,7 @@
name.append(n);
} else {
- preset.nameTemplate.appendText(name, (TemplateEngineDataProvider) way);
+ preset.getNameTemplate().appendText(name, (TemplateEngineDataProvider) way);
}
int nodesNo = way.getRealNodesCount();
@@ -355,7 +355,7 @@
}
result.append(" (").append(relationName).append(", ");
} else {
- preset.nameTemplate.appendText(result, (TemplateEngineDataProvider) relation);
+ preset.getNameTemplate().appendText(result, (TemplateEngineDataProvider) relation);
result.append('(');
}
return result;
Index: src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java
===================================================================
--- src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java (revision 18366)
+++ src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java (working copy)
@@ -45,8 +45,6 @@
import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser;
import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.ParseException;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetMenu;
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetSeparator;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
import org.openstreetmap.josm.tools.AlphanumComparator;
import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -1911,7 +1909,7 @@
this.presets = TaggingPresets.getTaggingPresets()
.stream()
- .filter(preset -> !(preset instanceof TaggingPresetMenu || preset instanceof TaggingPresetSeparator))
+ .filter(preset -> preset.getClass() == TaggingPreset.class)
.filter(preset -> presetNameMatch(presetName, preset, matchStrictly))
.collect(Collectors.toList());
@@ -1929,16 +1927,7 @@
if (matchStrictly) {
return name.equalsIgnoreCase(preset.getRawName());
}
-
- try {
- String groupSuffix = name.substring(0, name.length() - 2); // try to remove '/*'
- TaggingPresetMenu group = preset.group;
-
- return group != null && groupSuffix.equalsIgnoreCase(group.getRawName());
- } catch (StringIndexOutOfBoundsException ex) {
- Logging.trace(ex);
- return false;
- }
+ return preset.nameMatchesGlob(name);
}
@Override
Index: src/org/openstreetmap/josm/data/tagging/ac/AutoCompItemCellRenderer.java
===================================================================
--- src/org/openstreetmap/josm/data/tagging/ac/AutoCompItemCellRenderer.java (nonexistent)
+++ src/org/openstreetmap/josm/data/tagging/ac/AutoCompItemCellRenderer.java (working copy)
@@ -0,0 +1,79 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.tagging.ac;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Font;
+import java.util.Map;
+
+import javax.swing.ImageIcon;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.ListCellRenderer;
+
+import org.openstreetmap.josm.gui.widgets.JosmListCellRenderer;
+import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
+
+/**
+ * A custom list cell renderer for autocompletion items that colorizes and adds the value count to
+ * some items.
+ *
+ * See also: {@link AutoCompletionPriority#compareTo}
+ */
+public class AutoCompItemCellRenderer extends JosmListCellRenderer {
+ /** The color used to render items found in the dataset. */
+ public static final Color BGCOLOR_1 = new Color(254, 226, 214);
+ /** The color used to render items found in the standard */
+ public static final Color BGCOLOR_2 = new Color(235, 255, 177);
+
+ protected Map map;
+ private static final ImageIcon iconEmpty = ImageProvider.getEmpty(ImageSizes.POPUPMENU);
+ private static final ImageIcon iconDataSet = ImageProvider.get("in_dataset", ImageSizes.POPUPMENU);
+ private static final ImageIcon iconStandard = ImageProvider.get("in_standard", ImageSizes.POPUPMENU);
+
+ /**
+ * Constructs the cell renderer.
+ *
+ * @param component The component the renderer is attached to. JComboBox or JList.
+ * @param renderer The L&F renderer. Usually obtained by calling {@code getRenderer()} on {@code component}.
+ * @param map A map from key to count.
+ */
+ public AutoCompItemCellRenderer(Component component, ListCellRenderer renderer, Map map) {
+ super(component, renderer);
+ this.map = map;
+ }
+
+ @Override
+ public Component getListCellRendererComponent(JList list, AutoCompletionItem value,
+ int index, boolean isSelected, boolean cellHasFocus) {
+ Integer count = null;
+ if (value == null)
+ value = new AutoCompletionItem("", AutoCompletionPriority.IS_IN_STANDARD);
+
+ // if there is a value count add it to the text
+ if (map != null) {
+ String text = value.toString();
+ count = map.get(text);
+ if (count != null) {
+ value = new AutoCompletionItem(tr("{0} ({1})", text, count), value.getPriority());
+ }
+ }
+
+ JLabel l = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+ l.setIcon(iconEmpty);
+ if (value.getPriority().isInDataSet()) {
+ l.setIcon(iconDataSet);
+ }
+ if (value.getPriority().isInStandard()) {
+ l.setIcon(iconStandard);
+ }
+ l.setComponentOrientation(component.getComponentOrientation());
+ if (count != null) {
+ l.setFont(l.getFont().deriveFont(Font.ITALIC + Font.BOLD));
+ }
+ return l;
+ }
+}
Index: src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
===================================================================
--- src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (revision 18366)
+++ src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (working copy)
@@ -41,6 +41,7 @@
import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.ParseException;
import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.TokenMgrError;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetHandler;
import org.openstreetmap.josm.io.CachedFile;
import org.openstreetmap.josm.io.FileWatcher;
import org.openstreetmap.josm.io.UTFInputStreamReader;
@@ -150,6 +151,20 @@
}
/**
+ * Obtains all {@link TestError}s for all primitives in the data handler.
+ * @param handler the handler that holds the primitives to check
+ * @param includeOtherSeverity if {@code true}, errors of severity {@link Severity#OTHER} (info) will also be returned
+ * @return all errors, with or without those of "info" severity
+ */
+ public synchronized Collection checkTaggingPresetHandler(TaggingPresetHandler handler, boolean includeOtherSeverity) {
+ Collection errors = new ArrayList<>();
+ for (OsmPrimitive primitive : handler.getPrimitives()) {
+ errors.addAll(getErrorsForPrimitive(primitive, includeOtherSeverity));
+ }
+ return errors;
+ }
+
+ /**
* Obtains all {@link TestError}s for the {@link OsmPrimitive} {@code p}.
* @param p The OSM primitive
* @param includeOtherSeverity if {@code true}, errors of severity {@link Severity#OTHER} (info) will also be returned
Index: src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
===================================================================
--- src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java (revision 18366)
+++ src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java (working copy)
@@ -21,6 +21,7 @@
import org.openstreetmap.josm.data.preferences.sources.ValidatorPrefHelper;
import org.openstreetmap.josm.data.validation.Severity;
import org.openstreetmap.josm.data.validation.Test.TagTest;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetHandler;
import org.openstreetmap.josm.data.validation.TestError;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.Utils;
@@ -148,6 +149,25 @@
}
}
+ /**
+ * Checks the tags of the given primitive and adds validation errors to the given list.
+ * @param handler the handler that holds the data to check
+ * @param errors The list to add validation errors to
+ * @since 17643
+ */
+ public void checkTaggingPresetHandler(TaggingPresetHandler handler, Collection errors) {
+ for (OsmPrimitive primitive : handler.getPrimitives()) {
+ for (String key : KEYS_TO_CHECK) {
+ errors.addAll(checkOpeningHourSyntax(key, primitive.get(key), primitive, Locale.getDefault()));
+ }
+ // COVID-19, a few additional values are permitted, see #19048, see https://wiki.openstreetmap.org/wiki/Key:opening_hours:covid19
+ final String keyCovid19 = "opening_hours:covid19";
+ if (primitive.hasTag(keyCovid19) && !primitive.hasTag(keyCovid19, "same", "restricted", "open", "off")) {
+ errors.addAll(checkOpeningHourSyntax(keyCovid19, primitive.get(keyCovid19), primitive, Locale.getDefault()));
+ }
+ }
+ }
+
@Override
public void addGui(JPanel testPanel) {
super.addGui(testPanel);
Index: src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
===================================================================
--- src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java (revision 18366)
+++ src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java (working copy)
@@ -30,15 +30,14 @@
import org.openstreetmap.josm.data.validation.Test;
import org.openstreetmap.josm.data.validation.TestError;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.gui.tagging.presets.Item;
+import org.openstreetmap.josm.gui.tagging.presets.KeyedItem;
+import org.openstreetmap.josm.gui.tagging.presets.Role;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItem;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetListener;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetType;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetUtils;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
-import org.openstreetmap.josm.gui.tagging.presets.items.KeyedItem;
-import org.openstreetmap.josm.gui.tagging.presets.items.Roles;
-import org.openstreetmap.josm.gui.tagging.presets.items.Roles.Role;
-import org.openstreetmap.josm.tools.SubclassFilteredCollection;
import org.openstreetmap.josm.tools.Utils;
/**
@@ -106,7 +105,7 @@
return;
}
for (TaggingPreset p : TaggingPresets.getTaggingPresets()) {
- if (p.data.stream().anyMatch(i -> i instanceof Roles)) {
+ if (p.getAllItems().stream().anyMatch(i -> i instanceof Role)) {
relationpresets.add(p);
}
}
@@ -175,16 +174,21 @@
return map;
}
- // return Roles grouped by key
- private static Map buildAllRoles(Relation n) {
+ /**
+ * Returns all roles with preset name
+ *
+ * @param rel the relation
+ * @return all roles in all matching presets
+ */
+ private static Map buildAllRoles(Relation rel) {
Map allroles = new LinkedHashMap<>();
for (TaggingPreset p : relationpresets) {
- final boolean matches = TaggingPresetItem.matches(Utils.filteredCollection(p.data, KeyedItem.class), n.getKeys());
- final SubclassFilteredCollection roles = Utils.filteredCollection(p.data, Roles.class);
- if (matches && !roles.isEmpty()) {
- for (Role role: roles.iterator().next().roles) {
- allroles.put(role, p.name);
+ List- items = p.getAllItems();
+ final boolean matches = TaggingPresetUtils.matches(Utils.filteredCollection(items, KeyedItem.class), rel.getKeys());
+ if (matches) {
+ for (Role role: p.getAllRoles()) {
+ allroles.put(role, p.getBaseName());
}
}
}
@@ -191,28 +195,6 @@
return allroles;
}
- private static boolean checkMemberType(Role r, RelationMember member) {
- if (r.types != null) {
- switch (member.getDisplayType()) {
- case NODE:
- return r.types.contains(TaggingPresetType.NODE);
- case CLOSEDWAY:
- return r.types.contains(TaggingPresetType.CLOSEDWAY);
- case WAY:
- return r.types.contains(TaggingPresetType.WAY);
- case MULTIPOLYGON:
- return r.types.contains(TaggingPresetType.MULTIPOLYGON);
- case RELATION:
- return r.types.contains(TaggingPresetType.RELATION);
- default: // not matching type
- return false;
- }
- } else {
- // if no types specified, then test is passed
- return true;
- }
- }
-
/**
* get all role definition for specified key and check, if some definition matches
*
@@ -226,7 +208,7 @@
String role = member.getRole();
String name = null;
// Set of all accepted types in preset
- Collection types = EnumSet.noneOf(TaggingPresetType.class);
+ EnumSet types = EnumSet.noneOf(TaggingPresetType.class);
TestError possibleMatchError = null;
// iterate through all of the role definition within preset
// and look for any matching definition
@@ -236,10 +218,10 @@
continue;
}
name = e.getValue();
- types.addAll(r.types);
- if (checkMemberType(r, member)) {
+ types.addAll(r.getTypes());
+ if (r.appliesTo(member.getDisplayType())) {
// member type accepted by role definition
- if (r.memberExpression == null) {
+ if (r.getMemberExpression() == null) {
// no member expression - so all requirements met
return true;
} else {
@@ -251,7 +233,7 @@
return true;
} else {
// verify expression
- if (r.memberExpression.match(primitive)) {
+ if (r.getMemberExpression().match(primitive)) {
return true;
} else {
// possible match error
@@ -261,7 +243,7 @@
possibleMatchError = TestError.builder(this, Severity.WARNING, WRONG_ROLE)
.message(ROLE_VERIF_PROBLEM_MSG,
marktr("Role of relation member does not match template expression ''{0}'' in preset {1}"),
- r.memberExpression, name)
+ r.getMemberExpression(), name)
.primitives(member.getMember().isUsable() ? member.getMember() : n)
.build();
}
@@ -268,7 +250,7 @@
}
}
} else if (OsmPrimitiveType.RELATION == member.getType() && !member.getMember().isUsable()
- && r.types.contains(TaggingPresetType.MULTIPOLYGON)) {
+ && r.appliesTo(TaggingPresetType.MULTIPOLYGON)) {
// if relation is incomplete we cannot verify if it's a multipolygon - so we just skip it
return true;
}
@@ -275,7 +257,7 @@
}
if (name == null) {
- return true;
+ return true;
} else if (possibleMatchError != null) {
// if any error found, then assume that member type was correct
// and complain about not matching the memberExpression
@@ -318,11 +300,11 @@
// verify role counts based on whole role sets
for (Role r: allroles.keySet()) {
- String keyname = r.key;
+ String keyname = r.getKey();
if (keyname.isEmpty()) {
keyname = tr("");
}
- checkRoleCounts(n, r, keyname, map.get(r.key));
+ checkRoleCounts(n, r, keyname, map.get(r.getKey()));
}
if ("network".equals(n.get("type")) && !"bicycle".equals(n.get("route"))) {
return;
@@ -331,7 +313,7 @@
for (String key : map.keySet()) {
if (allroles.keySet().stream().noneMatch(role -> role.isRole(key))) {
String templates = allroles.keySet().stream()
- .map(r -> r.key)
+ .map(r -> r.getKey())
.map(r -> Utils.isEmpty(r) ? tr("") : r)
.distinct()
.collect(Collectors.joining("/"));
Index: src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
===================================================================
--- src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 18366)
+++ src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (working copy)
@@ -55,14 +55,13 @@
import org.openstreetmap.josm.data.validation.TestError;
import org.openstreetmap.josm.data.validation.util.Entities;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.gui.tagging.presets.Item;
+import org.openstreetmap.josm.gui.tagging.presets.KeyedItem;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItem;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetListener;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetType;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetUtils;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
-import org.openstreetmap.josm.gui.tagging.presets.items.Check;
-import org.openstreetmap.josm.gui.tagging.presets.items.CheckGroup;
-import org.openstreetmap.josm.gui.tagging.presets.items.KeyedItem;
import org.openstreetmap.josm.gui.widgets.EditableList;
import org.openstreetmap.josm.io.CachedFile;
import org.openstreetmap.josm.spi.preferences.Config;
@@ -90,7 +89,7 @@
private static volatile HashSet additionalPresetsValueData;
/** often used tags which are not in presets */
private static final MultiMap oftenUsedTags = new MultiMap<>();
- private static final Map> presetIndex = new LinkedHashMap<>();
+ private static final Map> presetIndex = new LinkedHashMap<>();
private static final Pattern UNWANTED_NON_PRINTING_CONTROL_CHARACTERS = Pattern.compile(
"[\\x00-\\x09\\x0B\\x0C\\x0E-\\x1F\\x7F\\u200e-\\u200f\\u202a-\\u202e]");
@@ -388,16 +387,12 @@
if (!presets.isEmpty()) {
initAdditionalPresetsValueData();
for (TaggingPreset p : presets) {
- List minData = new ArrayList<>();
- for (TaggingPresetItem i : p.data) {
+ List
- minData = new ArrayList<>();
+ for (Item i : p.getAllItems()) {
if (i instanceof KeyedItem) {
- if (!"none".equals(((KeyedItem) i).match))
+ if (!"none".equals(((KeyedItem) i).getMatchType()))
minData.add(i);
addPresetValue((KeyedItem) i);
- } else if (i instanceof CheckGroup) {
- for (Check c : ((CheckGroup) i).checks) {
- addPresetValue(c);
- }
}
}
if (!minData.isEmpty()) {
@@ -416,8 +411,8 @@
}
private static void addPresetValue(KeyedItem ky) {
- if (ky.key != null && ky.getValues() != null) {
- addToKeyDictionary(ky.key);
+ if (ky.getKey() != null && ky.getValues() != null) {
+ addToKeyDictionary(ky.getKey());
}
}
@@ -660,7 +655,7 @@
EnumSet presetTypes = EnumSet.of(presetType);
Collection matchingPresets = presetIndex.entrySet().stream()
- .filter(e -> TaggingPresetItem.matches(e.getValue(), tags))
+ .filter(e -> TaggingPresetUtils.matches(e.getValue(), tags))
.map(Entry::getKey)
.collect(Collectors.toCollection(LinkedHashSet::new));
Collection matchingPresetsOK = matchingPresets.stream().filter(
@@ -670,14 +665,14 @@
for (TaggingPreset tp : matchingPresetsKO) {
// Potential error, unless matching tags are all known by a supported preset
- Map matchingTags = tp.data.stream()
+ Map matchingTags = tp.getAllItems().stream()
.filter(i -> Boolean.TRUE.equals(i.matches(tags)))
- .filter(i -> i instanceof KeyedItem).map(i -> ((KeyedItem) i).key)
+ .filter(i -> i instanceof KeyedItem).map(i -> ((KeyedItem) i).getKey())
.collect(Collectors.toMap(k -> k, tags::get));
if (matchingPresetsOK.stream().noneMatch(
tp2 -> matchingTags.entrySet().stream().allMatch(
- e -> tp2.data.stream().anyMatch(
- i -> i instanceof KeyedItem && ((KeyedItem) i).key.equals(e.getKey()))))) {
+ e -> tp2.getAllItems().stream().anyMatch(
+ i -> i instanceof KeyedItem && ((KeyedItem) i).getKey().equals(e.getKey()))))) {
errors.add(TestError.builder(this, Severity.OTHER, INVALID_PRESETS_TYPE)
.message(tr("Object type not in preset"),
marktr("Object type {0} is not supported by tagging preset: {1}"),
Index: src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java (revision 18366)
+++ src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java (working copy)
@@ -11,9 +11,8 @@
import javax.swing.JLabel;
import javax.swing.JPanel;
-import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetDialog;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetHandler;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetLabel;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetType;
@@ -26,26 +25,17 @@
public class PresetListPanel extends JPanel {
static final class LabelMouseAdapter extends MouseAdapter {
- private final TaggingPreset t;
- private final TaggingPresetHandler presetHandler;
+ private final TaggingPreset preset;
+ private final TaggingPresetHandler handler;
- LabelMouseAdapter(TaggingPreset t, TaggingPresetHandler presetHandler) {
- this.t = t;
- this.presetHandler = presetHandler;
+ LabelMouseAdapter(TaggingPreset preset, TaggingPresetHandler handler) {
+ this.preset = preset;
+ this.handler = handler;
}
@Override
public void mouseClicked(MouseEvent e) {
- Collection selection = t.createSelection(presetHandler.getSelection());
- if (selection.isEmpty())
- return;
- int answer = t.showDialog(selection, false);
- DataSet ds = selection.iterator().next().getDataSet();
- boolean locked = ds != null && ds.isLocked();
-
- if (answer == TaggingPreset.DIALOG_ANSWER_APPLY && !locked) {
- presetHandler.updateTags(t.getChangedTags());
- }
+ TaggingPresetDialog.showAndApply(preset, handler, false);
}
}
Index: src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 18366)
+++ src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (working copy)
@@ -97,7 +97,7 @@
import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
+import org.openstreetmap.josm.gui.tagging.presets.DataSetTaggingPresetHandler;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetHandler;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetListener;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetType;
@@ -980,7 +980,7 @@
static final class TaggingPresetCommandHandler implements TaggingPresetHandler {
@Override
public void updateTags(List tags) {
- Command command = TaggingPreset.createCommand(getSelection(), tags);
+ Command command = DataSetTaggingPresetHandler.createCommand(getPrimitives(), tags);
if (command != null) {
UndoRedoHandler.getInstance().add(command);
}
@@ -987,7 +987,7 @@
}
@Override
- public Collection getSelection() {
+ public Collection getPrimitives() {
return OsmDataManager.getInstance().getInProgressSelection();
}
}
Index: src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 18366)
+++ src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (working copy)
@@ -10,12 +10,11 @@
import java.awt.FlowLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
+import java.awt.Insets;
import java.awt.Window;
import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.FlavorListener;
import java.awt.event.ActionEvent;
-import java.awt.event.FocusAdapter;
-import java.awt.event.FocusEvent;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
@@ -27,7 +26,9 @@
import java.util.Collection;
import java.util.Collections;
import java.util.EnumSet;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
@@ -35,6 +36,7 @@
import javax.swing.BorderFactory;
import javax.swing.InputMap;
import javax.swing.JButton;
+import javax.swing.JCheckBox;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JMenuItem;
@@ -45,6 +47,7 @@
import javax.swing.JSplitPane;
import javax.swing.JTabbedPane;
import javax.swing.JTable;
+import javax.swing.JTextField;
import javax.swing.JToolBar;
import javax.swing.KeyStroke;
@@ -53,11 +56,15 @@
import org.openstreetmap.josm.command.Command;
import org.openstreetmap.josm.data.UndoRedoHandler;
import org.openstreetmap.josm.data.UndoRedoHandler.CommandQueueListener;
+import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.data.tagging.ac.AutoCompItemCellRenderer;
+import org.openstreetmap.josm.data.tagging.ac.AutoCompletionItem;
+import org.openstreetmap.josm.data.tagging.ac.AutoCompletionPriority;
import org.openstreetmap.josm.data.validation.tests.RelationChecker;
import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
import org.openstreetmap.josm.gui.MainApplication;
@@ -98,9 +105,11 @@
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.tagging.TagEditorModel;
import org.openstreetmap.josm.gui.tagging.TagEditorPanel;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
+import org.openstreetmap.josm.gui.tagging.TagTable;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBox;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBoxModel;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
+import org.openstreetmap.josm.gui.tagging.ac.DefaultAutoCompListener;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetHandler;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetType;
@@ -108,6 +117,7 @@
import org.openstreetmap.josm.gui.util.WindowGeometry;
import org.openstreetmap.josm.spi.preferences.Config;
import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.InputMapUtils;
import org.openstreetmap.josm.tools.Logging;
import org.openstreetmap.josm.tools.Shortcut;
@@ -118,6 +128,9 @@
* @since 343
*/
public class GenericRelationEditor extends RelationEditor implements CommandQueueListener {
+ private static final String PREF_LASTROLE = "relation.editor.generic.lastrole";
+ private static final String PREF_USE_ROLE_FILTER = "relation.editor.use_role_filter";
+
/** the tag table and its model */
private final TagEditorPanel tagEditorPanel;
private final ReferringRelationsBrowser referrerBrowser;
@@ -131,7 +144,8 @@
private final SelectionTable selectionTable;
private final SelectionTableModel selectionTableModel;
- private final AutoCompletingTextField tfRole;
+ private final AutoCompletionManager manager;
+ private final AutoCompComboBox cbRole;
/**
* the menu item in the windows menu. Required to properly hide on dialog close.
@@ -172,6 +186,7 @@
private Component selectedTabPane;
private JTabbedPane tabbedPane;
+ private JCheckBox btnFilter = new JCheckBox(tr("Filter"));
/**
* Creates a new relation editor for the given relation. The relation will be saved if the user
@@ -189,8 +204,21 @@
setRememberWindowGeometry(getClass().getName() + ".geometry",
WindowGeometry.centerInWindow(MainApplication.getMainFrame(), new Dimension(700, 650)));
+ /**
+ * The data handler we pass to any preset dialog opened from here.
+ *
+ * This handler creates a new relation and a new dataset because the validator assumes that
+ * the primitive to validate has a dataset. On read it copies the current state of the tag
+ * editor to the relation. On write the data goes to the tag table.
+ */
final TaggingPresetHandler presetHandler = new TaggingPresetHandler() {
+ Relation relation = new Relation();
+ DataSet ds = new DataSet();
+ /* anon constructor */ {
+ ds.addPrimitive(relation);
+ }
+
@Override
public void updateTags(List tags) {
tagEditorPanel.getModel().updateTags(tags);
@@ -197,8 +225,9 @@
}
@Override
- public Collection getSelection() {
- Relation relation = new Relation();
+ public Collection getPrimitives() {
+ relation.setKeys(null);
+ // copy the current state of the tag table
tagEditorPanel.getModel().applyToPrimitive(relation);
return Collections.singletonList(relation);
}
@@ -212,25 +241,69 @@
selectionTableModel.register();
referrerModel = new ReferringRelationsBrowserModel(relation);
+ manager = AutoCompletionManager.of(this.getLayer().data);
+
tagEditorPanel = new TagEditorPanel(relation, presetHandler);
+ TagTable tagTable = tagEditorPanel.getTable();
populateModels(relation);
tagEditorPanel.getModel().ensureOneTag();
+ // setting up the tag table
+ AutoCompComboBox keyEditor = new AutoCompComboBox<>();
+ AutoCompComboBox valueEditor = new AutoCompComboBox<>();
+ KeyAutoCompManager keyAutoCompManager = new KeyAutoCompManager();
+ ValueAutoCompManager valueAutoCompManager = new ValueAutoCompManager();
+ keyEditor.getEditorComponent().setMaxTextLength(256);
+ keyEditor.getEditorComponent().setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 1));
+ keyEditor.getEditorComponent().enableUndoRedo(false);
+ keyEditor.getEditorComponent().addAutoCompListener(keyAutoCompManager);
+ keyEditor.addPopupMenuListener(keyAutoCompManager);
+ keyEditor.putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE);
+ keyEditor.setRenderer(new AutoCompItemCellRenderer(keyEditor, keyEditor.getRenderer(), null));
+
+ valueEditor.getEditorComponent().setMaxTextLength(-1);
+ valueEditor.getEditorComponent().setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 1));
+ valueEditor.getEditorComponent().enableUndoRedo(false);
+ valueEditor.getEditorComponent().addAutoCompListener(valueAutoCompManager);
+ valueEditor.addPopupMenuListener(valueAutoCompManager);
+ valueEditor.putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE);
+ valueEditor.setRenderer(new AutoCompItemCellRenderer(valueEditor, valueEditor.getRenderer(), null));
+
+ tagTable.setRowHeight(keyEditor.getEditorComponent().getPreferredSize().height);
+ tagTable.setKeyEditor(keyEditor);
+ tagTable.setValueEditor(valueEditor);
+
// setting up the member table
- memberTable = new MemberTable(getLayer(), getRelation(), memberTableModel);
+ AutoCompComboBox cbRoleEditor = new AutoCompComboBox<>();
+ RoleAutoCompManager roleAutoCompManager = new RoleAutoCompManager();
+ cbRoleEditor.getEditorComponent().addAutoCompListener(roleAutoCompManager);
+ cbRoleEditor.addPopupMenuListener(roleAutoCompManager);
+ cbRoleEditor.getEditorComponent().enableUndoRedo(false);
+ Insets insets = cbRoleEditor.getEditorComponent().getInsets();
+ cbRoleEditor.getEditorComponent().setBorder(BorderFactory.createEmptyBorder(0, insets.left, 0, insets.right));
+ cbRoleEditor.setToolTipText(tr("Select a role for this relation member"));
+ cbRoleEditor.setRenderer(new AutoCompItemCellRenderer(cbRoleEditor, cbRoleEditor.getRenderer(), null));
+
+ int height = cbRoleEditor.getEditorComponent().getPreferredSize().height;
+ memberTable = new MemberTable(getLayer(), cbRoleEditor, memberTableModel);
memberTable.addMouseListener(new MemberTableDblClickAdapter());
+ memberTable.setRowHeight(height);
memberTableModel.addMemberModelListener(memberTable);
- MemberRoleCellEditor ce = (MemberRoleCellEditor) memberTable.getColumnModel().getColumn(0).getCellEditor();
selectionTable = new SelectionTable(selectionTableModel, memberTableModel);
- selectionTable.setRowHeight(ce.getEditor().getPreferredSize().height);
+ selectionTable.setRowHeight(height);
LeftButtonToolbar leftButtonToolbar = new LeftButtonToolbar(new RelationEditorActionAccess());
- tfRole = buildRoleTextField(this);
+ cbRole = new AutoCompComboBox<>();
+ cbRole.getEditorComponent().addAutoCompListener(roleAutoCompManager);
+ cbRole.addPopupMenuListener(roleAutoCompManager);
+ cbRole.setText(Config.getPref().get(PREF_LASTROLE, ""));
+ cbRole.setToolTipText(tr("Select a role"));
+ cbRole.setRenderer(new AutoCompItemCellRenderer(cbRole, cbRole.getRenderer(), null));
JSplitPane pane = buildSplitPane(
buildTagEditorPanel(tagEditorPanel),
- buildMemberEditorPanel(leftButtonToolbar, new RelationEditorActionAccess()),
+ buildMemberEditorPanel(leftButtonToolbar),
this);
pane.setPreferredSize(new Dimension(100, 100));
@@ -310,7 +383,7 @@
@Override
public void actionPerformed(ActionEvent e) {
super.actionPerformed(e);
- tfRole.requestFocusInWindow();
+ cbRole.requestFocusInWindow();
}
}, "PASTE_MEMBERS", key, getRootPane(), memberTable, selectionTable);
}
@@ -446,47 +519,14 @@
}
/**
- * builds the role text field
- * @param re relation editor
- * @return the role text field
- */
- protected static AutoCompletingTextField buildRoleTextField(final IRelationEditor re) {
- final AutoCompletingTextField tfRole = new AutoCompletingTextField(10);
- tfRole.setToolTipText(tr("Enter a role and apply it to the selected relation members"));
- tfRole.addFocusListener(new FocusAdapter() {
- @Override
- public void focusGained(FocusEvent e) {
- tfRole.selectAll();
- }
- });
- tfRole.setAutoCompletionList(new AutoCompletionList());
- tfRole.addFocusListener(
- new FocusAdapter() {
- @Override
- public void focusGained(FocusEvent e) {
- AutoCompletionList list = tfRole.getAutoCompletionList();
- if (list != null) {
- list.clear();
- AutoCompletionManager.of(re.getLayer().data).populateWithMemberRoles(list, re.getRelation());
- }
- }
- }
- );
- tfRole.setText(Config.getPref().get("relation.editor.generic.lastrole", ""));
- return tfRole;
- }
-
- /**
* builds the panel for the relation member editor
* @param leftButtonToolbar left button toolbar
- * @param editorAccess The relation editor
*
* @return the panel for the relation member editor
*/
- protected static JPanel buildMemberEditorPanel(
- LeftButtonToolbar leftButtonToolbar, IRelationEditorActionAccess editorAccess) {
+ protected JPanel buildMemberEditorPanel(LeftButtonToolbar leftButtonToolbar) {
final JPanel pnl = new JPanel(new GridBagLayout());
- final JScrollPane scrollPane = new JScrollPane(editorAccess.getMemberTable());
+ final JScrollPane scrollPane = new JScrollPane(memberTable);
GridBagConstraints gc = new GridBagConstraints();
gc.gridx = 0;
@@ -518,22 +558,34 @@
pnl.add(scrollPane, gc);
// --- role editing
- JPanel p3 = new JPanel(new FlowLayout(FlowLayout.LEFT));
- p3.add(new JLabel(tr("Apply Role:")));
- p3.add(editorAccess.getTextFieldRole());
- SetRoleAction setRoleAction = new SetRoleAction(editorAccess);
- editorAccess.getMemberTableModel().getSelectionModel().addListSelectionListener(setRoleAction);
- editorAccess.getTextFieldRole().getDocument().addDocumentListener(setRoleAction);
- editorAccess.getTextFieldRole().addActionListener(setRoleAction);
- editorAccess.getMemberTableModel().getSelectionModel().addListSelectionListener(
- e -> editorAccess.getTextFieldRole().setEnabled(editorAccess.getMemberTable().getSelectedRowCount() > 0)
+ JPanel p3 = new JPanel(new GridBagLayout());
+ GBC gbc = GBC.std().fill(GridBagConstraints.NONE);
+ JLabel lbl = new JLabel(tr("Role:"));
+ p3.add(lbl, gbc);
+
+ p3.add(cbRole, gbc.insets(3, 3, 0, 3).fill(GridBagConstraints.HORIZONTAL));
+
+ SetRoleAction setRoleAction = new SetRoleAction(new RelationEditorActionAccess());
+ memberTableModel.getSelectionModel().addListSelectionListener(setRoleAction);
+ cbRole.getEditorComponent().getDocument().addDocumentListener(setRoleAction);
+ cbRole.getEditorComponent().addActionListener(setRoleAction);
+ memberTableModel.getSelectionModel().addListSelectionListener(
+ e -> cbRole.setEnabled(memberTable.getSelectedRowCount() > 0)
);
- editorAccess.getTextFieldRole().setEnabled(editorAccess.getMemberTable().getSelectedRowCount() > 0);
+ cbRole.setEnabled(memberTable.getSelectedRowCount() > 0);
+
JButton btnApply = new JButton(setRoleAction);
- btnApply.setPreferredSize(new Dimension(20, 20));
+ int height = cbRole.getPreferredSize().height;
+ btnApply.setPreferredSize(new Dimension(height, height));
btnApply.setText("");
- p3.add(btnApply);
+ p3.add(btnApply, gbc.weight(0, 0).fill(GridBagConstraints.NONE));
+ btnFilter.setToolTipText(tr("Filter suggestions based on context"));
+ btnFilter.setSelected(Config.getPref().getBoolean(PREF_USE_ROLE_FILTER, false));
+ p3.add(btnFilter, gbc.span(GridBagConstraints.REMAINDER));
+
+ //
+
gc.gridx = 1;
gc.gridy = 2;
gc.fill = GridBagConstraints.HORIZONTAL;
@@ -562,7 +614,7 @@
gc.anchor = GridBagConstraints.NORTHWEST;
gc.weightx = 0.0;
gc.weighty = 1.0;
- pnl2.add(new ScrollViewport(buildSelectionControlButtonToolbar(editorAccess),
+ pnl2.add(new ScrollViewport(buildSelectionControlButtonToolbar(new RelationEditorActionAccess()),
ScrollViewport.VERTICAL_DIRECTION), gc);
gc.gridx = 1;
@@ -570,21 +622,19 @@
gc.weightx = 1.0;
gc.weighty = 1.0;
gc.fill = GridBagConstraints.BOTH;
- pnl2.add(buildSelectionTablePanel(editorAccess.getSelectionTable()), gc);
+ pnl2.add(buildSelectionTablePanel(selectionTable), gc);
final JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
splitPane.setLeftComponent(pnl);
splitPane.setRightComponent(pnl2);
splitPane.setOneTouchExpandable(false);
- if (editorAccess.getEditor() instanceof Window) {
- ((Window) editorAccess.getEditor()).addWindowListener(new WindowAdapter() {
- @Override
- public void windowOpened(WindowEvent e) {
- // has to be called when the window is visible, otherwise no effect
- splitPane.setDividerLocation(0.6);
- }
- });
- }
+ addWindowListener(new WindowAdapter() {
+ @Override
+ public void windowOpened(WindowEvent e) {
+ // has to be called when the window is visible, otherwise no effect
+ splitPane.setDividerLocation(0.6);
+ }
+ });
JPanel pnl3 = new JPanel(new BorderLayout());
pnl3.add(splitPane, BorderLayout.CENTER);
@@ -739,9 +789,6 @@
if (isVisible() == visible) {
return;
}
- if (visible) {
- tagEditorPanel.initAutoCompletion(getLayer());
- }
super.setVisible(visible);
Clipboard clipboard = ClipboardUtils.getClipboard();
if (visible) {
@@ -754,6 +801,9 @@
clipboard.addFlavorListener(listener);
}
} else {
+ Config.getPref().put(PREF_LASTROLE, cbRole.getText());
+ Config.getPref().putBoolean(PREF_USE_ROLE_FILTER, btnFilter.isSelected());
+
// make sure all registered listeners are unregistered
//
memberTable.stopHighlighting();
@@ -1039,10 +1089,9 @@
}
@Override
- public AutoCompletingTextField getTextFieldRole() {
- return tfRole;
+ public JTextField getTextFieldRole() {
+ return cbRole.getEditorComponent();
}
-
}
@Override
@@ -1054,4 +1103,80 @@
applyAction.updateEnabledState();
}
}
+
+ private class KeyAutoCompManager extends DefaultAutoCompListener {
+ @Override
+ protected void updateAutoCompModel(AutoCompComboBoxModel model) {
+ Map map;
+ Map keys = tagEditorPanel.getModel().getTags();
+ Map matchKeys = btnFilter.isSelected() ? keys : null;
+
+ map = AutoCompletionManager.merge(
+ manager.getKeysForRelation(matchKeys),
+ manager.getPresetKeys(EnumSet.of(TaggingPresetType.RELATION), matchKeys)
+ );
+
+ model.replaceAllElements(map.entrySet().stream().filter(e -> !keys.containsKey(e.getKey()))
+ .map(e -> new AutoCompletionItem(e.getKey(), e.getValue()))
+ .sorted(AutoCompletionManager.ALPHABETIC_COMPARATOR).collect(Collectors.toList()));
+ }
+ }
+
+ private class ValueAutoCompManager extends DefaultAutoCompListener {
+ @Override
+ protected void updateAutoCompModel(AutoCompComboBoxModel model) {
+ Map map;
+ Map keys = btnFilter.isSelected() ? tagEditorPanel.getModel().getTags() : null;
+ String key = (String) tagEditorPanel.getModel().getValueAt(tagEditorPanel.getTable().getEditingRow(), 0);
+
+ map = AutoCompletionManager.merge(
+ manager.getValuesForRelation(keys, key),
+ manager.getPresetValues(EnumSet.of(TaggingPresetType.RELATION), keys, key)
+ );
+
+ model.replaceAllElements(map.entrySet().stream()
+ .map(e -> new AutoCompletionItem(e.getKey(), e.getValue()))
+ .sorted(AutoCompletionManager.ALPHABETIC_COMPARATOR).collect(Collectors.toList()));
+ }
+ }
+
+ /**
+ * Returns the roles currently edited in the members table.
+ * @param types the preset types to include, (node / way / relation ...) or null to include all types
+ * @return the roles currently edited in the members table.
+ */
+ private Map getCurrentRoles(Collection types) {
+ Map map = new HashMap<>();
+ for (int i = 0; i < memberTableModel.getRowCount(); ++i) {
+ RelationMember member = memberTableModel.getValue(i);
+ if (types == null || types.contains(TaggingPresetType.forPrimitiveType(member.getDisplayType()))) {
+ map.merge(member.getRole(), AutoCompletionPriority.IS_IN_SELECTION, AutoCompletionPriority::mergeWith);
+ }
+ }
+ return map;
+ }
+
+ private class RoleAutoCompManager extends DefaultAutoCompListener {
+ @Override
+ protected void updateAutoCompModel(AutoCompComboBoxModel model) {
+ Map map;
+ Map keys = btnFilter.isSelected() ? tagEditorPanel.getModel().getTags() : null;
+
+ EnumSet selectedTypes = EnumSet.noneOf(TaggingPresetType.class);
+ for (RelationMember member : memberTableModel.getSelectedMembers()) {
+ selectedTypes.add(TaggingPresetType.forPrimitiveType(member.getDisplayType()));
+ }
+
+ map = AutoCompletionManager.merge(
+ manager.getRolesForRelation(keys, selectedTypes),
+ manager.getPresetRoles(keys, selectedTypes),
+ getCurrentRoles(selectedTypes)
+ );
+
+ // turn into AutoCompletionItems
+ model.replaceAllElements(map.entrySet().stream()
+ .map(e -> new AutoCompletionItem(e.getKey(), e.getValue()))
+ .sorted(AutoCompletionManager.ALPHABETIC_COMPARATOR).collect(Collectors.toList()));
+ }
+ }
}
Index: src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java (revision 18366)
+++ src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java (nonexistent)
@@ -1,66 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.dialogs.relation;
-
-import java.awt.Component;
-
-import javax.swing.AbstractCellEditor;
-import javax.swing.BorderFactory;
-import javax.swing.CellEditor;
-import javax.swing.JTable;
-import javax.swing.table.TableCellEditor;
-
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
-
-/**
- * The {@link CellEditor} for the role cell in the table. Supports autocompletion.
- */
-public class MemberRoleCellEditor extends AbstractCellEditor implements TableCellEditor {
- private final AutoCompletingTextField editor;
- private final AutoCompletionManager autoCompletionManager;
- private final transient Relation relation;
-
- /** user input is matched against this list of auto completion items */
- private final AutoCompletionList autoCompletionList;
-
- /**
- * Constructs a new {@code MemberRoleCellEditor}.
- * @param autoCompletionManager the auto completion manager. Must not be null
- * @param relation the relation. Can be null
- * @since 13675
- */
- public MemberRoleCellEditor(AutoCompletionManager autoCompletionManager, Relation relation) {
- this.autoCompletionManager = autoCompletionManager;
- this.relation = relation;
- editor = new AutoCompletingTextField(0, false);
- editor.setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 1));
- autoCompletionList = new AutoCompletionList();
- editor.setAutoCompletionList(autoCompletionList);
- }
-
- @Override
- public Component getTableCellEditorComponent(JTable table,
- Object value, boolean isSelected, int row, int column) {
-
- String role = (String) value;
- editor.setText(role);
- autoCompletionList.clear();
- autoCompletionManager.populateWithMemberRoles(autoCompletionList, relation);
- return editor;
- }
-
- @Override
- public Object getCellEditorValue() {
- return editor.getText();
- }
-
- /**
- * Returns the edit field for this cell editor.
- * @return the edit field for this cell editor
- */
- public AutoCompletingTextField getEditor() {
- return editor;
- }
-}
Property changes on: src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Index: src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (revision 18366)
+++ src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (working copy)
@@ -20,6 +20,7 @@
import javax.swing.SwingUtilities;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
+import javax.swing.table.TableCellEditor;
import org.openstreetmap.josm.actions.AbstractShowHistoryAction;
import org.openstreetmap.josm.actions.AutoScaleAction;
@@ -27,7 +28,6 @@
import org.openstreetmap.josm.actions.HistoryInfoAction;
import org.openstreetmap.josm.actions.ZoomToAction;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.gui.MainApplication;
@@ -41,7 +41,6 @@
import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
import org.openstreetmap.josm.gui.util.HighlightHelper;
import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTable;
import org.openstreetmap.josm.spi.preferences.Config;
@@ -60,16 +59,15 @@
* constructor for relation member table
*
* @param layer the data layer of the relation. Must not be null
- * @param relation the relation. Can be null
+ * @param roleCellEditor the role editor combobox
* @param model the table model
*/
- public MemberTable(OsmDataLayer layer, Relation relation, MemberTableModel model) {
- super(model, new MemberTableColumnModel(AutoCompletionManager.of(layer.data), relation), model.getSelectionModel());
+ public MemberTable(OsmDataLayer layer, TableCellEditor roleCellEditor, MemberTableModel model) {
+ super(model, new MemberTableColumnModel(roleCellEditor), model.getSelectionModel());
setLayer(layer);
model.addMemberModelListener(this);
- MemberRoleCellEditor ce = (MemberRoleCellEditor) getColumnModel().getColumn(0).getCellEditor();
- setRowHeight(ce.getEditor().getPreferredSize().height);
+ setRowHeight(roleCellEditor.getTableCellEditorComponent(this, "", false, 0, 0).getPreferredSize().height);
setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS);
setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
@@ -83,9 +81,7 @@
if (!GraphicsEnvironment.isHeadless()) {
setTransferHandler(new MemberTransferHandler());
setFillsViewportHeight(true); // allow drop on empty table
- if (!GraphicsEnvironment.isHeadless()) {
- setDragEnabled(true);
- }
+ setDragEnabled(true);
setDropMode(DropMode.INSERT_ROWS);
}
}
Index: src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java (revision 18366)
+++ src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java (working copy)
@@ -4,11 +4,9 @@
import static org.openstreetmap.josm.tools.I18n.tr;
import javax.swing.table.DefaultTableColumnModel;
+import javax.swing.table.TableCellEditor;
import javax.swing.table.TableColumn;
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
-
/**
* This is the column model for the {@link MemberTable}
*/
@@ -16,11 +14,10 @@
/**
* Constructs a new {@code MemberTableColumnModel}.
- * @param autoCompletionManager the auto completion manager. Must not be null
- * @param relation the relation. Can be null
+ * @param roleCellEditor the role editor combobox
* @since 13675
*/
- public MemberTableColumnModel(AutoCompletionManager autoCompletionManager, Relation relation) {
+ public MemberTableColumnModel(TableCellEditor roleCellEditor) {
TableColumn col;
// column 0 - the member role
@@ -29,7 +26,7 @@
col.setResizable(true);
col.setPreferredWidth(100);
col.setCellRenderer(new MemberTableRoleCellRenderer());
- col.setCellEditor(new MemberRoleCellEditor(autoCompletionManager, relation));
+ col.setCellEditor(roleCellEditor);
addColumn(col);
// column 1 - the member
Index: src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (revision 18366)
+++ src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (working copy)
@@ -433,7 +433,7 @@
RelationMember getRelationMemberForPrimitive(final OsmPrimitive primitive) {
final Collection presets = TaggingPresets.getMatchingPresets(
EnumSet.of(relation != null ? TaggingPresetType.forPrimitive(relation) : TaggingPresetType.RELATION),
- presetHandler.getSelection().iterator().next().getKeys(), false);
+ presetHandler.getPrimitives().iterator().next().getKeys(), false);
Collection potentialRoles = presets.stream()
.map(tp -> tp.suggestRoleForOsmPrimitive(primitive))
.filter(Objects::nonNull)
Index: src/org/openstreetmap/josm/gui/dialogs/relation/actions/IRelationEditorActionAccess.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/relation/actions/IRelationEditorActionAccess.java (revision 18366)
+++ src/org/openstreetmap/josm/gui/dialogs/relation/actions/IRelationEditorActionAccess.java (working copy)
@@ -2,6 +2,7 @@
package org.openstreetmap.josm.gui.dialogs.relation.actions;
import javax.swing.Action;
+import javax.swing.JTextField;
import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor;
import org.openstreetmap.josm.gui.dialogs.relation.MemberTable;
@@ -9,7 +10,6 @@
import org.openstreetmap.josm.gui.dialogs.relation.SelectionTable;
import org.openstreetmap.josm.gui.dialogs.relation.SelectionTableModel;
import org.openstreetmap.josm.gui.tagging.TagEditorModel;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
/**
* This interface provides access to the relation editor for actions.
@@ -69,7 +69,7 @@
* Get the text field that is used to edit the role.
* @return The role text field.
*/
- AutoCompletingTextField getTextFieldRole();
+ JTextField getTextFieldRole();
/**
* Tells the member table editor to stop editing and accept any partially edited value as the value of the editor.
Index: src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java (revision 18366)
+++ src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java (working copy)
@@ -8,6 +8,7 @@
import java.util.List;
import javax.swing.JOptionPane;
+import javax.swing.JTextField;
import javax.swing.SwingUtilities;
import org.openstreetmap.josm.command.AddCommand;
@@ -27,7 +28,6 @@
import org.openstreetmap.josm.gui.dialogs.relation.RelationDialogManager;
import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
import org.openstreetmap.josm.gui.tagging.TagEditorModel;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Utils;
@@ -38,7 +38,7 @@
abstract class SavingAction extends AbstractRelationEditorAction {
private static final long serialVersionUID = 1L;
- protected final AutoCompletingTextField tfRole;
+ protected final JTextField tfRole;
protected SavingAction(IRelationEditorActionAccess editorAccess, IRelationEditorUpdateOn... updateOn) {
super(editorAccess, updateOn);
Index: src/org/openstreetmap/josm/gui/dialogs/relation/actions/SetRoleAction.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/relation/actions/SetRoleAction.java (revision 18366)
+++ src/org/openstreetmap/josm/gui/dialogs/relation/actions/SetRoleAction.java (working copy)
@@ -7,12 +7,12 @@
import java.awt.event.ActionEvent;
import javax.swing.JOptionPane;
+import javax.swing.JTextField;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Utils;
@@ -23,7 +23,7 @@
public class SetRoleAction extends AbstractRelationEditorAction implements DocumentListener {
private static final long serialVersionUID = 1L;
- private final transient AutoCompletingTextField tfRole;
+ private final transient JTextField tfRole;
/**
* Constructs a new {@code SetRoleAction}.
@@ -32,7 +32,7 @@
public SetRoleAction(IRelationEditorActionAccess editorAccess) {
super(editorAccess);
this.tfRole = editorAccess.getTextFieldRole();
- putValue(SHORT_DESCRIPTION, tr("Sets a role for the selected members"));
+ putValue(SHORT_DESCRIPTION, tr("Apply the role to the selected members"));
new ImageProvider("apply").getResource().attachImageIcon(this);
putValue(NAME, tr("Apply Role"));
updateEnabledState();
Index: src/org/openstreetmap/josm/gui/io/UploadDialog.java
===================================================================
--- src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 18366)
+++ src/org/openstreetmap/josm/gui/io/UploadDialog.java (working copy)
@@ -18,7 +18,7 @@
import java.beans.PropertyChangeListener;
import java.lang.Character.UnicodeBlock;
import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
@@ -43,6 +43,10 @@
import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
import org.openstreetmap.josm.gui.help.HelpUtil;
import org.openstreetmap.josm.gui.tagging.TagEditorPanel;
+import org.openstreetmap.josm.gui.tagging.TagTable;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBox;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBoxModel;
+import org.openstreetmap.josm.gui.tagging.ac.DefaultAutoCompListener;
import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.gui.util.MultiLineFlowLayout;
import org.openstreetmap.josm.gui.util.WindowGeometry;
@@ -88,8 +92,6 @@
/** the model keeping the state of the changeset tags */
private final transient UploadDialogModel model = new UploadDialogModel();
- private transient DataSet dataSet;
-
/**
* Constructs a new {@code UploadDialog}.
*/
@@ -141,6 +143,30 @@
pnlTagEditor = new TagEditorPanel(model, null, Changeset.MAX_CHANGESET_TAG_LENGTH);
pnlTagEditorBorder.add(pnlTagEditor, BorderLayout.CENTER);
+ // setting up the tag table
+ TagTable tagTable = pnlTagEditor.getTable();
+ AutoCompComboBox keyEditor = new AutoCompComboBox<>();
+ AutoCompComboBox valueEditor = new AutoCompComboBox<>();
+ KeyAutoCompManager keyAutoCompManager = new KeyAutoCompManager();
+ ValueAutoCompManager valueAutoCompManager = new ValueAutoCompManager();
+ keyEditor.getEditorComponent().setMaxTextLength(Changeset.MAX_CHANGESET_TAG_LENGTH);
+ keyEditor.getEditorComponent().setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 1));
+ keyEditor.getEditorComponent().enableUndoRedo(false);
+ keyEditor.getEditorComponent().addAutoCompListener(keyAutoCompManager);
+ keyEditor.addPopupMenuListener(keyAutoCompManager);
+ keyEditor.putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE);
+
+ valueEditor.getEditorComponent().setMaxTextLength(Changeset.MAX_CHANGESET_TAG_LENGTH);
+ valueEditor.getEditorComponent().setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 1));
+ valueEditor.getEditorComponent().enableUndoRedo(false);
+ valueEditor.getEditorComponent().addAutoCompListener(valueAutoCompManager);
+ valueEditor.addPopupMenuListener(valueAutoCompManager);
+ valueEditor.putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE);
+
+ tagTable.setRowHeight(keyEditor.getEditorComponent().getPreferredSize().height);
+ tagTable.setKeyEditor(keyEditor);
+ tagTable.setValueEditor(valueEditor);
+
pnlChangesetManagement = new ChangesetManagementPanel();
pnlUploadStrategySelectionPanel = new UploadStrategySelectionPanel();
pnlSettings.add(pnlChangesetManagement, GBC.eop().fill(GridBagConstraints.HORIZONTAL));
@@ -228,19 +254,18 @@
* this in the constructor because the dialog is a singleton.
*
* @param dataSet The Dataset we want to upload
+ * @param toUpload The primitves to upload
* @since 18173
*/
- public void initLifeCycle(DataSet dataSet) {
+ public void initLifeCycle(DataSet dataSet, APIDataSet toUpload) {
Map map = new HashMap<>();
- this.dataSet = dataSet;
pnlBasicUploadSettings.initLifeCycle(map);
pnlChangesetManagement.initLifeCycle();
model.clear();
- model.putAll(map); // init with tags from history
- model.putAll(this.dataSet); // overwrite with tags from the dataset
+ model.putAll(map); // init with tags from history
+ model.putAll(dataSet); // overwrite with tags from the dataset
tpConfigPanels.setSelectedIndex(0);
- pnlTagEditor.initAutoCompletion(MainApplication.getLayerManager().getEditLayer());
pnlUploadStrategySelectionPanel.initFromPreferences();
// update the summary
@@ -247,32 +272,11 @@
UploadParameterSummaryPanel sumPnl = pnlBasicUploadSettings.getUploadParameterSummaryPanel();
sumPnl.setUploadStrategySpecification(pnlUploadStrategySelectionPanel.getUploadStrategySpecification());
sumPnl.setCloseChangesetAfterNextUpload(pnlChangesetManagement.isCloseChangesetAfterUpload());
- }
- /**
- * Sets the collection of primitives to upload
- *
- * @param toUpload the dataset with the objects to upload. If null, assumes the empty
- * set of objects to upload
- *
- */
- public void setUploadedPrimitives(APIDataSet toUpload) {
- UploadParameterSummaryPanel sumPnl = pnlBasicUploadSettings.getUploadParameterSummaryPanel();
- if (toUpload == null) {
- if (pnlUploadedObjects != null) {
- List emptyList = Collections.emptyList();
- pnlUploadedObjects.setUploadedPrimitives(emptyList, emptyList, emptyList);
- sumPnl.setNumObjects(0);
- }
- return;
- }
List l = toUpload.getPrimitives();
pnlBasicUploadSettings.setUploadedPrimitives(l);
- pnlUploadedObjects.setUploadedPrimitives(
- toUpload.getPrimitivesToAdd(),
- toUpload.getPrimitivesToUpdate(),
- toUpload.getPrimitivesToDelete()
- );
+ pnlUploadedObjects.removeAll();
+ pnlUploadedObjects.build(toUpload);
sumPnl.setNumObjects(l.size());
pnlUploadStrategySelectionPanel.setNumUploadedObjects(l.size());
}
@@ -512,6 +516,34 @@
}
}
+ private static class KeyAutoCompManager extends DefaultAutoCompListener {
+ @Override
+ protected void updateAutoCompModel(AutoCompComboBoxModel model) {
+ model.replaceAllElements(Arrays.asList("comment", "source", "review_requested", "created_by", "imagery_used", "locale"));
+ // FIXME add more tags from user upload history?
+ }
+ }
+
+ private class ValueAutoCompManager extends DefaultAutoCompListener {
+ @Override
+ protected void updateAutoCompModel(AutoCompComboBoxModel model) {
+ String key = (String) pnlTagEditor.getModel().getValueAt(pnlTagEditor.getTable().getEditingRow(), 0);
+ if ("comment".equals(key)) {
+ model.prefs(x ->x, x -> x).load(BasicUploadSettingsPanel.COMMENT_HISTORY_KEY);
+ return;
+ }
+ if ("source".equals(key)) {
+ model.prefs(x -> x, x -> x).load(BasicUploadSettingsPanel.SOURCE_HISTORY_KEY, BasicUploadSettingsPanel.getDefaultSources());
+ return;
+ }
+ if ("review_requested".equals(key)) {
+ model.replaceAllElements(Arrays.asList("yes", ""));
+ return;
+ }
+ model.replaceAllElements(Arrays.asList(""));
+ }
+ }
+
/* -------------------------------------------------------------------------- */
/* Interface PropertyChangeListener */
/* -------------------------------------------------------------------------- */
@@ -604,7 +636,6 @@
* @since 14251
*/
public void clean() {
- setUploadedPrimitives(null);
- dataSet = null;
+ pnlUploadedObjects.removeAll();
}
}
Index: src/org/openstreetmap/josm/gui/io/UploadDialogModel.java
===================================================================
--- src/org/openstreetmap/josm/gui/io/UploadDialogModel.java (revision 18366)
+++ src/org/openstreetmap/josm/gui/io/UploadDialogModel.java (working copy)
@@ -75,12 +75,12 @@
* @return the hashtags separated by ";" or null
*/
String findHashTags(String comment) {
- String hashtags = String.join(";",
+ String hashTags = String.join(";",
Arrays.stream(comment.split("\\s", -1))
.map(s -> Utils.strip(s, ",;"))
.filter(s -> s.matches("#[a-zA-Z0-9][-_a-zA-Z0-9]+"))
.collect(Collectors.toList()));
- return hashtags.isEmpty() ? null : hashtags;
+ return hashTags.isEmpty() ? null : hashTags;
}
/**
Index: src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java
===================================================================
--- src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 18366)
+++ src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (working copy)
@@ -401,7 +401,7 @@
// return to the upload dialog
//
toUpload.removeProcessed(processedPrimitives);
- UploadDialog.getUploadDialog().setUploadedPrimitives(toUpload);
+ UploadDialog.getUploadDialog().initLifeCycle(null, toUpload);
UploadDialog.getUploadDialog().setVisible(true);
break;
}
Index: src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java
===================================================================
--- src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (revision 18366)
+++ src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (working copy)
@@ -69,7 +69,7 @@
protected JPanel buildUploadStrategyPanel() {
JPanel pnl = new JPanel(new GridBagLayout());
- pnl.setBorder(BorderFactory.createTitledBorder(tr("Please select the upload strategy:")));
+ pnl.setBorder(BorderFactory.createTitledBorder(tr("Please select an upload strategy:")));
ButtonGroup bgStrategies = new ButtonGroup();
rbStrategy = new EnumMap<>(UploadStrategy.class);
lblNumRequests = new EnumMap<>(UploadStrategy.class);
Index: src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java
===================================================================
--- src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java (revision 18366)
+++ src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java (working copy)
@@ -1,7 +1,6 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.io;
-import static org.openstreetmap.josm.tools.I18n.tr;
import static org.openstreetmap.josm.tools.I18n.trn;
import java.awt.GridBagConstraints;
@@ -8,12 +7,11 @@
import java.awt.GridBagLayout;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.Optional;
-import javax.swing.AbstractListModel;
+import javax.swing.BoxLayout;
+import javax.swing.DefaultListModel;
import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JPanel;
@@ -20,6 +18,7 @@
import javax.swing.JScrollPane;
import org.openstreetmap.josm.actions.AutoScaleAction;
+import org.openstreetmap.josm.data.APIDataSet;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.gui.PrimitiveRenderer;
@@ -28,180 +27,83 @@
* @since 2599
*/
public class UploadedObjectsSummaryPanel extends JPanel {
- /** the list with the added primitives */
- private PrimitiveList lstAdd;
- private JLabel lblAdd;
- private JScrollPane spAdd;
- /** the list with the updated primitives */
- private PrimitiveList lstUpdate;
- private JLabel lblUpdate;
- private JScrollPane spUpdate;
- /** the list with the deleted primitives */
- private PrimitiveList lstDelete;
- private JLabel lblDelete;
- private JScrollPane spDelete;
+ /**
+ * Zooms to the primitive on double-click
+ */
+ private static MouseAdapter mouseListener = new MouseAdapter() {
+ @Override
+ public void mouseClicked(MouseEvent evt) {
+ if (evt.getButton() == MouseEvent.BUTTON1 && evt.getClickCount() == 2) {
+ @SuppressWarnings("unchecked")
+ JList list = (JList) evt.getSource();
+ int index = list.locationToIndex(evt.getPoint());
+ AutoScaleAction.zoomTo(Collections.singleton(list.getModel().getElementAt(index)));
+ }
+ }
+ };
/**
+ * A JLabel and a JList
+ */
+ private static class ListPanel extends JPanel {
+ /**
+ * Constructor
+ *
+ * @param primitives the list of primitives
+ * @param singular the singular form of the label
+ * @param plural the plural form of the label
+ */
+ ListPanel(List primitives, String singular, String plural) {
+ DefaultListModel model = new DefaultListModel<>();
+ JList jList = new JList<>(model);
+ primitives.forEach(model::addElement);
+ jList.setCellRenderer(new PrimitiveRenderer());
+ jList.addMouseListener(mouseListener);
+ JScrollPane scrollPane = new JScrollPane(jList);
+ JLabel label = new JLabel(trn(singular, plural, model.size(), model.size()));
+ label.setLabelFor(jList);
+ this.setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
+ this.add(label);
+ this.add(scrollPane);
+ }
+ }
+
+ /**
* Constructs a new {@code UploadedObjectsSummaryPanel}.
*/
public UploadedObjectsSummaryPanel() {
- build();
+ super(new GridBagLayout());
}
- protected void build() {
- setLayout(new GridBagLayout());
- PrimitiveRenderer renderer = new PrimitiveRenderer();
- MouseAdapter mouseListener = new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent evt) {
- if (evt.getButton() == MouseEvent.BUTTON1 && evt.getClickCount() == 2) {
- PrimitiveList list = (PrimitiveList) evt.getSource();
- int index = list.locationToIndex(evt.getPoint());
- AutoScaleAction.zoomTo(Collections.singleton(list.getModel().getElementAt(index)));
- }
- }
- };
- // initialize the three lists for uploaded primitives, but don't add them to the dialog yet, see setUploadedPrimitives()
- //
- lstAdd = new PrimitiveList();
- lstAdd.setCellRenderer(renderer);
- lstAdd.addMouseListener(mouseListener);
- lstAdd.setVisibleRowCount(Math.min(lstAdd.getModel().getSize(), 10));
- spAdd = new JScrollPane(lstAdd);
- lblAdd = new JLabel(tr("Objects to add:"));
- lblAdd.setLabelFor(lstAdd);
-
- lstUpdate = new PrimitiveList();
- lstUpdate.setCellRenderer(renderer);
- lstUpdate.addMouseListener(mouseListener);
- lstUpdate.setVisibleRowCount(Math.min(lstUpdate.getModel().getSize(), 10));
- spUpdate = new JScrollPane(lstUpdate);
- lblUpdate = new JLabel(tr("Objects to modify:"));
- lblUpdate.setLabelFor(lstUpdate);
-
- lstDelete = new PrimitiveList();
- lstDelete.setCellRenderer(renderer);
- lstDelete.addMouseListener(mouseListener);
- lstDelete.setVisibleRowCount(Math.min(lstDelete.getModel().getSize(), 10));
- spDelete = new JScrollPane(lstDelete);
- lblDelete = new JLabel(tr("Objects to delete:"));
- lblDelete.setLabelFor(lstDelete);
- }
-
/**
- * Sets the collections of primitives which will be uploaded
+ * Builds the panel
*
- * @param add the collection of primitives to add
- * @param update the collection of primitives to update
- * @param delete the collection of primitives to delete
+ * @param toUpload the primitives to upload
*/
- public void setUploadedPrimitives(List add, List update, List delete) {
- lstAdd.getPrimitiveListModel().setPrimitives(add);
- lstUpdate.getPrimitiveListModel().setPrimitives(update);
- lstDelete.getPrimitiveListModel().setPrimitives(delete);
-
- GridBagConstraints gcLabel = new GridBagConstraints();
- gcLabel.fill = GridBagConstraints.HORIZONTAL;
- gcLabel.weightx = 1.0;
- gcLabel.weighty = 0.0;
- gcLabel.anchor = GridBagConstraints.FIRST_LINE_START;
-
+ public void build(APIDataSet toUpload) {
GridBagConstraints gcList = new GridBagConstraints();
gcList.fill = GridBagConstraints.BOTH;
gcList.weightx = 1.0;
gcList.weighty = 1.0;
gcList.anchor = GridBagConstraints.CENTER;
+
removeAll();
- int y = -1;
- if (!add.isEmpty()) {
- y++;
- gcLabel.gridy = y;
- lblAdd.setText(trn("{0} object to add:", "{0} objects to add:", add.size(), add.size()));
- add(lblAdd, gcLabel);
- y++;
- gcList.gridy = y;
- add(spAdd, gcList);
+ List list = toUpload.getPrimitivesToAdd();
+ if (!list.isEmpty()) {
+ gcList.gridy++;
+ add(new ListPanel(list, "{0} object to add:", "{0} objects to add:"), gcList);
}
- if (!update.isEmpty()) {
- y++;
- gcLabel.gridy = y;
- lblUpdate.setText(trn("{0} object to modify:", "{0} objects to modify:", update.size(), update.size()));
- add(lblUpdate, gcLabel);
- y++;
- gcList.gridy = y;
- add(spUpdate, gcList);
+ list = toUpload.getPrimitivesToUpdate();
+ if (!list.isEmpty()) {
+ gcList.gridy++;
+ add(new ListPanel(list, "{0} object to modify:", "{0} objects to modify:"), gcList);
}
- if (!delete.isEmpty()) {
- y++;
- gcLabel.gridy = y;
- lblDelete.setText(trn("{0} object to delete:", "{0} objects to delete:", delete.size(), delete.size()));
- add(lblDelete, gcLabel);
- y++;
- gcList.gridy = y;
- add(spDelete, gcList);
+ list = toUpload.getPrimitivesToDelete();
+ if (!list.isEmpty()) {
+ gcList.gridy++;
+ add(new ListPanel(list, "{0} object to delete:", "{0} objects to delete:"), gcList);
}
revalidate();
+ repaint();
}
-
- /**
- * Replies the number of objects to upload
- *
- * @return the number of objects to upload
- */
- public int getNumObjectsToUpload() {
- return lstAdd.getModel().getSize()
- + lstUpdate.getModel().getSize()
- + lstDelete.getModel().getSize();
- }
-
- /**
- * A simple list of OSM primitives.
- */
- static class PrimitiveList extends JList {
- /**
- * Constructs a new {@code PrimitiveList}.
- */
- PrimitiveList() {
- super(new PrimitiveListModel());
- }
-
- public PrimitiveListModel getPrimitiveListModel() {
- return (PrimitiveListModel) getModel();
- }
- }
-
- /**
- * A list model for a list of OSM primitives.
- */
- static class PrimitiveListModel extends AbstractListModel {
- private transient List primitives;
-
- /**
- * Constructs a new {@code PrimitiveListModel}.
- */
- PrimitiveListModel() {
- primitives = new ArrayList<>();
- }
-
- PrimitiveListModel(List primitives) {
- setPrimitives(primitives);
- }
-
- public void setPrimitives(List primitives) {
- this.primitives = Optional.ofNullable(primitives).orElseGet(ArrayList::new);
- fireContentsChanged(this, 0, getSize());
- }
-
- @Override
- public OsmPrimitive getElementAt(int index) {
- if (primitives == null) return null;
- return primitives.get(index);
- }
-
- @Override
- public int getSize() {
- if (primitives == null) return 0;
- return primitives.size();
- }
- }
}
Index: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 18366)
+++ src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (working copy)
@@ -1280,7 +1280,7 @@
@Override
public AbstractUploadDialog getUploadDialog() {
UploadDialog dialog = UploadDialog.getUploadDialog();
- dialog.setUploadedPrimitives(new APIDataSet(data));
+ dialog.initLifeCycle(data, new APIDataSet(data));
return dialog;
}
Index: src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
===================================================================
--- src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 18366)
+++ src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (working copy)
@@ -23,11 +23,13 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import javax.swing.AbstractAction;
@@ -238,6 +240,9 @@
}
}
+ /**
+ * Parses strings into action definitions and back.
+ */
public static class ActionParser {
private final Map actions;
private final StringBuilder result = new StringBuilder();
@@ -274,7 +279,8 @@
}
/**
- * Loads the action definition from its toolbar name.
+ * Parses an action definition from a string.
+ *
* @param actionName action toolbar name
* @return action definition or null
*/
@@ -353,6 +359,12 @@
}
}
+ /**
+ * Unparses an action definition
+ *
+ * @param action the given action
+ * @return the action as string
+ */
@SuppressWarnings("unchecked")
public String saveAction(ActionDefinition action) {
result.setLength(0);
@@ -397,8 +409,8 @@
}
if (!first) {
result.append('}');
+ }
}
- }
return result.toString();
}
@@ -570,6 +582,7 @@
}
private final ToolbarPopupMenu popupMenu = new ToolbarPopupMenu();
+ private boolean showInfoAboutMissingActions;
/**
* Key: Registered name (property "toolbar" of action).
@@ -577,15 +590,13 @@
*/
private final Map regactions = new ConcurrentHashMap<>();
- private final DefaultMutableTreeNode rootActionsNode = new DefaultMutableTreeNode(tr("Actions"));
-
+ /** the swing component for the toolbar */
public final JToolBar control = new JToolBar();
private final Map buttonActions = new ConcurrentHashMap<>(30);
- private boolean showInfoAboutMissingActions;
@Override
public PreferenceSetting createPreferenceSetting() {
- return new Settings(rootActionsNode);
+ return new Settings(loadActions(MainApplication.getMenu(), regactions));
}
/**
@@ -1025,8 +1036,14 @@
TaggingPresets.addListener(this);
}
- private static void loadAction(DefaultMutableTreeNode node, MenuElement menu, Map actionsInMenu) {
- Object userObject = null;
+ /**
+ * Recursive part of {@link #loadActions}.
+ *
+ * @param node the parent node
+ * @param seen accumulator for all seen actions
+ * @param menu the menu to harvest
+ */
+ private void loadAction(DefaultMutableTreeNode node, Set seen, MenuElement menu) {
MenuElement menuElement = menu;
if (menu.getSubElements().length > 0 &&
menu.getSubElements()[0] instanceof JPopupMenu) {
@@ -1034,10 +1051,12 @@
}
for (MenuElement item : menuElement.getSubElements()) {
if (item instanceof JMenuItem) {
+ DefaultMutableTreeNode newNode = null;
JMenuItem menuItem = (JMenuItem) item;
if (menuItem.getAction() != null) {
Action action = menuItem.getAction();
- userObject = action;
+ newNode = new DefaultMutableTreeNode(action);
+ seen.add(action);
Object tb = action.getValue("toolbar");
if (tb == null) {
Logging.info(tr("Toolbar action without name: {0}",
@@ -1049,34 +1068,38 @@
action.getClass().getName()));
}
continue;
- } else {
- String toolbar = (String) tb;
- Action r = actionsInMenu.get(toolbar);
- if (r != null && r != action && !toolbar.startsWith(IMAGERY_PREFIX)) {
- Logging.info(tr("Toolbar action {0} overwritten: {1} gets {2}",
- toolbar, r.getClass().getName(), action.getClass().getName()));
- }
- actionsInMenu.put(toolbar, action);
}
} else {
- userObject = menuItem.getText();
+ newNode = new DefaultMutableTreeNode(menuItem.getText());
}
+ node.add(newNode);
+ loadAction(newNode, seen, item);
}
- DefaultMutableTreeNode newNode = new DefaultMutableTreeNode(userObject);
- node.add(newNode);
- loadAction(newNode, item, actionsInMenu);
}
}
- private void loadActions(Map actionsInMenu) {
- rootActionsNode.removeAllChildren();
- loadAction(rootActionsNode, MainApplication.getMenu(), actionsInMenu);
- for (Map.Entry a : regactions.entrySet()) {
- if (actionsInMenu.get(a.getKey()) == null) {
- rootActionsNode.add(new DefaultMutableTreeNode(a.getValue()));
+ /**
+ * Builds a JTree root node of known actions.
+ *
+ * Builds a {@link JTree} with the same structure as the given menu, then adds all registered actions
+ * that are not already in the tree.
+ *
+ * @param menu the menu to scan for actions
+ * @param registeredActions the registered actions
+ * @return the root tree node of a JTree
+ */
+ private DefaultMutableTreeNode loadActions(MenuElement menu, Map registeredActions) {
+ final DefaultMutableTreeNode rootActionsNode = new DefaultMutableTreeNode(tr("Actions"));
+ final HashSet seen = new HashSet<>();
+
+ loadAction(rootActionsNode, seen, menu);
+ registeredActions.forEach((key, action) -> {
+ if (!seen.contains(action)) {
+ rootActionsNode.add(new DefaultMutableTreeNode(action));
}
- }
+ });
rootActionsNode.add(new DefaultMutableTreeNode(null));
+ return rootActionsNode;
}
private static final String[] deftoolbar = {"open", "save", "download", "upload", "|",
@@ -1088,6 +1111,10 @@
"tagginggroup_Facilities/Food+Drinks", "|", "tagginggroup_Man Made/Historic Places", "|",
"tagginggroup_Man Made/Man Made"};
+ /**
+ * Returns the configured toolbar strings or {@link #deftoolbar default ones}.
+ * @return the toolstring
+ */
public static Collection getToolString() {
Collection toolStr = Config.getPref().getList("toolbar", Arrays.asList(deftoolbar));
if (Utils.isEmpty(toolStr)) {
@@ -1097,14 +1124,7 @@
}
private Collection getDefinedActions() {
- Map actionsInMenu = new ConcurrentHashMap<>();
-
- loadActions(actionsInMenu);
-
- Map allActions = new ConcurrentHashMap<>(regactions);
- allActions.putAll(actionsInMenu);
- ActionParser actionParser = new ActionParser(allActions);
-
+ ActionParser actionParser = new ActionParser(regactions);
Collection result = new ArrayList<>();
for (String s : getToolString()) {
@@ -1139,8 +1159,6 @@
Logging.info(tr("Registered toolbar action {0} overwritten: {1} gets {2}",
toolbar, r.getClass().getName(), action.getClass().getName()));
}
- }
- if (toolbar != null) {
regactions.put(toolbar, action);
}
return action;
@@ -1250,8 +1268,8 @@
sc = ((JosmAction) action.getAction()).getShortcut();
if (sc.getAssignedKey() == KeyEvent.CHAR_UNDEFINED) {
sc = null;
+ }
}
- }
long paramCode = 0;
if (action.hasParameters()) {
Index: src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java
===================================================================
--- src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (revision 18366)
+++ src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (working copy)
@@ -31,7 +31,6 @@
import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane.PreferencePanel;
import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane.ValidationListener;
import org.openstreetmap.josm.gui.preferences.SourceEditor;
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetReader;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
import org.openstreetmap.josm.spi.preferences.Config;
@@ -58,7 +57,7 @@
i++;
boolean canLoad = false;
try {
- TaggingPresetReader.readAll(source.url, false);
+ TaggingPresetReader.read(source.url, false);
canLoad = true;
} catch (IOException e) {
Logging.log(Logging.LEVEL_WARN, tr("Could not read tagging preset source: {0}", source), e);
@@ -82,7 +81,7 @@
String errorMessage = null;
try {
- TaggingPresetReader.readAll(source.url, true);
+ TaggingPresetReader.read(source.url, true);
} catch (IOException e) {
// Should not happen, but at least show message
String msg = tr("Could not read tagging preset source: {0}", source);
@@ -170,8 +169,8 @@
@Override
public void addGui(PreferenceTabbedPane gui) {
- useValidator = new JCheckBox(tr("Run data validator on user input"), TaggingPreset.USE_VALIDATOR.get());
- sortMenu = new JCheckBox(tr("Sort presets menu alphabetically"), TaggingPresets.SORT_MENU.get());
+ useValidator = new JCheckBox(tr("Run data validator on user input"), TaggingPresets.USE_VALIDATOR.get());
+ sortMenu = new JCheckBox(tr("Sort presets menu alphabetically"), TaggingPresets.SORT_VALUES.get());
final JPanel panel = new JPanel(new GridBagLayout());
panel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
@@ -251,8 +250,8 @@
@Override
public boolean ok() {
- TaggingPreset.USE_VALIDATOR.put(useValidator.isSelected());
- if (sources.finish() || TaggingPresets.SORT_MENU.put(sortMenu.isSelected())) {
+ TaggingPresets.USE_VALIDATOR.put(useValidator.isSelected());
+ if (sources.finish() || TaggingPresets.SORT_VALUES.put(sortMenu.isSelected())) {
TaggingPresets.destroy();
TaggingPresets.initialize();
}
Index: src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
===================================================================
--- src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (revision 18366)
+++ src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (working copy)
@@ -145,11 +145,20 @@
}
@Override
- public Object getValueAt(int rowIndex, int columnIndex) {
- if (rowIndex >= getRowCount())
- throw new IndexOutOfBoundsException("unexpected rowIndex: rowIndex=" + rowIndex);
-
- return tags.get(rowIndex);
+ public Object getValueAt(int row, int col) {
+ if (row >= getRowCount())
+ throw new IndexOutOfBoundsException("unexpected row: row=" + row);
+ if (col >= getColumnCount())
+ throw new IndexOutOfBoundsException("unexpected col: col=" + col);
+ TagModel tag = get(row);
+ switch(col) {
+ case 0:
+ return tag.getName();
+ case 1:
+ return tag.getValue();
+ default: // Do nothing
+ }
+ return null;
}
@Override
Index: src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java
===================================================================
--- src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java (revision 18366)
+++ src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java (working copy)
@@ -21,12 +21,8 @@
import org.openstreetmap.josm.gui.dialogs.properties.HelpAction;
import org.openstreetmap.josm.gui.dialogs.properties.HelpTagAction;
import org.openstreetmap.josm.gui.dialogs.properties.PresetListPanel;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetHandler;
import org.openstreetmap.josm.spi.preferences.Config;
-import org.openstreetmap.josm.tools.CheckParameterUtil;
/**
* TagEditorPanel is a {@link JPanel} which can be embedded as UI component in
@@ -90,7 +86,6 @@
JButton btn = new JButton(action);
pnl.add(btn);
btn.setMargin(new Insets(0, 0, 0, 0));
- tagTable.addComponentNotStoppingCellEditing(btn);
}
/**
@@ -147,7 +142,7 @@
* @param presetHandler tagging preset handler
*/
public TagEditorPanel(OsmPrimitive primitive, TaggingPresetHandler presetHandler) {
- this(new TagEditorModel().forPrimitive(primitive), presetHandler, 0);
+ this(new TagEditorModel().forPrimitive(primitive), presetHandler, -1);
}
/**
@@ -188,25 +183,11 @@
}
/**
- * Initializes the auto completion infrastructure used in this
- * tag editor panel. {@code layer} is the data layer from whose data set
- * tag values are proposed as auto completion items.
- *
- * @param layer the data layer. Must not be null.
- * @throws IllegalArgumentException if {@code layer} is null
+ * Returns the JTable
+ * @return the JTable
*/
- public void initAutoCompletion(OsmDataLayer layer) {
- CheckParameterUtil.ensureParameterNotNull(layer, "layer");
-
- AutoCompletionManager autocomplete = AutoCompletionManager.of(layer.data);
- AutoCompletionList acList = new AutoCompletionList();
-
- TagCellEditor editor = (TagCellEditor) tagTable.getColumnModel().getColumn(0).getCellEditor();
- editor.setAutoCompletionManager(autocomplete);
- editor.setAutoCompletionList(acList);
- editor = (TagCellEditor) tagTable.getColumnModel().getColumn(1).getCellEditor();
- editor.setAutoCompletionManager(autocomplete);
- editor.setAutoCompletionList(acList);
+ public TagTable getTable() {
+ return tagTable;
}
@Override
Index: src/org/openstreetmap/josm/gui/tagging/TagTable.java
===================================================================
--- src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 18366)
+++ src/org/openstreetmap/josm/gui/tagging/TagTable.java (working copy)
@@ -5,18 +5,16 @@
import java.awt.Component;
import java.awt.Dimension;
-import java.awt.KeyboardFocusManager;
-import java.awt.Window;
import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.Collections;
-import java.util.EventObject;
-import java.util.concurrent.CopyOnWriteArrayList;
import javax.swing.AbstractAction;
import javax.swing.CellEditor;
+import javax.swing.InputMap;
import javax.swing.JComponent;
import javax.swing.JTable;
import javax.swing.KeyStroke;
@@ -24,17 +22,16 @@
import javax.swing.SwingUtilities;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
-import javax.swing.text.JTextComponent;
+import javax.swing.table.DefaultTableCellRenderer;
+import javax.swing.table.TableCellEditor;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.TagMap;
import org.openstreetmap.josm.gui.datatransfer.OsmTransferHandler;
import org.openstreetmap.josm.gui.tagging.TagEditorModel.EndEditListener;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBox;
import org.openstreetmap.josm.gui.widgets.JosmTable;
import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.Logging;
import org.openstreetmap.josm.tools.Utils;
/**
@@ -41,59 +38,54 @@
* This is the tabular editor component for OSM tags.
* @since 1762
*/
-public class TagTable extends JosmTable implements EndEditListener {
- /** the table cell editor used by this table */
- private TagCellEditor editor;
+public class TagTable extends JosmTable implements ActionListener, EndEditListener {
private final TagEditorModel model;
private Component nextFocusComponent;
+ private final int LAST_COL = 1;
- /** a list of components to which focus can be transferred without stopping
- * cell editing this table.
- */
- private final CopyOnWriteArrayList doNotStopCellEditingWhenFocused = new CopyOnWriteArrayList<>();
- private transient CellEditorRemover editorRemover;
+ /** the go to next cell action */
+ private final SelectNextColumnCellAction nextAction = new SelectNextColumnCellAction();
+ /** the go to previous cell action */
+ private final SelectPreviousColumnCellAction previousAction = new SelectPreviousColumnCellAction();
+ /** the delete action */
+ private final DeleteAction deleteAction = new DeleteAction();
+ /** the add action */
+ private final AddAction addAction = new AddAction();
+ /** the tag paste action */
+ private final PasteAction pasteAction = new PasteAction();
/**
- * Action to be run when the user navigates to the next cell in the table,
- * for instance by pressing TAB or ENTER. The action alters the standard
- * navigation path from cell to cell:
- *
- * - it jumps over cells in the first column
- * - it automatically add a new empty row when the user leaves the
- * last cell in the table
- *
+ * Action to be run when the user navigates to the next cell in the table, for instance by
+ * pressing TAB or ENTER. The action automatically adds a new empty row when the user leaves the
+ * last cell in the table.
*/
class SelectNextColumnCellAction extends AbstractAction {
@Override
public void actionPerformed(ActionEvent e) {
- run();
- }
-
- public void run() {
int col = getSelectedColumn();
int row = getSelectedRow();
- if (getCellEditor() != null) {
- getCellEditor().stopCellEditing();
- }
if (row == -1 && col == -1) {
requestFocusInCell(0, 0);
return;
}
+ endCellEditing();
- if (col == 0) {
+ if (col < LAST_COL) {
col++;
- } else if (col == 1 && row < getRowCount()-1) {
+ } else if (row < getRowCount() - 1) {
col = 0;
row++;
- } else if (col == 1 && row == getRowCount()-1) {
- // we are at the end. Append an empty row and move the focus to its second column
- String key = ((TagModel) model.getValueAt(row, 0)).getName();
+ } else {
+ // we are in the last cell.
+ String key = (String) model.getValueAt(row, 0);
if (!Utils.isStripEmpty(key)) {
+ // append an empty row
model.appendNewTag();
col = 0;
row++;
} else {
+ // exit the table
clearSelection();
if (nextFocusComponent != null)
nextFocusComponent.requestFocusInWindow();
@@ -114,16 +106,15 @@
public void actionPerformed(ActionEvent e) {
int col = getSelectedColumn();
int row = getSelectedRow();
- if (getCellEditor() != null) {
- getCellEditor().stopCellEditing();
- }
+ endCellEditing();
+
if (col <= 0 && row <= 0) {
// change nothing
- } else if (col == 1) {
+ } else if (col > 0) {
col--;
} else {
- col = 1;
+ col = LAST_COL;
row--;
}
requestFocusInCell(row, col);
@@ -131,25 +122,23 @@
}
/**
- * Action to be run when the user invokes a delete action on the table, for
- * instance by pressing DEL.
+ * Action to be run when the user invokes a delete action on the table, for instance by pressing
+ * DEL or hitting the "delete" button in the {@link TagEditorPanel}.
*
- * Depending on the shape on the current selection the action deletes individual
- * values or entire tags from the model.
+ * Depending on the shape on the current selection the action deletes individual values or
+ * entire tags from the model.
*
- * If the current selection consists of cells in the second column only, the keys of
- * the selected tags are set to the empty string.
+ * If the current selection consists of cells in the key column only, the keys of the selected
+ * tags are set to the empty string.
*
- * If the current selection consists of cell in the third column only, the values of the
+ * If the current selection consists of cell in the values column only, the values of the
* selected tags are set to the empty string.
*
- * If the current selection consists of cells in the second and the third column,
- * the selected tags are removed from the model.
+ * If the current selection consists of entire rows, the selected tags are removed from the
+ * model.
*
- * This action listens to the table selection. It becomes enabled when the selection
- * is non-empty, otherwise it is disabled.
- *
- *
+ * This action listens to the table selection. It becomes enabled when the selection is
+ * non-empty, otherwise it is disabled.
*/
class DeleteAction extends AbstractAction implements ListSelectionListener {
@@ -161,50 +150,22 @@
updateEnabledState();
}
- /**
- * delete a selection of tag names
- */
- protected void deleteTagNames() {
- int[] rows = getSelectedRows();
- model.deleteTagNames(rows);
- }
-
- /**
- * delete a selection of tag values
- */
- protected void deleteTagValues() {
- int[] rows = getSelectedRows();
- model.deleteTagValues(rows);
- }
-
- /**
- * delete a selection of tags
- */
- protected void deleteTags() {
- int[] rows = getSelectedRows();
- model.deleteTags(rows);
- }
-
@Override
public void actionPerformed(ActionEvent e) {
- if (!isEnabled())
- return;
- switch(getSelectedColumnCount()) {
+ switch (getSelectedColumnCount()) {
case 1:
if (getSelectedColumn() == 0) {
- deleteTagNames();
+ model.deleteTagNames(getSelectedRows());
} else if (getSelectedColumn() == 1) {
- deleteTagValues();
+ model.deleteTagValues(getSelectedRows());
}
break;
case 2:
- deleteTags();
+ model.deleteTags(getSelectedRows());
break;
default: // Do nothing
}
- endCellEditing();
-
if (model.getRowCount() == 0) {
model.ensureOneTag();
requestFocusInCell(0, 0);
@@ -216,7 +177,10 @@
*/
@Override
public void valueChanged(ListSelectionEvent e) {
- updateEnabledState();
+ // when the user clicks on the "delete" button the table loses focus and unselects all
+ // cells which in turn would disable the action. the delay allows the action to execute
+ // before it gets disabled
+ SwingUtilities.invokeLater(this::updateEnabledState);
}
protected final void updateEnabledState() {
@@ -243,7 +207,7 @@
cEditor.stopCellEditing();
}
final int rowIdx = model.getRowCount()-1;
- if (rowIdx < 0 || !Utils.isStripEmpty(((TagModel) model.getValueAt(rowIdx, 0)).getName())) {
+ if (rowIdx < 0 || !Utils.isStripEmpty((String) model.getValueAt(rowIdx, 0))) {
model.appendNewTag();
}
requestFocusInCell(model.getRowCount()-1, 0);
@@ -288,15 +252,6 @@
}
}
- /** the delete action */
- private DeleteAction deleteAction;
-
- /** the add action */
- private AddAction addAction;
-
- /** the tag paste action */
- private PasteAction pasteAction;
-
/**
* Returns the delete action.
* @return the delete action used by this table
@@ -322,121 +277,71 @@
}
/**
- * initialize the table
- * @param maxCharacters maximum number of characters allowed for keys and values, 0 for unlimited
- */
- protected final void init(final int maxCharacters) {
- setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
- setRowSelectionAllowed(true);
- setColumnSelectionAllowed(true);
- setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
-
- // make ENTER behave like TAB
- //
- getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
- .put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0, false), "selectNextColumnCell");
-
- // install custom navigation actions
- //
- getActionMap().put("selectNextColumnCell", new SelectNextColumnCellAction());
- getActionMap().put("selectPreviousColumnCell", new SelectPreviousColumnCellAction());
-
- // create a delete action. Installing this action in the input and action map
- // didn't work. We therefore handle delete requests in processKeyBindings(...)
- //
- deleteAction = new DeleteAction();
-
- // create the add action
- //
- addAction = new AddAction();
- getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
- .put(KeyStroke.getKeyStroke(KeyEvent.VK_ADD, KeyEvent.CTRL_DOWN_MASK), "addTag");
- getActionMap().put("addTag", addAction);
-
- pasteAction = new PasteAction();
-
- // create the table cell editor and set it to key and value columns
- //
- TagCellEditor tmpEditor = new TagCellEditor(maxCharacters);
- setRowHeight(tmpEditor.getEditor().getPreferredSize().height);
- setTagCellEditor(tmpEditor);
- }
-
- /**
* Creates a new tag table
*
* @param model the tag editor model
- * @param maxCharacters maximum number of characters allowed for keys and values, 0 for unlimited
+ * @param maxCharacters maximum number of characters allowed for keys and values, -1 for unlimited
*/
public TagTable(TagEditorModel model, final int maxCharacters) {
- super(model, new TagTableColumnModelBuilder(new TagCellRenderer(), tr("Key"), tr("Value"))
+ super(model, new TagTableColumnModelBuilder(new DefaultTableCellRenderer(), tr("Key"), tr("Value"))
.setSelectionModel(model.getColumnSelectionModel()).build(),
model.getRowSelectionModel());
+
this.model = model;
model.setEndEditListener(this);
- init(maxCharacters);
- }
- @Override
- public Dimension getPreferredSize() {
- return getPreferredFullWidthSize();
- }
+ setAutoResizeMode(JTable.AUTO_RESIZE_NEXT_COLUMN);
+ setRowSelectionAllowed(true);
+ setColumnSelectionAllowed(true);
+ setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
+ putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
- @Override
- protected boolean processKeyBinding(KeyStroke ks, KeyEvent e, int condition, boolean pressed) {
+ InputMap im = getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
- // handle delete key
- //
- if (e.getKeyCode() == KeyEvent.VK_DELETE) {
- if (isEditing() && getSelectedColumnCount() == 1 && getSelectedRowCount() == 1)
- // if DEL was pressed and only the currently edited cell is selected,
- // don't run the delete action. DEL is handled by the CellEditor as normal
- // DEL in the text input.
- //
- return super.processKeyBinding(ks, e, condition, pressed);
- getDeleteAction().actionPerformed(null);
- }
- return super.processKeyBinding(ks, e, condition, pressed);
+ // make ENTER behave like TAB (does not work for ComboBoxes)
+ im.put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0, false), "selectNextColumnCell");
+ im.put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), "delete");
+ im.put(KeyStroke.getKeyStroke(KeyEvent.VK_ADD, KeyEvent.CTRL_DOWN_MASK), "addTag");
+
+ getActionMap().put("selectNextColumnCell", nextAction);
+ getActionMap().put("selectPreviousColumnCell", previousAction);
+ getActionMap().put("addTag", addAction);
+ getActionMap().put("delete", deleteAction);
}
/**
- * Sets the editor autocompletion list
- * @param autoCompletionList autocompletion list
+ * Sets a TableCellEditor for the keys column.
+ * @param editor the editor to set
*/
- public void setAutoCompletionList(AutoCompletionList autoCompletionList) {
- if (autoCompletionList == null)
- return;
- if (editor != null) {
- editor.setAutoCompletionList(autoCompletionList);
- }
+ public void setKeyEditor(TableCellEditor editor) {
+ if (editor instanceof AutoCompComboBox)
+ ((AutoCompComboBox) editor).getActionMap().put("enterPressed", nextAction);
+ getColumnModel().getColumn(0).setCellEditor(editor);
}
/**
- * Sets the autocompletion manager that should be used for editing the cells
- * @param autocomplete The {@link AutoCompletionManager}
+ * Sets a TableCellEditor for the values column.
+ * @param editor the editor to set
*/
- public void setAutoCompletionManager(AutoCompletionManager autocomplete) {
- if (autocomplete == null) {
- Logging.warn("argument autocomplete should not be null. Aborting.");
- Logging.error(new Exception());
- return;
- }
- if (editor != null) {
- editor.setAutoCompletionManager(autocomplete);
- }
+ public void setValueEditor(TableCellEditor editor) {
+ if (editor instanceof AutoCompComboBox)
+ ((AutoCompComboBox) editor).getActionMap().put("enterPressed", nextAction);
+ getColumnModel().getColumn(1).setCellEditor(editor);
}
- /**
- * Gets the {@link AutoCompletionList} the cell editor is synchronized with
- * @return The list
- */
- public AutoCompletionList getAutoCompletionList() {
- if (editor != null)
- return editor.getAutoCompletionList();
- else
- return null;
+ @Override
+ public boolean getDragEnabled() {
+ // fix for comboboxes flashing when clicking the cell where the arrow button will be
+ // maybe a late focus request wants to focus the cb when the popup is already open?
+ // see: BasicTableUI#adjustSelection and mouseReleasedDND
+ return true;
}
+ @Override
+ public Dimension getPreferredSize() {
+ return getPreferredFullWidthSize();
+ }
+
/**
* Sets the next component to request focus after navigation (with tab or enter).
* @param nextFocusComponent next component to request focus after navigation (with tab or enter)
@@ -446,26 +351,6 @@
}
/**
- * Gets the editor that is used for the table cells
- * @return The editor that is used when the user wants to enter text into a cell
- */
- public TagCellEditor getTableCellEditor() {
- return editor;
- }
-
- /**
- * Inject a tag cell editor in the tag table
- *
- * @param editor tag cell editor
- */
- public void setTagCellEditor(TagCellEditor editor) {
- endCellEditing();
- this.editor = editor;
- getColumnModel().getColumn(0).setCellEditor(editor);
- getColumnModel().getColumn(1).setCellEditor(editor);
- }
-
- /**
* Request the focus in a specific cell
* @param row The row index
* @param col The column index
@@ -475,70 +360,16 @@
editCellAt(row, col);
Component c = getEditorComponent();
if (c != null) {
- if (!c.requestFocusInWindow()) {
- Logging.warn("Unable to request focus for " + c);
- }
- if (c instanceof JTextComponent) {
- ((JTextComponent) c).selectAll();
- }
+ c.requestFocusInWindow();
}
- // there was a bug here - on older 1.6 Java versions Tab was not working
- // after such activation. In 1.7 it works OK,
- // previous solution of using awt.Robot was resetting mouse speed on Windows
}
- /**
- * Marks a component that may be focused without stopping the cell editing
- * @param component The component
- */
- public void addComponentNotStoppingCellEditing(Component component) {
- if (component == null) return;
- doNotStopCellEditingWhenFocused.addIfAbsent(component);
- }
-
- /**
- * Removes a component added with {@link #addComponentNotStoppingCellEditing(Component)}
- * @param component The component
- */
- public void removeComponentNotStoppingCellEditing(Component component) {
- if (component == null) return;
- doNotStopCellEditingWhenFocused.remove(component);
- }
-
@Override
- public boolean editCellAt(int row, int column, EventObject e) {
-
- // a snipped copied from the Java 1.5 implementation of JTable
- //
- if (cellEditor != null && !cellEditor.stopCellEditing())
- return false;
-
- if (row < 0 || row >= getRowCount() ||
- column < 0 || column >= getColumnCount())
- return false;
-
- if (!isCellEditable(row, column))
- return false;
-
- // make sure our custom implementation of CellEditorRemover is created
- if (editorRemover == null) {
- KeyboardFocusManager fm =
- KeyboardFocusManager.getCurrentKeyboardFocusManager();
- editorRemover = new CellEditorRemover(fm);
- fm.addPropertyChangeListener("permanentFocusOwner", editorRemover);
- }
-
- // delegate to the default implementation
- return super.editCellAt(row, column, e);
- }
-
- @Override
public void endCellEditing() {
- if (isEditing()) {
- CellEditor cEditor = getCellEditor();
- if (cEditor != null) {
- // First attempt to commit. If this does not work, cancel.
- cEditor.stopCellEditing();
+ TableCellEditor cEditor = getCellEditor();
+ if (cEditor != null) {
+ // First attempt to commit. If this does not work, cancel.
+ if (!cEditor.stopCellEditing()) {
cEditor.cancelCellEditing();
}
}
@@ -545,62 +376,10 @@
}
@Override
- public void removeEditor() {
- // make sure we unregister our custom implementation of CellEditorRemover
- KeyboardFocusManager.getCurrentKeyboardFocusManager().
- removePropertyChangeListener("permanentFocusOwner", editorRemover);
- editorRemover = null;
- super.removeEditor();
- }
-
- @Override
- public void removeNotify() {
- // make sure we unregister our custom implementation of CellEditorRemover
- KeyboardFocusManager.getCurrentKeyboardFocusManager().
- removePropertyChangeListener("permanentFocusOwner", editorRemover);
- editorRemover = null;
- super.removeNotify();
- }
-
- /**
- * This is a custom implementation of the CellEditorRemover used in JTable
- * to handle the client property terminateEditOnFocusLost.
- *
- * This implementation also checks whether focus is transferred to one of a list
- * of dedicated components, see {@link TagTable#doNotStopCellEditingWhenFocused}.
- * A typical example for such a component is a button in {@link TagEditorPanel}
- * which isn't a child component of {@link TagTable} but which should respond to
- * to focus transfer in a similar way to a child of TagTable.
- *
- */
- class CellEditorRemover implements PropertyChangeListener {
- private final KeyboardFocusManager focusManager;
-
- CellEditorRemover(KeyboardFocusManager fm) {
- this.focusManager = fm;
+ public void actionPerformed(ActionEvent e) {
+ if ("enterPressed".equals(e.getActionCommand())) {
+ // make ENTER in combobox behave like TAB
+ nextAction.actionPerformed(e);
}
-
- @Override
- public void propertyChange(PropertyChangeEvent ev) {
- if (!isEditing())
- return;
-
- Component c = focusManager.getPermanentFocusOwner();
- while (c != null) {
- if (c == TagTable.this)
- // focus remains inside the table
- return;
- if (doNotStopCellEditingWhenFocused.contains(c))
- // focus remains on one of the associated components
- return;
- else if (c instanceof Window) {
- if (c == SwingUtilities.getRoot(TagTable.this) && !getCellEditor().stopCellEditing()) {
- getCellEditor().cancelCellEditing();
- }
- break;
- }
- c = c.getParent();
- }
- }
}
}
Index: src/org/openstreetmap/josm/gui/tagging/ac/AutoCompComboBox.java
===================================================================
--- src/org/openstreetmap/josm/gui/tagging/ac/AutoCompComboBox.java (revision 18366)
+++ src/org/openstreetmap/josm/gui/tagging/ac/AutoCompComboBox.java (working copy)
@@ -1,11 +1,18 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.tagging.ac;
+import java.awt.Component;
+import java.awt.event.MouseEvent;
import java.awt.im.InputContext;
+import java.util.EventObject;
import java.util.Locale;
import javax.swing.ComboBoxEditor;
+import javax.swing.JTable;
+import javax.swing.event.CellEditorListener;
+import javax.swing.table.TableCellEditor;
+import org.openstreetmap.josm.gui.util.CellEditorSupport;
import org.openstreetmap.josm.gui.widgets.JosmComboBox;
import org.openstreetmap.josm.tools.Logging;
@@ -21,7 +28,7 @@
* @param the type of the combobox entries
* @since 18173
*/
-public class AutoCompComboBox extends JosmComboBox implements AutoCompListener {
+public class AutoCompComboBox extends JosmComboBox implements TableCellEditor, AutoCompListener {
/** force a different keyboard input locale for the editor */
private boolean useFixedLocale;
@@ -45,6 +52,7 @@
setEditable(true);
getEditorComponent().setModel(model);
getEditorComponent().addAutoCompListener(this);
+ tableCellEditorSupport = new CellEditorSupport(this);
}
/**
@@ -91,7 +99,8 @@
// Save the text in case item is null, because setSelectedItem will erase it.
String savedText = getText();
setSelectedItem(item);
- setText(savedText);
+ if (item == null)
+ setText(savedText);
}
/**
@@ -140,7 +149,9 @@
return super.getInputContext();
}
- /** AutoCompListener Interface */
+ /* ------------------------------------------------------------------------------------ */
+ /* AutoCompListener interface */
+ /* ------------------------------------------------------------------------------------ */
@Override
public void autoCompBefore(AutoCompEvent e) {
@@ -150,4 +161,78 @@
public void autoCompPerformed(AutoCompEvent e) {
autocomplete(e.getItem());
}
+
+ /* ------------------------------------------------------------------------------------ */
+ /* TableCellEditor interface */
+ /* ------------------------------------------------------------------------------------ */
+
+ private transient CellEditorSupport tableCellEditorSupport;
+ private String originalValue;
+
+ @Override
+ public void addCellEditorListener(CellEditorListener l) {
+ tableCellEditorSupport.addCellEditorListener(l);
+ }
+
+ protected void rememberOriginalValue(String value) {
+ this.originalValue = value;
+ }
+
+ protected void restoreOriginalValue() {
+ setText(originalValue);
+ }
+
+ @Override
+ public void removeCellEditorListener(CellEditorListener l) {
+ tableCellEditorSupport.removeCellEditorListener(l);
+ }
+
+ @Override
+ public void cancelCellEditing() {
+ restoreOriginalValue();
+ tableCellEditorSupport.fireEditingCanceled();
+ }
+
+ @Override
+ public Object getCellEditorValue() {
+ return getText();
+ }
+
+ /**
+ * Returns true if anEvent is not a MouseEvent. Otherwise, it
+ * returns true if the necessary number of clicks have occurred, and returns false otherwise.
+ *
+ * @param anEvent the event
+ * @return true if cell is ready for editing, false otherwise
+ * @see #shouldSelectCell
+ */
+ @Override
+ public boolean isCellEditable(EventObject anEvent) {
+ if (anEvent instanceof MouseEvent) {
+ return ((MouseEvent) anEvent).getClickCount() >= 1;
+ }
+ return true;
+ }
+
+ @Override
+ public boolean shouldSelectCell(EventObject anEvent) {
+ if (anEvent instanceof MouseEvent) {
+ MouseEvent e = (MouseEvent) anEvent;
+ return e.getID() != MouseEvent.MOUSE_DRAGGED;
+ }
+ return true;
+ }
+
+ @Override
+ public boolean stopCellEditing() {
+ tableCellEditorSupport.fireEditingStopped();
+ return true;
+ }
+
+ @Override
+ public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
+ setText(value == null ? "" : value.toString());
+ rememberOriginalValue(getText());
+ return this;
+ }
}
Index: src/org/openstreetmap/josm/gui/tagging/ac/AutoCompListener.java
===================================================================
--- src/org/openstreetmap/josm/gui/tagging/ac/AutoCompListener.java (revision 18366)
+++ src/org/openstreetmap/josm/gui/tagging/ac/AutoCompListener.java (working copy)
@@ -4,15 +4,19 @@
import java.util.EventListener;
/**
- * The listener interface for receiving autoComp events.
- * The class that is interested in processing an autoComp event
- * implements this interface, and the object created with that
- * class is registered with a component, using the component's
- * addAutoCompListener method. When the autoComp event
- * occurs, that object's autoCompPerformed method is
- * invoked.
+ * The listener interface for receiving AutoCompEvent events.
+ *
+ * The class that is interested in processing an {@link AutoCompEvent} implements this interface,
+ * and the object created with that class is registered with an autocompleting component using the
+ * autocompleting component's {@link AutoCompTextField#addAutoCompListener addAutoCompListener}
+ * method.
+ *
+ * Before the autocompletion searches for candidates, the listener's {@code autoCompBefore} method
+ * is invoked. It can be used to initialize the {@link AutoCompComboBoxModel}. After the
+ * autocompletion occured the listener's {@code autoCompPerformed} method is invoked. It is used eg.
+ * for adjusting the selection of an {@link AutoCompComboBox} after its {@link AutoCompTextField}
+ * has autocompleted.
*
- * @see AutoCompEvent
* @since 18221
*/
public interface AutoCompListener extends EventListener {
Index: src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java
===================================================================
--- src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java (revision 18366)
+++ src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java (working copy)
@@ -6,8 +6,8 @@
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
+import java.util.EnumSet;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
@@ -16,6 +16,7 @@
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -39,17 +40,20 @@
import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.tagging.presets.Item;
+import org.openstreetmap.josm.gui.tagging.presets.KeyedItem;
+import org.openstreetmap.josm.gui.tagging.presets.Role;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetType;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
-import org.openstreetmap.josm.gui.tagging.presets.items.Roles.Role;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.MultiMap;
import org.openstreetmap.josm.tools.Utils;
/**
- * AutoCompletionManager holds a cache of keys with a list of
- * possible auto completion values for each key.
- *
+ * AutoCompletionManager holds a cache of keys with a list of possible auto completion values for
+ * each key.
+ *
* Each DataSet can be assigned one AutoCompletionManager instance such that
*
* - any key used in a tag in the data set is part of the key list in the cache
@@ -56,12 +60,9 @@
* - any value used in a tag for a specific key is part of the autocompletion list of this key
*
*
- * Building up auto completion lists should not
- * slow down tabbing from input field to input field. Looping through the complete
- * data set in order to build up the auto completion list for a specific input
- * field is not efficient enough, hence this cache.
- *
- * TODO: respect the relation type for member role autocompletion
+ * Building up auto completion lists should not slow down tabbing from input field to input field.
+ * Looping through the complete data set in order to build up the auto completion list for a
+ * specific input field is not efficient enough, hence this cache.
*/
public class AutoCompletionManager implements DataSetListener {
@@ -105,6 +106,12 @@
}
}
+ /**
+ * Compares two AutoCompletionItems alphabetically.
+ */
+ public static final Comparator ALPHABETIC_COMPARATOR =
+ (ac1, ac2) -> String.CASE_INSENSITIVE_ORDER.compare(ac1.getValue(), ac2.getValue());
+
/** If the dirty flag is set true, a rebuild is necessary. */
protected boolean dirty;
/** The data set that is managed */
@@ -115,32 +122,22 @@
* only accessed by getTagCache(), rebuild() and cachePrimitiveTags()
* use getTagCache() accessor
*/
- protected MultiMap tagCache;
+ protected final MultiMap TAG_CACHE = new MultiMap<>();
/**
- * the same as tagCache but for the preset keys and values can be accessed directly
- */
- static final MultiMap PRESET_TAG_CACHE = new MultiMap<>();
-
- /**
* Cache for tags that have been entered by the user.
*/
static final Set USER_INPUT_TAG_CACHE = new LinkedHashSet<>();
/**
- * the cached list of member roles
- * only accessed by getRoleCache(), rebuild() and cacheRelationMemberRoles()
- * use getRoleCache() accessor
+ * The cached relations by {@link #getRelationType(Map) relation type}.
*/
- protected Set roleCache;
+ protected final MultiMap RELATION_CACHE = new MultiMap<>();
- /**
- * the same as roleCache but for the preset roles can be accessed directly
- */
- static final Set PRESET_ROLE_CACHE = new HashSet<>();
-
private static final Map INSTANCES = new HashMap<>();
+ private static final Map EMPTY_MAP = Collections.emptyMap();
+
/**
* Constructs a new {@code AutoCompletionManager}.
* @param ds data set
@@ -156,15 +153,15 @@
rebuild();
dirty = false;
}
- return tagCache;
+ return TAG_CACHE;
}
- protected Set getRoleCache() {
+ protected MultiMap getRelationCache() {
if (dirty) {
rebuild();
dirty = false;
}
- return roleCache;
+ return RELATION_CACHE;
}
/**
@@ -171,8 +168,8 @@
* initializes the cache from the primitives in the dataset
*/
protected void rebuild() {
- tagCache = new MultiMap<>();
- roleCache = new HashSet<>();
+ TAG_CACHE.clear();
+ RELATION_CACHE.clear();
cachePrimitives(ds.allNonDeletedCompletePrimitives());
}
@@ -180,7 +177,8 @@
for (OsmPrimitive primitive : primitives) {
cachePrimitiveTags(primitive);
if (primitive instanceof Relation) {
- cacheRelationMemberRoles((Relation) primitive);
+ Relation rel = (Relation) primitive;
+ RELATION_CACHE.put(getRelationType(rel.getKeys()), rel);
}
}
}
@@ -192,23 +190,41 @@
* @param primitive an OSM primitive
*/
protected void cachePrimitiveTags(OsmPrimitive primitive) {
- primitive.visitKeys((p, key, value) -> tagCache.put(key, value));
+ primitive.visitKeys((p, key, value) -> TAG_CACHE.put(key, value));
}
/**
- * Caches all member roles of the relation relation
+ * Returns the relation type.
+ *
+ * This is used to categorize the relations in the dataset. A relation with the keys:
+ *
+ * - type=route
+ *
- route=hiking
+ *
+ * will return a relation type of {@code "route.hiking"}.
*
- * @param relation the relation
+ * @param tags the tags on the relation
+ * @return the relation type or {@code ""}
*/
- protected void cacheRelationMemberRoles(Relation relation) {
- for (RelationMember m: relation.getMembers()) {
- if (m.hasRole()) {
- roleCache.add(m.getRole());
- }
- }
+ private String getRelationType(Map tags) {
+ String type = tags.get("type");
+ if (type == null) return "";
+ String subtype = tags.get(type);
+ if (subtype == null) return type;
+ return type + "." + subtype;
}
/**
+ * Construct a role out of a relation member
+ *
+ * @param member the relation member
+ * @return the Role
+ */
+ protected Role mkRole(RelationMember member) {
+ return new Role(member.getRole(), EnumSet.of(TaggingPresetType.forPrimitiveType(member.getDisplayType())));
+ }
+
+ /**
* Remembers user input for the given key/value.
* @param key Tag key
* @param value Tag value
@@ -259,22 +275,44 @@
}
/**
- * Replies the list of member roles
+ * Returns a collection of all member roles in the dataset.
+ *
+ * Member roles are distinct on role name and primitive type they apply to. So there will be a
+ * role "platform" for nodes and a role "platform" for ways.
*
- * @return the list of member roles
+ * @return the collection of member roles
*/
- public List getMemberRoles() {
- return new ArrayList<>(getRoleCache());
+ public Set getAllMemberRoles() {
+ return getRelationCache().getAllValues().stream()
+ .flatMap(rel -> rel.getMembers().stream()).map(r -> mkRole(r)).collect(Collectors.toSet());
}
/**
+ * Returns a collection of all roles in the dataset for one relation type.
+ *
+ * Member roles are distinct on role name and primitive type they apply to. So there will be a
+ * role "platform" for nodes and a role "platform" for ways.
+ *
+ * @param relationType the {@link #getRelationType(Map) relation type}
+ * @return the collection of member roles
+ */
+ public Set getMemberRoles(String relationType) {
+ Set relations = getRelationCache().get(relationType);
+ if (relations == null)
+ return Collections.emptySet();
+ return relations.stream().flatMap(rel -> rel.getMembers().stream()).map(r -> mkRole(r)).collect(Collectors.toSet());
+ }
+
+ /**
* Populates the {@link AutoCompletionList} with the currently cached member roles.
*
* @param list the list to populate
*/
public void populateWithMemberRoles(AutoCompletionList list) {
- list.add(TaggingPresets.getPresetRoles(), AutoCompletionPriority.IS_IN_STANDARD);
- list.add(getRoleCache(), AutoCompletionPriority.IS_IN_DATASET);
+ list.add(TaggingPresets.getPresetRoles().stream().map(r -> r.getKey())
+ .collect(Collectors.toList()), AutoCompletionPriority.IS_IN_STANDARD);
+ list.add(getAllMemberRoles().stream().map(role -> role.getKey())
+ .collect(Collectors.toSet()), AutoCompletionPriority.IS_IN_DATASET);
}
/**
@@ -292,9 +330,8 @@
Collection presets = r != null ? TaggingPresets.getMatchingPresets(null, r.getKeys(), false) : Collections.emptyList();
if (r != null && !Utils.isEmpty(presets)) {
for (TaggingPreset tp : presets) {
- if (tp.roles != null) {
- list.add(Utils.transform(tp.roles.roles, (Function) x -> x.key), AutoCompletionPriority.IS_IN_STANDARD);
- }
+ list.add(Utils.transform(tp.getAllRoles(),
+ (Function) x -> ((Role) x).getKey()), AutoCompletionPriority.IS_IN_STANDARD);
}
list.add(r.getMemberRoles(), AutoCompletionPriority.IS_IN_DATASET);
} else {
@@ -303,6 +340,186 @@
}
/**
+ * Merges two or more {@code Map}. The result will have the
+ * priorities merged.
+ *
+ * @param maps two or more maps to merge
+ * @return the merged map
+ */
+ @SafeVarargs
+ public static final Map merge(Map... maps) {
+ return Stream.of(maps).flatMap(m -> m.entrySet().stream())
+ .collect(Collectors.toMap(Entry::getKey, Entry::getValue, AutoCompletionPriority::mergeWith));
+ }
+
+ /**
+ * Returns key suggestions for a given relation type.
+ *
+ * Returns all keys in the dataset used on a given {@link #getRelationType(Map) relation type}.
+ *
+ * @param tags current tags in the tag editor panel, used to determine the relation type
+ * @return the suggestions
+ */
+ public Map getKeysForRelation(Map tags) {
+ Map map = new HashMap<>();
+ Set relations = tags != null ? getRelationCache().get(getRelationType(tags)) : getRelationCache().getAllValues();
+ if (relations == null)
+ return map;
+ return relations.stream().flatMap(rel -> rel.getKeys().entrySet().stream()).map(e -> e.getKey())
+ .collect(Collectors.toMap(k -> k, v -> AutoCompletionPriority.IS_IN_DATASET, AutoCompletionPriority::mergeWith));
+ }
+
+ /**
+ * Returns value suggestions for a given relation type and key.
+ *
+ * Returns all values in the dataset used with a given key on a given
+ * {@link #getRelationType(Map) relation type}.
+ *
+ * @param tags current tags in the tag editor panel, used to determine the relation type
+ * @param key the key to get values for
+ * @return the suggestions
+ */
+ public Map getValuesForRelation(Map tags, String key) {
+ Map map = new HashMap<>();
+ Set relations = tags != null ? getRelationCache().get(getRelationType(tags)) : getRelationCache().getAllValues();
+ if (relations == null)
+ return map;
+ return relations.stream().map(rel -> rel.get(key)).filter(e -> e != null)
+ .collect(Collectors.toMap(k -> k, v -> AutoCompletionPriority.IS_IN_DATASET, AutoCompletionPriority::mergeWith));
+ }
+
+ /**
+ * Returns role suggestions for a given relation type.
+ *
+ * Returns all roles in the dataset for a given {@link TaggingPresetType role type} used with a given
+ * {@link #getRelationType(Map) relation type}.
+ *
+ * @param tags current tags in the tag editor panel, used to determine the relation type
+ * @param roleTypes all roles returned will match all of the types in this set.
+ * @return the suggestions
+ */
+ public Map getRolesForRelation(Map tags, EnumSet roleTypes) {
+ Map map = new HashMap<>();
+ Set relations = tags != null ? getRelationCache().get(getRelationType(tags)) : getRelationCache().getAllValues();
+ if (relations == null)
+ return map;
+ return relations.stream().flatMap(rel -> rel.getMembers().stream())
+ .map(member -> mkRole(member)).filter(role -> role.appliesToAll(roleTypes))
+ .collect(Collectors.toMap(k -> k.getKey(), v -> AutoCompletionPriority.IS_IN_DATASET, AutoCompletionPriority::mergeWith));
+ }
+
+ /**
+ * Returns all presets of type {@code types} matched by {@code tags}.
+ *
+ * @param types the preset types to include, (node / way / relation ...) or null to include all types
+ * @param tags match presets using these tags or null to match all presets
+ * @return the matched presets
+ */
+ private Collection getPresets(Collection types, Map tags) {
+ if (tags == null)
+ tags = EMPTY_MAP;
+
+ Collection presets = TaggingPresets.getMatchingPresets(types, tags, false);
+ if (presets.isEmpty()) {
+ presets = TaggingPresets.getTaggingPresets();
+ }
+ return presets;
+ }
+
+ /**
+ * Returns all keys found in the presets matched by {@code tags}.
+ *
+ * @param types the preset types to include, (node / way / relation ...) or null to include all types
+ * @param tags match presets using these tags or null to match all presets
+ * @return the suggested keys
+ * @since xxx
+ */
+ public Map getPresetKeys(Collection types, Map tags) {
+ Map map = new HashMap<>();
+
+ for (TaggingPreset preset : getPresets(types, tags)) {
+ for (Item item : preset.getAllItems()) {
+ if (item instanceof KeyedItem) {
+ map.merge(((KeyedItem) item).getKey(), AutoCompletionPriority.IS_IN_STANDARD, AutoCompletionPriority::mergeWith);
+ }
+ }
+ }
+ return map;
+ }
+
+ /**
+ * Returns all values for {@code key} found in the presets matched by {@code tags}.
+ *
+ * @param types the preset types to include, (node / way / relation ...) or null to include all types
+ * @param tags match presets using these tags or null to match all presets
+ * @param key the key to return values for
+ * @return the suggested values
+ * @since xxx
+ */
+ public Map getPresetValues(Collection types, Map tags, String key) {
+ Map map = new HashMap<>();
+
+ for (TaggingPreset preset : getPresets(types, tags)) {
+ for (Item item : preset.getAllItems()) {
+ if (item instanceof KeyedItem) {
+ KeyedItem keyedItem = (KeyedItem) item;
+ if (keyedItem.getKey().equals(key)) {
+ for (String value : keyedItem.getValues()) {
+ map.merge(value, AutoCompletionPriority.IS_IN_STANDARD, AutoCompletionPriority::mergeWith);
+ }
+ }
+ }
+ }
+ }
+ return map;
+ }
+
+ /**
+ * Returns all roles found in the presets matched by {@code tags}.
+ *
+ * @param tags match presets using these tags or null to match all presets
+ * @param roleTypes the role types to include, (node / way / relation ...) or null to include all types
+ * @return the suggested roles
+ * @since xxx
+ */
+ public Map getPresetRoles(Map tags, Collection roleTypes) {
+ Map map = new HashMap<>();
+
+ for (TaggingPreset preset : getPresets(EnumSet.of(TaggingPresetType.RELATION), tags)) {
+ for (Role role : preset.getAllRoles()) {
+ if (role.appliesToAll(roleTypes))
+ map.merge(role.getKey(), AutoCompletionPriority.IS_IN_STANDARD, AutoCompletionPriority::mergeWith);
+ }
+ }
+ return map;
+ }
+
+ /**
+ * Returns all cached {@link AutoCompletionItem}s for given keys.
+ *
+ * @param keys retrieve the items for these keys
+ * @return the currently cached items, sorted by priority and alphabet
+ * @since 18221
+ */
+ public List getAllValuesForKeys(List keys) {
+ Map map = new HashMap<>();
+
+ for (String key : keys) {
+ for (String value : TaggingPresets.getPresetValues(key)) {
+ map.merge(value, AutoCompletionPriority.IS_IN_STANDARD, AutoCompletionPriority::mergeWith);
+ }
+ for (String value : getDataValues(key)) {
+ map.merge(value, AutoCompletionPriority.IS_IN_DATASET, AutoCompletionPriority::mergeWith);
+ }
+ for (String value : getUserInputValues(key)) {
+ map.merge(value, AutoCompletionPriority.UNKNOWN, AutoCompletionPriority::mergeWith);
+ }
+ }
+ return map.entrySet().stream().map(e -> new AutoCompletionItem(e.getKey(), e.getValue()))
+ .sorted(ALPHABETIC_COMPARATOR).collect(Collectors.toList());
+ }
+
+ /**
* Populates the an {@link AutoCompletionList} with the currently cached tag keys
*
* @param list the list to populate
@@ -345,30 +562,6 @@
}
/**
- * Returns all cached {@link AutoCompletionItem}s for given keys.
- *
- * @param keys retrieve the items for these keys
- * @return the currently cached items, sorted by priority and alphabet
- * @since 18221
- */
- public List getAllForKeys(List keys) {
- Map map = new HashMap<>();
-
- for (String key : keys) {
- for (String value : TaggingPresets.getPresetValues(key)) {
- map.merge(value, AutoCompletionPriority.IS_IN_STANDARD, AutoCompletionPriority::mergeWith);
- }
- for (String value : getDataValues(key)) {
- map.merge(value, AutoCompletionPriority.IS_IN_DATASET, AutoCompletionPriority::mergeWith);
- }
- for (String value : getUserInputValues(key)) {
- map.merge(value, AutoCompletionPriority.UNKNOWN, AutoCompletionPriority::mergeWith);
- }
- }
- return map.entrySet().stream().map(e -> new AutoCompletionItem(e.getKey(), e.getValue())).sorted().collect(Collectors.toList());
- }
-
- /**
* Returns the currently cached tag keys.
* @return a set of tag keys
* @since 12859
@@ -502,8 +695,8 @@
ds.removeDataSetListener(AutoCompletionManager.this);
MainApplication.getLayerManager().removeLayerChangeListener(this);
dirty = true;
- tagCache = null;
- roleCache = null;
+ TAG_CACHE.clear();
+ RELATION_CACHE.clear();
ds = null;
}
}
Index: src/org/openstreetmap/josm/gui/tagging/ac/DefaultAutoCompListener.java
===================================================================
--- src/org/openstreetmap/josm/gui/tagging/ac/DefaultAutoCompListener.java (nonexistent)
+++ src/org/openstreetmap/josm/gui/tagging/ac/DefaultAutoCompListener.java (working copy)
@@ -0,0 +1,62 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging.ac;
+
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
+
+/**
+ * A default autocompletion listener.
+ * @param the type of the {@code AutoCompComboBox} or {@code AutoCompTextField}
+ */
+public class DefaultAutoCompListener implements AutoCompListener, PopupMenuListener {
+ protected void updateAutoCompModel(AutoCompComboBoxModel model) {
+ }
+
+ @Override
+ public void autoCompBefore(AutoCompEvent e) {
+ AutoCompTextField tf = toTextField(e);
+ String savedText = tf.getText();
+ updateAutoCompModel(tf.getModel());
+ tf.setText(savedText);
+ }
+
+ @Override
+ public void autoCompPerformed(AutoCompEvent e) {
+ }
+
+ @Override
+ public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+ AutoCompComboBox cb = toComboBox(e);
+ String savedText = cb.getText();
+ updateAutoCompModel(cb.getModel());
+ cb.setText(savedText);
+ }
+
+ @Override
+ public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+ }
+
+ @Override
+ public void popupMenuCanceled(PopupMenuEvent e) {
+ }
+
+ /**
+ * Returns the AutoCompTextField that sent the request.
+ * @param e The AutoCompEvent
+ * @return the AutoCompTextField
+ */
+ @SuppressWarnings("unchecked")
+ public AutoCompTextField toTextField(AutoCompEvent e) {
+ return (AutoCompTextField) e.getSource();
+ }
+
+ /**
+ * Returns the AutoCompComboBox that sent the request.
+ * @param e The AutoCompEvent
+ * @return the AutoCompComboBox
+ */
+ @SuppressWarnings("unchecked")
+ public AutoCompComboBox toComboBox(PopupMenuEvent e) {
+ return (AutoCompComboBox) e.getSource();
+ }
+}
Index: src/org/openstreetmap/josm/gui/tagging/presets/Check.java
===================================================================
--- src/org/openstreetmap/josm/gui/tagging/presets/Check.java (nonexistent)
+++ src/org/openstreetmap/josm/gui/tagging/presets/Check.java (working copy)
@@ -0,0 +1,165 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging.presets;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import javax.swing.JPanel;
+
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmUtils;
+import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.gui.widgets.IconTextCheckBox;
+import org.openstreetmap.josm.gui.widgets.QuadStateCheckBox;
+import org.openstreetmap.josm.tools.GBC;
+
+/**
+ * Checkbox type.
+ */
+final class Check extends KeyedItem {
+
+ /** the value to set when checked (default is "yes") */
+ private final String valueOn;
+ /** the value to set when unchecked (default is "no") */
+ private final String valueOff;
+ /** whether the off value is disabled in the dialog, i.e., only unset or yes are provided */
+ private final boolean disableOff;
+ /** "on" or "off" or unset (default is unset) */
+ private final String default_; // only used for tagless objects
+
+ /**
+ * Private constructor. Use {@link #fromXML} instead.
+ * @param attributes the XML attributes
+ * @throws IllegalArgumentException on illegal attributes
+ */
+ private Check(Map attributes) throws IllegalArgumentException {
+ super(attributes);
+ valueOn = attributes.getOrDefault("value_on", OsmUtils.TRUE_VALUE);
+ valueOff = attributes.getOrDefault("value_off", OsmUtils.FALSE_VALUE);
+ disableOff = Boolean.parseBoolean(attributes.get("disable_off"));
+ default_ = attributes.get("default");
+ }
+
+ /**
+ * Create this class from an XML element's attributes.
+ * @param attributes the XML attributes
+ * @return the new instance
+ * @throws IllegalArgumentException on invalid attributes
+ */
+ public static Check fromXML(Map attributes) throws IllegalArgumentException {
+ return new Check(attributes);
+ }
+
+ @Override
+ boolean addToPanel(JPanel p, TaggingPresetInstance support) {
+
+ // find out if our key is already used in the selection.
+ final Usage usage = Usage.determineBooleanUsage(support.getSelected(), key);
+ final String oneValue = usage.map.isEmpty() ? null : usage.map.lastKey();
+ QuadStateCheckBox.State initialState;
+ Boolean def = "on".equals(default_) ? Boolean.TRUE : "off".equals(default_) ? Boolean.FALSE : null;
+
+ if (usage.map.size() < 2 && (oneValue == null || valueOn.equals(oneValue) || valueOff.equals(oneValue))) {
+ if (def != null && !PROP_FILL_DEFAULT.get()) {
+ // default is set and filling default values feature is disabled - check if all primitives are untagged
+ for (OsmPrimitive s : support.getSelected()) {
+ if (s.hasKeys()) {
+ def = null;
+ }
+ }
+ }
+
+ // all selected objects share the same value which is either true or false or unset,
+ // we can display a standard check box.
+ initialState = valueOn.equals(oneValue) || Boolean.TRUE.equals(def)
+ ? QuadStateCheckBox.State.SELECTED
+ : valueOff.equals(oneValue) || Boolean.FALSE.equals(def)
+ ? QuadStateCheckBox.State.NOT_SELECTED
+ : QuadStateCheckBox.State.UNSET;
+
+ } else {
+ def = null;
+ // the objects have different values, or one or more objects have something
+ // else than true/false. we display a quad-state check box
+ // in "partial" state.
+ initialState = QuadStateCheckBox.State.PARTIAL;
+ }
+
+ final List allowedStates = new ArrayList<>(4);
+ if (QuadStateCheckBox.State.PARTIAL == initialState)
+ allowedStates.add(QuadStateCheckBox.State.PARTIAL);
+ allowedStates.add(QuadStateCheckBox.State.SELECTED);
+ if (!disableOff || valueOff.equals(oneValue))
+ allowedStates.add(QuadStateCheckBox.State.NOT_SELECTED);
+ allowedStates.add(QuadStateCheckBox.State.UNSET);
+
+ QuadStateCheckBox check;
+ check = new QuadStateCheckBox(icon == null ? localeText : null, initialState,
+ allowedStates.toArray(new QuadStateCheckBox.State[0]));
+ check.setPropertyText(key);
+ check.setState(check.getState()); // to update the tooltip text
+ check.setComponentPopupMenu(getPopupMenu());
+
+ if (icon != null) {
+ JPanel checkPanel = IconTextCheckBox.wrap(check, localeText, getIcon());
+ checkPanel.applyComponentOrientation(support.getDefaultComponentOrientation());
+ p.add(checkPanel, GBC.eol()); // Do not fill, see #15104
+ } else {
+ check.applyComponentOrientation(support.getDefaultComponentOrientation());
+ p.add(check, GBC.eol()); // Do not fill, see #15104
+ }
+ Instance instance = new Instance(check, initialState, def);
+ support.putInstance(this, instance);
+ check.addChangeListener(l -> support.fireItemValueModified(instance, key, instance.getValue()));
+ return true;
+ }
+
+ class Instance extends Item.Instance {
+ private QuadStateCheckBox checkbox;
+ private QuadStateCheckBox.State originalState;
+ private Boolean def;
+
+ Instance(QuadStateCheckBox checkbox, QuadStateCheckBox.State originalState, Boolean def) {
+ this.checkbox = checkbox;
+ this.originalState = originalState;
+ this.def = def;
+ }
+
+ @Override
+ public void addCommands(List changedTags) {
+ // if the user hasn't changed anything, don't create a command.
+ if (def == null && (checkbox.getState() == originalState)) return;
+
+ // otherwise change things according to the selected value.
+ changedTags.add(new Tag(key, getValue()));
+ }
+
+ private String getValue() {
+ return checkbox.getState() == QuadStateCheckBox.State.SELECTED ? valueOn :
+ checkbox.getState() == QuadStateCheckBox.State.NOT_SELECTED ? valueOff :
+ null;
+ }
+ }
+
+ @Override
+ MatchType getDefaultMatch() {
+ return MatchType.NONE;
+ }
+
+ @Override
+ public Collection getValues() {
+ return disableOff ? Arrays.asList(valueOn) : Arrays.asList(valueOn, valueOff);
+ }
+
+ @Override
+ public String toString() {
+ return "Check [key=" + key + ", text=" + text + ", "
+ + (localeText != null ? "locale_text=" + localeText + ", " : "")
+ + (valueOn != null ? "value_on=" + valueOn + ", " : "")
+ + (valueOff != null ? "value_off=" + valueOff + ", " : "")
+ + "default_=" + default_ + ']';
+ }
+}
Index: src/org/openstreetmap/josm/gui/tagging/presets/CheckGroup.java
===================================================================
--- src/org/openstreetmap/josm/gui/tagging/presets/CheckGroup.java (nonexistent)
+++ src/org/openstreetmap/josm/gui/tagging/presets/CheckGroup.java (working copy)
@@ -0,0 +1,66 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging.presets;
+
+import java.awt.GridBagConstraints;
+import java.awt.GridLayout;
+import java.util.Map;
+
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+import org.openstreetmap.josm.tools.GBC;
+
+/**
+ * A group of {@link Check}s.
+ * @since 6114
+ */
+final class CheckGroup extends Container {
+ /**
+ * Number of columns (positive integer)
+ */
+ private final int columns;
+
+ /**
+ * Private constructor. Use {@link #fromXML} instead.
+ * @param attributes the XML attributes
+ * @throws IllegalArgumentException on illegal attributes
+ */
+ private CheckGroup(Map attributes) throws IllegalArgumentException {
+ super(attributes);
+ columns = Integer.parseInt(attributes.getOrDefault("columns", "1"));
+ }
+
+ /**
+ * Create this class from an XML element's attributes.
+ * @param attributes the XML attributes
+ * @return the new instance
+ * @throws IllegalArgumentException on illegal attributes
+ */
+ public static CheckGroup fromXML(Map attributes) throws IllegalArgumentException {
+ return new CheckGroup(attributes);
+ }
+
+ @Override
+ boolean addToPanel(JPanel p, TaggingPresetInstance support) {
+ int rows = (int) Math.ceil(items.size() / ((double) columns));
+ JPanel panel = new JPanel(new GridLayout(rows, columns));
+ addBorder(panel);
+
+ for (Item item : items) {
+ item.addToPanel(panel, support);
+ }
+ // fill remaining cells, see #20792
+ for (int i = items.size(); i < rows * columns; i++) {
+ panel.add(new JLabel());
+ }
+
+ panel.applyComponentOrientation(support.getDefaultComponentOrientation());
+ p.add(panel, GBC.eol().fill(GridBagConstraints.HORIZONTAL));
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ return "CheckGroup [columns=" + columns + ']';
+ }
+}
Index: src/org/openstreetmap/josm/gui/tagging/presets/Chunk.java
===================================================================
--- src/org/openstreetmap/josm/gui/tagging/presets/Chunk.java (nonexistent)
+++ src/org/openstreetmap/josm/gui/tagging/presets/Chunk.java (working copy)
@@ -0,0 +1,50 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging.presets;
+
+import java.util.Map;
+
+/**
+ * A collection of items to be inserted in place of a {@link Reference}.
+ */
+class Chunk extends Sequence {
+ private final String id;
+
+ /**
+ * Constructor.
+ * @param attributes the XML attributes
+ * @throws IllegalArgumentException on illegal attributes
+ */
+ Chunk(Map attributes) throws IllegalArgumentException {
+ super(attributes);
+ id = attributes.get("id");
+ }
+
+ /**
+ * Create a {@code Chunk} from an XML element's attributes.
+ * @param attributes the XML attributes
+ * @return the {@code Chunk}
+ * @throws IllegalArgumentException on invalid attributes
+ */
+ public static Chunk fromXML(Map attributes) throws IllegalArgumentException {
+ return new Chunk(attributes);
+ }
+
+ @Override
+ void fixup(Map chunks, Item parent) {
+ super.fixup(chunks, parent);
+ chunks.put(getId(), this);
+ }
+
+ /**
+ * Returns the chunk id.
+ * @return the chunk id
+ */
+ public String getId() {
+ return id;
+ }
+
+ @Override
+ public String toString() {
+ return "Chunk [id=" + id + "]";
+ }
+}
Index: src/org/openstreetmap/josm/gui/tagging/presets/CloneTaggingPresetHandler.java
===================================================================
--- src/org/openstreetmap/josm/gui/tagging/presets/CloneTaggingPresetHandler.java (nonexistent)
+++ src/org/openstreetmap/josm/gui/tagging/presets/CloneTaggingPresetHandler.java (working copy)
@@ -0,0 +1,54 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging.presets;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.openstreetmap.josm.command.ChangePropertyCommand;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.FilterModel;
+import org.openstreetmap.josm.data.osm.INode;
+import org.openstreetmap.josm.data.osm.IRelation;
+import org.openstreetmap.josm.data.osm.IWay;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
+
+/**
+ * A handler that clones a selection into a new dataset.
+ *
+ * Use this to apply temporary edits, eg. for the validator.
+ */
+public class CloneTaggingPresetHandler implements TaggingPresetHandler {
+ final DataSet ds = new DataSet();
+ final Collection selection;
+
+ /**
+ * Constructor
+ * @param selection the selection of primitives to edit
+ */
+ public CloneTaggingPresetHandler(Collection selection) {
+ Collection dependend = FilterModel.getAffectedPrimitives(selection);
+ Map clonedMap = ds.clonePrimitives(
+ new SubclassFilteredCollection<>(dependend, INode.class::isInstance),
+ new SubclassFilteredCollection<>(dependend, IWay.class::isInstance),
+ new SubclassFilteredCollection<>(dependend, IRelation.class::isInstance)
+ );
+ this.selection = selection.stream().map(p -> clonedMap.get(p)).collect(Collectors.toList());
+ }
+
+ @Override
+ public void updateTags(List changedTags) {
+ // we don't care about undo
+ for (Tag tag : changedTags) {
+ new ChangePropertyCommand(selection, tag.getKey(), tag.getValue()).executeCommand();
+ }
+ }
+
+ @Override
+ public Collection getPrimitives() {
+ return selection;
+ }
+}
Index: src/org/openstreetmap/josm/gui/tagging/presets/Combo.java
===================================================================
--- src/org/openstreetmap/josm/gui/tagging/presets/Combo.java (nonexistent)
+++ src/org/openstreetmap/josm/gui/tagging/presets/Combo.java (working copy)
@@ -0,0 +1,270 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging.presets;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Map;
+
+import javax.swing.AbstractAction;
+import javax.swing.JButton;
+import javax.swing.JColorChooser;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+import org.openstreetmap.josm.data.tagging.ac.AutoCompletionItem;
+import org.openstreetmap.josm.data.tagging.ac.AutoCompletionPriority;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.mappaint.mapcss.CSSColors;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBoxEditor;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBoxModel;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompTextField;
+import org.openstreetmap.josm.gui.widgets.JosmComboBox;
+import org.openstreetmap.josm.gui.widgets.OrientationAction;
+import org.openstreetmap.josm.tools.ColorHelper;
+import org.openstreetmap.josm.tools.GBC;
+
+/**
+ * Combobox type.
+ */
+final class Combo extends ComboMultiSelect {
+
+ /**
+ * Whether the combo box is editable, which means that the user can add other values as text.
+ * Default is {@code true}. If {@code false} it is readonly, which means that the user can only select an item in the list.
+ */
+ private final boolean editable;
+
+ /**
+ * Private constructor. Use {@link #fromXML} instead.
+ * @param attributes the XML attributes
+ * @throws IllegalArgumentException on illegal attributes
+ */
+ private Combo(Map attributes) throws IllegalArgumentException {
+ super(attributes);
+ editable = Boolean.parseBoolean(attributes.getOrDefault("editable", "true"));
+ }
+
+ /**
+ * Create this class from an XML element's attributes.
+ * @param attributes the XML attributes
+ * @return the new instance
+ * @throws IllegalArgumentException on invalid attributes
+ */
+ public static Combo fromXML(Map attributes) throws IllegalArgumentException {
+ return new Combo(attributes);
+ }
+
+ static class ComponentListener extends ComponentAdapter {
+ JosmComboBox combobox;
+
+ ComponentListener(JosmComboBox combobox) {
+ this.combobox = combobox;
+ }
+
+ @Override
+ public void componentResized(ComponentEvent e) {
+ // Make multi-line JLabels the correct size
+ // Only needed if there is any short_description
+ JComponent component = (JComponent) e.getSource();
+ int width = component.getWidth();
+ if (width == 0)
+ width = 200;
+ Insets insets = component.getInsets();
+ width -= insets.left + insets.right + 10;
+ PresetListEntry.CellRenderer renderer = (PresetListEntry.CellRenderer) combobox.getRenderer();
+ renderer.setWidth(width);
+ combobox.setRenderer(null); // needed to make prop change fire
+ combobox.setRenderer(renderer);
+ }
+ }
+
+ @Override
+ String getDefaultDelimiter() {
+ return ",";
+ }
+
+ private void addEntry(AutoCompComboBoxModel model, PresetListEntry.Instance instance) {
+ if (!seenValues.containsKey(instance.getValue())) {
+ model.addElement(instance);
+ seenValues.put(instance.getValue(), instance);
+ }
+ }
+
+ @Override
+ boolean addToPanel(JPanel p, TaggingPresetInstance support) {
+ Usage usage = Usage.determineTextUsage(support.getSelected(), key);
+ seenValues.clear();
+
+ // init the model
+ AutoCompComboBoxModel dropDownModel =
+ new AutoCompComboBoxModel<>(Comparator.naturalOrder());
+ JosmComboBox combobox = new JosmComboBox<>(dropDownModel);
+ Instance instance = new Instance(combobox, usage);
+
+ if (!usage.hasUniqueValue() && !usage.unused()) {
+ addEntry(dropDownModel, PresetListEntry.ENTRY_DIFFERENT.newInstance(instance));
+ }
+ presetListEntries.forEach(e -> addEntry(dropDownModel, e.newInstance(instance)));
+ if (default_ != null) {
+ addEntry(dropDownModel, new PresetListEntry(this, default_).newInstance(instance));
+ }
+ addEntry(dropDownModel, PresetListEntry.ENTRY_EMPTY.newInstance(instance));
+
+ usage.map.forEach((value, count) -> {
+ addEntry(dropDownModel, new PresetListEntry(this, value).newInstance(instance));
+ });
+
+ AutoCompComboBoxEditor editor = new AutoCompComboBoxEditor<>();
+ combobox.setEditor(editor);
+
+ // The default behaviour of JComboBox is to size the editor according to the tallest item in
+ // the dropdown list. We don't want that to happen because we want to show taller items in
+ // the list than in the editor. We can't use
+ // {@code combobox.setPrototypeDisplayValue(PresetListEntry.ENTRY_EMPTY);} because that would
+ // set a fixed cell height in JList.
+ combobox.setPreferredHeight(combobox.getPreferredSize().height);
+
+ // a custom cell renderer capable of displaying a short description text along with the
+ // value
+ combobox.setRenderer(new PresetListEntry.CellRenderer(combobox, combobox.getRenderer(), 200));
+ combobox.setEditable(editable);
+
+ AutoCompComboBoxModel autoCompModel;
+ autoCompModel = new AutoCompComboBoxModel<>(Comparator.naturalOrder());
+ TaggingPresetUtils.getAllForKeys(Arrays.asList(key)).forEach(autoCompModel::addElement);
+ getDisplayValues().forEach(s -> autoCompModel.addElement(new AutoCompletionItem(s, AutoCompletionPriority.IS_IN_STANDARD)));
+
+ AutoCompTextField tf = editor.getEditorComponent();
+ tf.setModel(autoCompModel);
+
+ if (Item.DISPLAY_KEYS_AS_HINT.get()) {
+ combobox.setHint(key);
+ }
+ if (length > 0) {
+ tf.setMaxTextLength(length);
+ }
+
+ support.putInstance(this, instance);
+
+ JLabel label = addLabel(p);
+
+ if (key != null && ("colour".equals(key) || key.startsWith("colour:") || key.endsWith(":colour"))) {
+ p.add(combobox, GBC.std().fill(GridBagConstraints.HORIZONTAL));
+ JButton button = new JButton(new ChooseColorAction(instance));
+ button.setOpaque(true);
+ button.setBorderPainted(false);
+ Dimension size = combobox.getPreferredSize();
+ button.setPreferredSize(new Dimension(size.height, size.height));
+ button.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+ p.add(button, GBC.eol());
+ ActionListener updateColor = ignore -> button.setBackground(instance.getColor());
+ updateColor.actionPerformed(null);
+ combobox.addActionListener(updateColor);
+ } else {
+ p.add(combobox, GBC.eol().fill(GridBagConstraints.HORIZONTAL));
+ }
+
+ String initialValue = instance.getInitialValue(usage, support);
+ PresetListEntry.Instance selItem = instance.find(initialValue);
+ if (selItem != null) {
+ combobox.setSelectedItem(selItem);
+ } else {
+ combobox.setText(initialValue);
+ }
+
+ combobox.addActionListener(l -> support.fireItemValueModified(instance, key, instance.getSelectedItem().getValue()));
+ combobox.addComponentListener(new ComponentListener(combobox));
+
+ label.setLabelFor(combobox);
+ combobox.setToolTipText(getKeyTooltipText());
+ combobox.applyComponentOrientation(OrientationAction.getValueOrientation(key));
+
+ seenValues.clear();
+ return true;
+ }
+
+ class Instance extends ComboMultiSelect.Instance {
+ JosmComboBox combobox;
+
+ Instance(JosmComboBox combobox, Usage usage) {
+ super(usage);
+ this.combobox = combobox;
+ }
+
+ /**
+ * Returns the value selected in the combobox or a synthetic value if a multiselect.
+ *
+ * @return the value
+ */
+ @Override
+ PresetListEntry.Instance getSelectedItem() {
+ Object sel = combobox.getSelectedItem();
+ if (sel instanceof PresetListEntry.Instance)
+ // selected from the dropdown
+ return (PresetListEntry.Instance) sel;
+ if (sel instanceof String) {
+ // free edit. If the free edit corresponds to a known entry, use that entry. This is
+ // to avoid that we write a display_value to the tag's value, eg. if the user did an
+ // undo.
+ PresetListEntry.Instance selItem = find((String) sel);
+ if (selItem != null)
+ return selItem;
+ return new PresetListEntry(Combo.this, (String) sel).newInstance(this);
+ }
+ return PresetListEntry.ENTRY_EMPTY.newInstance(this);
+ }
+
+ /**
+ * Finds the PresetListEntry that matches value.
+ *
+ * Looks in the model of the combobox for an element whose {@code value} matches {@code value}.
+ *
+ * @param value The value to match.
+ * @return The entry or null
+ */
+ PresetListEntry.Instance find(String value) {
+ return combobox.getModel().asCollection().stream().filter(o -> o.getValue().equals(value)).findAny().orElse(null);
+ }
+
+ void setColor(Color color) {
+ if (color != null) {
+ combobox.setSelectedItem(ColorHelper.color2html(color));
+ }
+ }
+
+ Color getColor() {
+ String colorString = getSelectedItem().getValue();
+ return colorString.startsWith("#")
+ ? ColorHelper.html2color(colorString)
+ : CSSColors.get(colorString);
+ }
+ }
+
+ static class ChooseColorAction extends AbstractAction {
+ private Instance instance;
+
+ ChooseColorAction(Instance instance) {
+ this.instance = instance;
+ putValue(SHORT_DESCRIPTION, tr("Choose a color"));
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ Color color = instance.getColor();
+ color = JColorChooser.showDialog(MainApplication.getMainPanel(), tr("Choose a color"), color);
+ instance.setColor(color);
+ }
+ }
+}
Index: src/org/openstreetmap/josm/gui/tagging/presets/ComboMultiSelect.java
===================================================================
--- src/org/openstreetmap/josm/gui/tagging/presets/ComboMultiSelect.java (nonexistent)
+++ src/org/openstreetmap/josm/gui/tagging/presets/ComboMultiSelect.java (working copy)
@@ -0,0 +1,342 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging.presets;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.gui.widgets.OrientationAction;
+import org.openstreetmap.josm.tools.AlphanumComparator;
+import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Logging;
+
+/**
+ * Abstract superclass for combo box and multi-select list types.
+ */
+public abstract class ComboMultiSelect extends KeyedItem {
+ /** The context used for translating values */
+ final String valuesContext;
+ /** Disabled internationalisation for value to avoid mistakes, see #11696 */
+ final boolean valuesNoI18n;
+ /** The default value for the item. If not specified, the current value of the key is chosen as default (if applicable).*/
+ final String default_;
+ /** Whether to sort the values, defaults to true. */
+ private final boolean valuesSort;
+ /** Whether to offer display values for search via {@link TaggingPresetSelector} */
+ private final boolean valuesSearchable;
+ /**
+ * The character that separates values.
+ * In case of {@link Combo} the default is comma.
+ */
+ final char delimiter;
+
+ /**
+ * The standard entries in the combobox dropdown or multiselect list. These entries are defined
+ * in {@code defaultpresets.xml} (or in other custom preset files).
+ */
+ final List presetListEntries = new ArrayList<>();
+
+ /** Helps avoid duplicate list entries */
+ final Map seenValues = new HashMap<>();
+
+ private Set valuesSet;
+ private Set displayValuesSet = new HashSet<>();
+
+ /**
+ * Constructor.
+ * @param attributes the XML attributes
+ * @throws IllegalArgumentException on illegal attributes
+ */
+ ComboMultiSelect(Map attributes) throws IllegalArgumentException {
+ super(attributes);
+ valuesContext = attributes.get("values_context");
+ valuesNoI18n = TaggingPresetUtils.parseBoolean(attributes.get("values_no_i18n"));
+ valuesSort = TaggingPresetUtils.parseBoolean(attributes.getOrDefault("values_sort", "on"));
+ valuesSearchable = TaggingPresetUtils.parseBoolean(attributes.get("values_searchable"));
+ default_ = attributes.get("default");
+ delimiter = attributes.getOrDefault("delimiter", getDefaultDelimiter()).charAt(0);
+
+ initPresetListEntries(attributes);
+ }
+
+ @Override
+ void endElement() {
+ super.endElement();
+ if (valuesSort && TaggingPresets.SORT_VALUES.get()) {
+ Collections.sort(presetListEntries,
+ (a, b) -> AlphanumComparator.getInstance().compare(a.getDisplayValue(this), b.getDisplayValue(this)));
+ }
+ valuesSet = presetListEntries.stream().map(PresetListEntry::getValue).collect(Collectors.toSet());
+ if (valuesSearchable) {
+ displayValuesSet = presetListEntries.stream().map(e -> e.getDisplayValue(this)).collect(Collectors.toSet());
+ }
+ }
+
+ @Override
+ public Set getValues() {
+ return valuesSet;
+ }
+
+ /**
+ * Returns the values to display.
+ * @return the values to display
+ */
+ public Set getDisplayValues() {
+ return displayValuesSet;
+ }
+
+ /**
+ * Returns the default delimiter used in multi-value attributes.
+ * @return the default delimiter
+ */
+ abstract String getDefaultDelimiter();
+
+ /**
+ * Adds the label to the panel
+ *
+ * @param p the panel
+ * @return the label
+ */
+ JLabel addLabel(JPanel p) {
+ final JLabel label = new JLabel(tr("{0}:", localeText));
+ addIcon(label);
+ label.setToolTipText(getKeyTooltipText());
+ label.setComponentPopupMenu(getPopupMenu());
+ label.applyComponentOrientation(OrientationAction.getDefaultComponentOrientation());
+ p.add(label, GBC.std().insets(0, 0, 10, 0));
+ return label;
+ }
+
+ private List getValuesFromCode(String valuesFrom) {
+ // get the values from a Java function
+ String[] classMethod = valuesFrom.split("#", -1);
+ if (classMethod.length == 2) {
+ try {
+ Method method = Class.forName(classMethod[0]).getMethod(classMethod[1]);
+ // ComboMultiSelect method is public static String[] methodName()
+ int mod = method.getModifiers();
+ if (Modifier.isPublic(mod) && Modifier.isStatic(mod)
+ && method.getReturnType().equals(String[].class) && method.getParameterTypes().length == 0) {
+ return Arrays.asList((String[]) method.invoke(null));
+ } else {
+ Logging.error(tr("Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' is not \"{2}\"", key, text,
+ "public static String[] methodName()"));
+ }
+ } catch (ReflectiveOperationException e) {
+ Logging.error(tr("Broken tagging preset \"{0}-{1}\" - Java method given in ''values_from'' threw {2} ({3})", key, text,
+ e.getClass().getName(), e.getMessage()));
+ Logging.debug(e);
+ }
+ }
+ return null; // NOSONAR
+ }
+
+ /**
+ * Checks if list {@code a} is either null or the same length as list {@code b}.
+ *
+ * @param a The list to check
+ * @param b The other list
+ * @param name The name of the list for error reporting
+ * @return {@code a} if both lists have the same length or {@code null}
+ */
+ private List checkListsSameLength(List a, List b, String name) {
+ if (a != null && a.size() != b.size()) {
+ Logging.error(tr("Broken tagging preset \"{0}-{1}\" - number of items in ''{2}'' must be the same as in ''values''",
+ key, text, name));
+ Logging.error(tr("Detailed information: {0} <> {1}", a, b));
+ return null; // NOSONAR
+ }
+ return a;
+ }
+
+ private void initPresetListEntries(Map attributes) {
+ /**
+ * A list of entries.
+ * The list has to be separated by commas (for the {@link Combo} box) or by the specified delimiter (for the {@link MultiSelect}).
+ * If a value contains the delimiter, the delimiter may be escaped with a backslash.
+ * If a value contains a backslash, it must also be escaped with a backslash. */
+ final String values = attributes.get("values");
+ /**
+ * To use instead of {@link #values} if the list of values has to be obtained with a Java method of this form:
+ * {@code public static String[] getValues();}
+ * The value must be: {@code full.package.name.ClassName#methodName}.
+ */
+ final String valuesFrom = attributes.get("values_from");
+ /**
+ * A list of entries that is displayed to the user.
+ * Must be the same number and order of entries as {@link #values} and editable must be false or not specified.
+ * For the delimiter character and escaping, see the remarks at {@link #values}.
+ */
+ final String displayValues = attributes.get("display_values");
+ /** The localized version of {@link #displayValues}. */
+ final String localeDisplayValues = attributes.get("locale_display_values");
+ /**
+ * A delimiter-separated list of texts to be displayed below each {@code display_value}.
+ * (Only if it is not possible to describe the entry in 2-3 words.)
+ * Instead of comma separated list instead using {@link #values}, {@link #displayValues} and {@link #shortDescriptions},
+ * the following form is also supported:
+ * {@code }
+ */
+ final String shortDescriptions = attributes.get("short_descriptions");
+ /** The localized version of {@link #shortDescriptions}. */
+ final String localeShortDescriptions = attributes.get("locale_short_descriptions");
+
+ List valueList = null;
+ List displayList = null;
+ List localeDisplayList = null;
+
+ if (valuesFrom != null) {
+ valueList = getValuesFromCode(valuesFrom);
+ }
+
+ if (valueList == null) {
+ // get from {@code values} attribute
+ valueList = TaggingPresetUtils.splitEscaped(delimiter, values);
+ }
+ if (valueList == null) {
+ return;
+ }
+
+ if (!valuesNoI18n) {
+ localeDisplayList = TaggingPresetUtils.splitEscaped(delimiter, localeDisplayValues);
+ displayList = TaggingPresetUtils.splitEscaped(delimiter, displayValues);
+ }
+ List localeShortDescriptionsList = TaggingPresetUtils.splitEscaped(delimiter, localeShortDescriptions);
+ List shortDescriptionsList = TaggingPresetUtils.splitEscaped(delimiter, shortDescriptions);
+
+ displayList = checkListsSameLength(displayList, valueList, "display_values");
+ localeDisplayList = checkListsSameLength(localeDisplayList, valueList, "locale_display_values");
+ shortDescriptionsList = checkListsSameLength(shortDescriptionsList, valueList, "short_descriptions");
+ localeShortDescriptionsList = checkListsSameLength(localeShortDescriptionsList, valueList, "locale_short_descriptions");
+
+ for (int i = 0; i < valueList.size(); i++) {
+ Map attribs = new HashMap<>();
+ attribs.put("value", valueList.get(i));
+ if (displayList != null)
+ attribs.put("display_value", displayList.get(i));
+ if (localeDisplayList != null)
+ attribs.put("locale_display_value", localeDisplayList.get(i));
+ if (shortDescriptionsList != null)
+ attribs.put("short_description", shortDescriptionsList.get(i));
+ if (localeShortDescriptionsList != null)
+ attribs.put("locale_short_description", localeShortDescriptionsList.get(i));
+ addItem(PresetListEntry.fromXML(attribs));
+ }
+ }
+
+ abstract class Instance extends Item.Instance {
+ /**
+ * Used to determine if the user has edited the value. This is not the same as the initial value
+ * shown in the component. The original value is the state of the data before the edit. The initial
+ * value may already be an edit suggested by the software.
+ */
+ String originalValue;
+ Usage usage;
+
+ Instance(Usage usage) {
+ this.usage = usage;
+ }
+
+ ComboMultiSelect getTemplate() {
+ return ComboMultiSelect.this;
+ }
+
+ @Override
+ public void addCommands(List changedTags) {
+ String value = getSelectedItem().getValue();
+
+ // no change if same as before
+ if (value.equals(originalValue))
+ return;
+ changedTags.add(new Tag(key, value));
+
+ if (isUseLastAsDefault()) {
+ LAST_VALUES.put(key, value);
+ }
+ }
+
+ /**
+ * Returns the value selected in the combobox or a synthetic value if a multiselect.
+ *
+ * @return the value
+ */
+ abstract PresetListEntry.Instance getSelectedItem();
+
+ /**
+ * Returns the initial value to use for this preset.
+ *
+ * The initial value is the value shown in the control when the preset dialog opens. For a
+ * discussion of all the options see the enclosed tickets.
+ *
+ * @param usage The key Usage
+ * @param support The support
+ * @return The initial value to use.
+ *
+ * @see "https://josm.openstreetmap.de/ticket/5564"
+ * @see "https://josm.openstreetmap.de/ticket/12733"
+ * @see "https://josm.openstreetmap.de/ticket/17324"
+ */
+ String getInitialValue(Usage usage, TaggingPresetInstance support) {
+ String initialValue = null;
+ originalValue = "";
+
+ if (usage.hasUniqueValue()) {
+ // all selected primitives have the same not empty value for this key
+ initialValue = usage.getFirst();
+ originalValue = initialValue;
+ } else if (!usage.unused()) {
+ // at least one primitive has a value for this key (but not all have the same one)
+ initialValue = DIFFERENT;
+ originalValue = initialValue;
+ } else if (!usage.hadKeys() || isForceUseLastAsDefault() || PROP_FILL_DEFAULT.get()) {
+ // at this point no primitive had any value for this key
+ if (!support.isPresetInitiallyMatches() && isUseLastAsDefault() && LAST_VALUES.containsKey(key)) {
+ initialValue = LAST_VALUES.get(key);
+ } else {
+ initialValue = default_;
+ }
+ }
+ return initialValue != null ? initialValue : "";
+ }
+ }
+
+ /**
+ * Adds a preset list entry.
+ * @param e list entry to add
+ */
+ @Override
+ void addItem(Item e) {
+ if (e instanceof PresetListEntry)
+ presetListEntries.add((PresetListEntry) e);
+ }
+
+ /**
+ * Adds a collection of preset list entries.
+ * @param e list entries to add
+ */
+ void addListEntries(Collection e) {
+ for (PresetListEntry i : e) {
+ addItem(i);
+ }
+ }
+
+ @Override
+ MatchType getDefaultMatch() {
+ return MatchType.NONE;
+ }
+}
Index: src/org/openstreetmap/josm/gui/tagging/presets/Container.java
===================================================================
--- src/org/openstreetmap/josm/gui/tagging/presets/Container.java (nonexistent)
+++ src/org/openstreetmap/josm/gui/tagging/presets/Container.java (working copy)
@@ -0,0 +1,85 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging.presets;
+
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.util.Map;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.border.Border;
+import javax.swing.border.CompoundBorder;
+
+import org.openstreetmap.josm.tools.GBC;
+
+/**
+ * A sequence of {@link Item}s in a panel. The panel may have a title and border.
+ */
+public class Container extends Sequence {
+ /** The text to display */
+ final String text;
+ /** The context used for translating {@link #text} */
+ final String textContext;
+ /** The localized version of {@link #text} */
+ final String localeText;
+
+ /**
+ * Constructor.
+ * @param attributes the XML attributes
+ * @throws IllegalArgumentException on illegal attributes
+ */
+ Container(Map attributes) throws IllegalArgumentException {
+ super(attributes);
+ String t = attributes.get("text");
+ text = t != null ? t : getDefaultText();
+ textContext = attributes.get("text_context");
+ localeText = TaggingPresetUtils.buildLocaleString(attributes.get("locale_text"), text, textContext);
+ }
+
+ /**
+ * Create this class from an XML element's attributes.
+ * @param attributes the XML attributes
+ * @return the new instance
+ * @throws IllegalArgumentException on illegal attributes
+ */
+ public static Container fromXML(Map attributes) throws IllegalArgumentException {
+ return new Container(attributes);
+ }
+
+ String getDefaultText() {
+ return null;
+ }
+
+ void addBorder(JPanel panel) {
+ Border margin = BorderFactory.createEmptyBorder(10, 0, 0, 0);
+ if (localeText != null) {
+ Border border = BorderFactory.createTitledBorder(localeText);
+ Border padding = BorderFactory.createEmptyBorder(10, 10, 10, 10);
+ margin = new CompoundBorder(margin, new CompoundBorder(border, padding));
+ }
+ panel.setBorder(margin);
+ }
+
+ JPanel getPanel() {
+ JPanel panel = new JPanel(new GridBagLayout());
+ addBorder(panel);
+ return panel;
+ }
+
+ @Override
+ boolean addToPanel(JPanel p, TaggingPresetInstance support) {
+ if (items.isEmpty())
+ // do not add an empty panel
+ return false;
+ JPanel panel = getPanel();
+ super.addToPanel(panel, support);
+ panel.applyComponentOrientation(support.getDefaultComponentOrientation());
+ p.add(panel, GBC.eol().fill(GridBagConstraints.HORIZONTAL));
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ return "Container";
+ }
+}
Index: src/org/openstreetmap/josm/gui/tagging/presets/DataSetTaggingPresetHandler.java
===================================================================
--- src/org/openstreetmap/josm/gui/tagging/presets/DataSetTaggingPresetHandler.java (nonexistent)
+++ src/org/openstreetmap/josm/gui/tagging/presets/DataSetTaggingPresetHandler.java (working copy)
@@ -0,0 +1,62 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging.presets;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.openstreetmap.josm.command.ChangePropertyCommand;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.tools.StreamUtils;
+
+/**
+ * A TaggingPresetHandler that operates on a DataSet.
+ */
+public class DataSetTaggingPresetHandler implements TaggingPresetHandler {
+ Collection selection;
+
+ DataSetTaggingPresetHandler(DataSet dataSet) {
+ this.selection = dataSet.getSelected();
+ }
+
+ /**
+ * Constructor
+ * @param selection the selection of primitives to edit
+ */
+ public DataSetTaggingPresetHandler(Collection selection) {
+ this.selection = selection;
+ }
+
+ @Override
+ public void updateTags(List changedTags) {
+ Command cmd = createCommand(selection, changedTags);
+ if (cmd != null) {
+ UndoRedoHandler.getInstance().add(cmd);
+ }
+ }
+
+ @Override
+ public Collection getPrimitives() {
+ return selection;
+ }
+
+ /**
+ * Create a command to change the given list of tags.
+ * @param sel The primitives to change the tags for
+ * @param changedTags The tags to change
+ * @return A command that changes the tags.
+ */
+ public static Command createCommand(Collection sel, List