Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java	(revision 16178)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java	(revision 16179)
@@ -36,5 +36,5 @@
 
     // cache the parsing of types using a LRU cache
-    private static final Map<String, Set<TaggingPresetType>> TYPE_CACHE = new LruCache<>(16);;
+    private static final Map<String, Set<TaggingPresetType>> TYPE_CACHE = new LruCache<>(16);
 
     protected void initAutoCompletionField(AutoCompletingTextField field, String... key) {
Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java	(revision 16178)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java	(revision 16179)
@@ -245,7 +245,5 @@
                     if (all.contains(tp)) {
                         lastmenuOriginal = tp;
-                        java.util.Optional<TaggingPreset> val = all.stream().filter(tp::equals).findFirst();
-                        if (val.isPresent())
-                            tp = (TaggingPresetMenu) val.get();
+                        tp = (TaggingPresetMenu) all.stream().filter(tp::equals).findFirst().orElse(tp);
                         lastmenuOriginal.group = null;
                     } else {
@@ -435,4 +433,8 @@
     }
 
+    /**
+     * Returns the zip file where the icons are located
+     * @return the zip file where the icons are located
+     */
     public static File getZipIcons() {
         return zipIcons;
Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java	(revision 16178)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java	(revision 16179)
@@ -345,11 +345,17 @@
             Collections.sort(result);
             return result;
-
-        }
-
+        }
+
+        /**
+         * Clears the selector.
+         */
         public void clear() {
             classifications.clear();
         }
 
+        /**
+         * Loads a given collection of presets.
+         * @param presets presets collection
+         */
         public void loadPresets(Collection<TaggingPreset> presets) {
             for (TaggingPreset preset : presets) {
@@ -395,4 +401,8 @@
     }
 
+    /**
+     * Initializes the selector with a given collection of presets.
+     * @param presets presets collection
+     */
     public void init(Collection<TaggingPreset> presets) {
         classifications.clear();
@@ -442,4 +452,8 @@
     }
 
+    /**
+     * Selects a given preset.
+     * @param p preset to select
+     */
     public synchronized void setSelectedPreset(TaggingPreset p) {
         lsResult.setSelectedValue(p, true);
Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java	(revision 16178)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java	(revision 16179)
@@ -547,4 +547,8 @@
     }
 
+    /**
+     * Sets whether the last value is used as default.
+     * @param v Using "force" (2) enforces this behaviour also for already tagged objects. Default is "false" (0).
+     */
     public void setUse_last_as_default(String v) { // NOPMD
         if ("force".equals(v)) {
Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Roles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Roles.java	(revision 16178)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Roles.java	(revision 16179)
@@ -40,4 +40,5 @@
      */
     public static class Role {
+        /** Presets types expected for this role */
         public Set<TaggingPresetType> types; // NOSONAR
         /** Role name used in a relation */
@@ -58,8 +59,18 @@
         private short count;
 
+        /**
+         * Sets the presets types expected for this role.
+         * @param types comma-separated set of expected types
+         * @throws SAXException if an unknown type is detected
+         */
         public void setType(String types) throws SAXException {
             this.types = getType(types);
         }
 
+        /**
+         * Sets wether this role is required at least once in the relation.
+         * @param str "required" or "optional"
+         * @throws SAXException if str is neither "required" or "optional"
+         */
         public void setRequisite(String str) throws SAXException {
             if ("required".equals(str)) {
@@ -69,4 +80,9 @@
         }
 
+        /**
+         * Sets wether the role name is a regular expression.
+         * @param str "true" or "false"
+         * @throws SAXException if str is neither "true" or "false"
+         */
         public void setRegexp(String str) throws SAXException {
             if ("true".equals(str)) {
@@ -76,4 +92,9 @@
         }
 
+        /**
+         * Sets an expression (cf. search dialog) for objects of this role
+         * @param memberExpression an expression (cf. search dialog) for objects of this role
+         * @throws SAXException in case of parsing error
+         */
         public void setMember_expression(String memberExpression) throws SAXException {
             try {
@@ -88,4 +109,8 @@
         }
 
+        /**
+         * Sets how often must the element appear.
+         * @param count how often must the element appear
+         */
         public void setCount(String count) {
             this.count = Short.parseShort(count);
@@ -122,4 +147,9 @@
         }
 
+        /**
+         * Adds this role to the given panel.
+         * @param p panel where to add this role
+         * @return {@code true}
+         */
         public boolean addToPanel(JPanel p) {
             String cstring;