Changeset 2821 in josm for trunk/src/org

Timestamp:

2010-01-12T07:11:57+01:00 (14 years ago)

Author:

Gubaer

Message:

applied #4344: patch by bomm: simplify command line processing

File:

• trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -11 +11 @@
 import java.net.Authenticator;
 import java.net.ProxySelector;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -116 +115 @@
 
         // construct argument table
-        List<String> argList = Arrays.asList(argArray);
         final Map<String, Collection<String>> args = new HashMap<String, Collection<String>>();
         for (String arg : argArray) {
+            if ("-h".equals(arg) || "-?".equals(arg)) {
+                arg = "--help";
+            }
+            // handle simple arguments like file names, URLs, bounds
             if (!arg.startsWith("--")) {
                 arg = "--download="+arg;
@@ -149 +151 @@
 
         // asking for help? show help and exit
-        if (argList.contains("--help") || argList.contains("-?") || argList.contains("-h")) {
+        if (args.containsKey("help")) {
             showHelp();
             System.exit(0);