Missing MessageFormat arguments in OptionParser

[simon04]

Related to #16866.

A few {0}/{1} arguments are missing in OptionParser (not sure what to insert for xxx, though):

src/org/openstreetmap/josm/tools/OptionParser.java

@@ -163 +163 @@
                         parameter = split[1];
                     } else {
                         if (toHandle.isEmpty() || "--".equals(toHandle.getFirst())) {
-                            throw new OptionParseException(tr("{0}: option ''{1}'' requires an argument", program));
+                            throw new OptionParseException(tr("{0}: option ''{1}'' requires an argument", program, optionName));
                         }
                         parameter = toHandle.removeFirst();
                     }
@@ -180 +180 @@
             long count = options.stream().filter(p -> def.equals(p.option)).count();
             if (count < def.getRequiredCount().min) {
                 // min may be 0 or 1 at the moment
-                throw new OptionParseException(tr("{0}: option ''{1}'' is required"));
+                throw new OptionParseException(tr("{0}: option ''{1}'' is required", program, xxx));
             } else if (count > def.getRequiredCount().max) {
                 // max may be 1 or MAX_INT at the moment
-                throw new OptionParseException(tr("{0}: option ''{1}'' may not appear multiple times"));
+                throw new OptionParseException(tr("{0}: option ''{1}'' may not appear multiple times", program, xxx));
             }
         });
 
@@ -221 +221 @@
             if (alternatives.size() == 1) {
                 return alternatives.get(0);
             } else if (alternatives.size() > 1) {
-                throw new OptionParseException(tr("{0}: option ''{1}'' is ambiguous", program));
+                throw new OptionParseException(tr("{0}: option ''{1}'' is ambiguous", program, optionName));
             }
         }
         throw new OptionParseException(tr("{0}: unrecognized option ''{1}''", program, optionName));

[michael2402]

OK, that is more difficult. The problem is that an option may have multiple names (short / long)

So:
(1) Make availableOptions a LinkedHashMap
(2) Use xxx = availableOptions.entrySet().stream().filter(entry -> entry.getValue().equals(def)).map(entry -> entry.getKey()).findFirst().orElse("?")

This will then always find the long option that was registered first.

[simon04]

In 14640/josm:

fix #17169 - Missing MessageFormat arguments in OptionParser