Changeset 14634 in josm for trunk/src

Timestamp:

2019-01-04T21:41:53+01:00 (6 years ago)

Author:

simon04

Message:

fix #17170 - Migrate TagInfoExtract.groovy to Java

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• preferences/map/TaggingPresetPreference.java (modified) (1 diff)
• tagging/presets/items/KeyedItem.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java

@@ -182 +182 @@
     }
 
-    static class TaggingPresetSourceEditor extends SourceEditor {
+    public static class TaggingPresetSourceEditor extends SourceEditor {
 
         private static final String ICONPREF = "taggingpreset.icon.sources";
 
-        TaggingPresetSourceEditor() {
+        public TaggingPresetSourceEditor() {
             super(SourceType.TAGGING_PRESET, Config.getUrls().getJOSMWebsite()+"/presets", presetSourceProviders, true);
         }

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/KeyedItem.java

@@ -163 +163 @@
         }
         return returnValue;
+    }
+
+    /**
+     * Determines whether key or key+value are required.
+     * @return whether key or key+value are required
+     */
+    public boolean isKeyRequired() {
+        final MatchType type = MatchType.ofString(match);
+        return MatchType.KEY_REQUIRED.equals(type) || MatchType.KEY_VALUE_REQUIRED.equals(type);
     }