help オプションだけを指定した場合にエラーとなる不具合を修正。

Author: masaru-takano

modules/deviceconnect-codegen/src/main/java/org/deviceconnect/codegen/Const.java

@@ -23,7 +23,8 @@ public final class Const {
     static final ResourceBundle MESSAGES = ResourceBundle.getBundle("Messages", Locale.getDefault(),
             ResourceBundleWithUtf8.UTF8_ENCODING_CONTROL);
 
-    public static final Options OPTIONS;
+    public static final Options MAIN_OPTIONS;
+    public static final Options HELP_OPTION;
 
     static Map<String, DConnectCodegenConfig> configs = new HashMap<String, DConnectCodegenConfig>();
 
@@ -57,7 +58,8 @@ static DConnectCodegenConfig getConfig(String name) {
             configs.put(config.getName(), config);
         }
         configString = sb.toString();
-        OPTIONS = createOptions();
+        MAIN_OPTIONS = createOptions();
+        HELP_OPTION = createHelpOption();
     }
 
     static List<DConnectCodegenConfig> getExtensions() {
@@ -69,6 +71,12 @@ static List<DConnectCodegenConfig> getExtensions() {
         return output;
     }
 
+    private static Options createHelpOption() {
+        Options options = new Options();
+        options.addOption("h", "help", false, "shows this message");
+        return options;
+    }
+
     private static Options createOptions() {
         Options options = new Options();
 
@@ -90,7 +98,7 @@ private static Options createOptions() {
         options.addOption("p", "package-name", true, "package name (for Android only)");
         options.addOption("n", "display-name", true, "display name of the generated project.");
         options.addOption("x", "class-prefix", true, "prefix of each generated class that implements a device connect profile. (for Android and iOS only)");
-        options.addOption("b", "connection-type", true, "specifies the connection type with device connect manager by \"binder\" or \"broadcast\"; The default value is \"broadcast\". (for Android only)");
+        options.addOption("b", "connection-type", true, "specifies the connection type with device connect manager by \"binder\" or \"broadcast\"; The default value is \"binder\". (for Android only)");
         options.addOption("r", "gradle-plugin-version", true, "version of Android Plugin for Gradle. The default value is \"3.0.0\". (for Android only)");
         options.addOption("k", "sdk", true, "location of Device Connect SDKs.");
         options.addOption("g", "signing-configs", true, "location of singing configs.");

modules/deviceconnect-codegen/src/main/java/org/deviceconnect/codegen/DConnectCodegen.java

@@ -68,8 +68,6 @@ public class DConnectCodegen {
     public static void main(String[] args) {
         System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "warn");
 
-        Options options = Const.OPTIONS;
-
         ClientOptInput clientOptInput = new ClientOptInput();
         ClientOpts clientOpts = new ClientOpts();
 
@@ -78,6 +76,15 @@ public static void main(String[] args) {
             CommandLineParser parser = new BasicParser();
             DConnectCodegenConfig config;
 
+            Options options = Const.MAIN_OPTIONS;
+            try {
+                cmd = parser.parse(Const.HELP_OPTION, args);
+                if (cmd.hasOption("h")) {
+                    usage(options);
+                    return;
+                }
+            } catch (ParseException ignored) {}
+
             cmd = parser.parse(options, args);
             if (cmd.hasOption("d")) {
                 usage(options);

modules/deviceconnect-codegen/src/main/java/org/deviceconnect/codegen/error/Errors.java

@@ -41,7 +41,7 @@ private static String concatOptions(List<Object> list) {
                     }
                     result += groupStr + "\n";
                 } else {
-                    Option found = Const.OPTIONS.getOption(opt.toString());
+                    Option found = Const.MAIN_OPTIONS.getOption(opt.toString());
                     if (found != null) {
                         result += found.getLongOpt() + "\n";
                     }