Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 12041) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 12042) @@ -69,6 +69,6 @@ /** Normalized keys: the key should be substituted by the value if the key was not found in presets */ private static final Map harmonizedKeys = new HashMap<>(); - /** The spell check preset values */ - private static volatile MultiMap presetsValueData; + /** The spell check preset values which are not stored in TaggingPresets */ + private static volatile MultiMap additionalPresetsValueData; /** The TagChecker data */ private static final List checkerData = new ArrayList<>(); @@ -259,12 +259,12 @@ Collection presets = TaggingPresets.getTaggingPresets(); if (!presets.isEmpty()) { - presetsValueData = new MultiMap<>(); + additionalPresetsValueData = new MultiMap<>(); for (String a : OsmPrimitive.getUninterestingKeys()) { - presetsValueData.putVoid(a); + additionalPresetsValueData.putVoid(a); } // TODO directionKeys are no longer in OsmPrimitive (search pattern is used instead) for (String a : Main.pref.getCollection(ValidatorPreference.PREFIX + ".knownkeys", Arrays.asList(new String[]{"is_in", "int_ref", "fixme", "population"}))) { - presetsValueData.putVoid(a); + additionalPresetsValueData.putVoid(a); } for (TaggingPreset p : presets) { @@ -285,5 +285,4 @@ Collection values = ky.getValues(); if (ky.key != null && values != null) { - presetsValueData.putAll(ky.key, values); harmonizedKeys.put(harmonizeKey(ky.key), ky.key); } @@ -305,4 +304,11 @@ } + private static Set getPresetValues(String key) { + Set res = TaggingPresets.getPresetValues(key); + if (res != null) + return res; + return additionalPresetsValueData.get(key); + } + /** * Determines if the given key is in internal presets. @@ -312,5 +318,5 @@ */ public static boolean isKeyInPresets(String key) { - return presetsValueData.get(key) != null; + return getPresetValues(key) != null; } @@ -323,5 +329,5 @@ */ public static boolean isTagInPresets(String key, String value) { - final Set values = presetsValueData.get(key); + final Set values = getPresetValues(key); return values != null && (values.isEmpty() || values.contains(value)); } @@ -462,5 +468,6 @@ withErrors.put(p, "HTML"); } - if (checkValues && key != null && value != null && !value.isEmpty() && presetsValueData != null && !isTagIgnored(key, value)) { + if (checkValues && key != null && value != null && !value.isEmpty() && additionalPresetsValueData != null + && !isTagIgnored(key, value)) { if (!isKeyInPresets(key)) { String prettifiedKey = harmonizeKey(key); @@ -487,5 +494,5 @@ // try to fix common typos and check again if value is still unknown String fixedValue = harmonizeValue(prop.getValue()); - Map possibleValues = getPossibleValues(presetsValueData.get(key)); + Map possibleValues = getPossibleValues(getPresetValues(key)); if (possibleValues.containsKey(fixedValue)) { final String newKey = possibleValues.get(fixedValue); Index: /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java (revision 12041) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java (revision 12042) @@ -29,9 +29,5 @@ import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent; import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset; -import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItem; import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets; -import org.openstreetmap.josm.gui.tagging.presets.items.CheckGroup; -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.CheckParameterUtil; @@ -203,36 +199,4 @@ /** - * Initialize the cache for presets. This is done only once. - * @param presets Tagging presets to cache - */ - public static void cachePresets(Collection presets) { - for (final TaggingPreset p : presets) { - for (TaggingPresetItem item : p.data) { - cachePresetItem(p, item); - } - } - } - - protected static void cachePresetItem(TaggingPreset p, TaggingPresetItem item) { - if (item instanceof KeyedItem) { - KeyedItem ki = (KeyedItem) item; - if (ki.key != null && ki.getValues() != null) { - PRESET_TAG_CACHE.putAll(ki.key, ki.getValues()); - } - } else if (item instanceof Roles) { - Roles r = (Roles) item; - for (Role i : r.roles) { - if (i.key != null) { - PRESET_ROLE_CACHE.add(i.key); - } - } - } else if (item instanceof CheckGroup) { - for (KeyedItem check : ((CheckGroup) item).checks) { - cachePresetItem(p, check); - } - } - } - - /** * Remembers user input for the given key/value. * @param key Tag key @@ -253,8 +217,4 @@ protected List getDataKeys() { return new ArrayList<>(getTagCache().keySet()); - } - - protected List getPresetKeys() { - return new ArrayList<>(PRESET_TAG_CACHE.keySet()); } @@ -281,8 +241,4 @@ } - protected static List getPresetValues(String key) { - return new ArrayList<>(PRESET_TAG_CACHE.getValues(key)); - } - protected static Collection getUserInputValues(String key) { List values = new ArrayList<>(); @@ -312,5 +268,5 @@ */ public void populateWithMemberRoles(AutoCompletionList list) { - list.add(PRESET_ROLE_CACHE, AutoCompletionItemPriority.IS_IN_STANDARD); + list.add(TaggingPresets.getPresetRoles(), AutoCompletionItemPriority.IS_IN_STANDARD); list.add(getRoleCache(), AutoCompletionItemPriority.IS_IN_DATASET); } @@ -347,5 +303,5 @@ */ public void populateWithKeys(AutoCompletionList list) { - list.add(getPresetKeys(), AutoCompletionItemPriority.IS_IN_STANDARD); + list.add(TaggingPresets.getPresetKeys(), AutoCompletionItemPriority.IS_IN_STANDARD); list.add(new AutoCompletionListItem("source", AutoCompletionItemPriority.IS_IN_STANDARD)); list.add(getDataKeys(), AutoCompletionItemPriority.IS_IN_DATASET); @@ -373,5 +329,5 @@ public void populateWithTagValues(AutoCompletionList list, List keys) { for (String key : keys) { - list.add(getPresetValues(key), AutoCompletionItemPriority.IS_IN_STANDARD); + list.add(TaggingPresets.getPresetValues(key), AutoCompletionItemPriority.IS_IN_STANDARD); list.add(getDataValues(key), AutoCompletionItemPriority.IS_IN_DATASET); list.addUserInput(getUserInputValues(key)); Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java (revision 12041) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java (revision 12042) @@ -4,6 +4,9 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; +import java.util.Set; import javax.swing.JMenu; @@ -14,5 +17,9 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.gui.MenuScroller; -import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager; +import org.openstreetmap.josm.gui.tagging.presets.items.CheckGroup; +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.MultiMap; import org.openstreetmap.josm.tools.SubclassFilteredCollection; @@ -26,4 +33,9 @@ private static final Collection taggingPresets = new ArrayList<>(); + /** cache for key/value pairs found in the preset */ + private static final MultiMap PRESET_TAG_CACHE = new MultiMap<>(); + /** cache for roles found in the preset */ + private static final Set PRESET_ROLE_CACHE = new HashSet<>(); + /** The collection of listeners */ private static final Collection listeners = new ArrayList<>(); @@ -39,4 +51,5 @@ taggingPresets.clear(); taggingPresets.addAll(TaggingPresetReader.readFromPreferences(false, false)); + cachePresets(taggingPresets); } @@ -54,5 +67,4 @@ Main.main.menu.presetsMenu.setVisible(false); } else { - AutoCompletionManager.cachePresets(taggingPresets); Map submenus = new HashMap<>(); for (final TaggingPreset p : taggingPresets) { @@ -88,9 +100,73 @@ /** + * Initialize the cache for presets. This is done only once. + * @param presets Tagging presets to cache + */ + private static void cachePresets(Collection presets) { + for (final TaggingPreset p : presets) { + for (TaggingPresetItem item : p.data) { + cachePresetItem(p, item); + } + } + } + + private static void cachePresetItem(TaggingPreset p, TaggingPresetItem item) { + if (item instanceof KeyedItem) { + KeyedItem ki = (KeyedItem) item; + if (ki.key != null && ki.getValues() != null) { + try { + PRESET_TAG_CACHE.putAll(ki.key, ki.getValues()); + } catch (NullPointerException e) { + Main.error(e, p + ": Unable to cache " + ki); + } + } + } else if (item instanceof Roles) { + Roles r = (Roles) item; + for (Role i : r.roles) { + if (i.key != null) { + PRESET_ROLE_CACHE.add(i.key); + } + } + } else if (item instanceof CheckGroup) { + for (KeyedItem check : ((CheckGroup) item).checks) { + cachePresetItem(p, check); + } + } + } + + /** * Replies a new collection containing all tagging presets. * @return a new collection containing all tagging presets. Empty if presets are not initialized (never null) */ public static Collection getTaggingPresets() { - return new ArrayList<>(taggingPresets); + return Collections.unmodifiableCollection(taggingPresets); + } + + /** + * Replies a set of all roles in the tagging presets. + * @return a set of all roles in the tagging presets. + */ + public static Set getPresetRoles() { + return Collections.unmodifiableSet(PRESET_ROLE_CACHE); + } + + /** + * Replies a set of all keys in the tagging presets. + * @return a set of all keys in the tagging presets. + */ + public static Set getPresetKeys() { + return Collections.unmodifiableSet(PRESET_TAG_CACHE.keySet()); + } + + /** + * Return set of values for a key in the tagging presets + * @param key the key + * @return set of values for a key in the tagging presets or null if none is found + */ + public static Set getPresetValues(String key) { + Set values = PRESET_TAG_CACHE.get(key); + if (values != null) + return Collections.unmodifiableSet(values); + return null; }