Changeset 9266 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

Timestamp:

2016-01-02T18:51:06+01:00 (8 years ago)

Author:

simon04

Message:

Refactoring: move getMatchingPresets to TaggingPresets and add some Javadoc

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -296 +296 @@
     }
 
+    /**
+     * Determines whether a dialog can be shown for this preset, i.e., at least one tag can/must be set by the user.
+     *
+     * @return {@code true} if a dialog can be shown for this preset
+     */
     public boolean isShowable() {
         for (TaggingPresetItem i : data) {
@@ -503 +508 @@
     }
 
-    @Override
+    /**
+     * Determines whether this preset matches the given primitive, i.e.,
+     * whether the {@link #typeMatches(Collection) type matches} and the {@link TaggingPresetItem#matches(Map) tags match}.
+     *
+     * @param p the primitive
+     * @return {@code true} if this preset matches the primitive
+     */
+     @Override
     public boolean evaluate(OsmPrimitive p) {
         return matches(EnumSet.of(TaggingPresetType.forPrimitive(p)), p.getKeys(), false);
     }
 
+    /**
+     * Determines whether this preset matches the parameters.
+     *
+     * @param t the preset types to include, see {@link #typeMatches(Collection)}
+     * @param tags the tags to perform matching on, see {@link TaggingPresetItem#matches(Map)}
+     * @param onlyShowable whether the preset must be {@link #isShowable() showable}
+     * @return {@code true} if this preset matches the parameters.
+     */
     public boolean matches(Collection<TaggingPresetType> t, Map<String, String> tags, boolean onlyShowable) {
         if (onlyShowable && !isShowable())
@@ -525 +545 @@
     }
 
-    public static Collection<TaggingPreset> getMatchingPresets(final Collection<TaggingPresetType> t,
-            final Map<String, String> tags, final boolean onlyShowable) {
-        return Utils.filter(TaggingPresets.getTaggingPresets(), new Predicate<TaggingPreset>() {
-            @Override
-            public boolean evaluate(TaggingPreset object) {
-                return object.matches(t, tags, onlyShowable);
-            }
-        });
-    }
-
     /**
      * Action that adds or removes the button on main toolbar