Changeset 12892 in josm for trunk/src/gnu/getopt

Timestamp:

2017-09-24T09:25:26+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - remove dependency of getopt library on JOSM classes

File:

• trunk/src/gnu/getopt/Getopt.java (modified) (3 diffs)

trunk/src/gnu/getopt/Getopt.java

@@ -21 +21 @@
 package gnu.getopt;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
-
 import java.text.MessageFormat;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Function;
 
 /**************************************************************************/
@@ -582 +581 @@
 /**************************************************************************/
 
+private static Function<String, String> tr = Function.identity();
+
+/**
+ * Set the global translation handler for Getopt.
+ *
+ * This needs to be done before any call to {@link Getopt} or {@link LongOpt}
+ * constructor.
+ * @param tr function that takes messages in English and returns the localized message
+ */
+public static void setI18nHandler(Function<String, String> tr) {
+    Getopt.tr = tr;
+}
+
 static class OptI18n {
+
+    private final Map<String, String> trns = new HashMap<>();
+
     public  OptI18n() {
         add("getopt.ambigious", tr("{0}: option ''{1}'' is ambiguous"));
@@ -596 +611 @@
     }
 
-    Map<String, String> trns = new HashMap<String, String>();
+    private String tr(String s) {
+        return Getopt.tr.apply(s);
+    }
 
     private void add(String key, String value) {