Command line processing refactored (process params in right order)

plugins/org.jkiss.dbeaver.ui.app.standalone/src/org/jkiss/dbeaver/ui/app/standalone/DBeaverCommandLine.java

@@ -16,10 +16,7 @@
  */
 package org.jkiss.dbeaver.ui.app.standalone;
 
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Options;
+import org.apache.commons.cli.*;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.Platform;
@@ -270,8 +267,15 @@ public class DBeaverCommandLine
             return false;
         }
         boolean exit = false;
-        for (ParameterDescriptor param : customParameters.values()) {
-            if (commandLine.hasOption(param.name)) {
+        for (Option cliOption : commandLine.getOptions()) {
+            ParameterDescriptor param = customParameters.get(cliOption.getOpt());
+            if (param == null) {
+                param = customParameters.get(cliOption.getLongOpt());
+            }
+            if (param == null) {
+                log.error("Wrong command line parameter " + cliOption);
+                continue;
+            }
             try {
                 if (param.hasArg) {
                     for (String optValue : commandLine.getOptionValues(param.name)) {
@@ -291,7 +295,6 @@ public class DBeaverCommandLine
                 exit = true;
             }
         }
-        }
 
         return exit;
     }