Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 2820)
+++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 2821)
@@ -11,5 +11,4 @@
 import java.net.Authenticator;
 import java.net.ProxySelector;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -116,7 +115,10 @@
 
         // 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,5 +151,5 @@
 
         // asking for help? show help and exit
-        if (argList.contains("--help") || argList.contains("-?") || argList.contains("-h")) {
+        if (args.containsKey("help")) {
             showHelp();
             System.exit(0);