fix issue: command help does not display options when option annotation is put on a field

greenlaw110 · greenlaw110 · commit d12a764f0aa7 · 2016-08-23T16:27:25.000+10:00
diff --git a/src/main/java/act/app/CliContext.java b/src/main/java/act/app/CliContext.java
@@ -285,13 +285,14 @@ void handle() throws IOException {
         boolean help = parser.getBoolean("-h", "--help");
         if (help) {
             Help.INSTANCE.showHelp(parser.command(), this);
-        }
-        try {
-            handler.handle(this);
-        } catch ($.Break b) {
-            throw b;
-        } catch (Exception e) {
-            console.println("Error: " + e.getMessage());
+        } else {
+            try {
+                handler.handle(this);
+            } catch ($.Break b) {
+                throw b;
+            } catch (Exception e) {
+                console.println("Error: " + e.getMessage());
+            }
         }
     }
 
diff --git a/src/main/java/act/cli/meta/CommanderClassMetaInfo.java b/src/main/java/act/cli/meta/CommanderClassMetaInfo.java
@@ -79,6 +79,7 @@ public CommanderClassMetaInfo superType(Type type) {
     }
 
     public CommanderClassMetaInfo addFieldOptionAnnotationInfo(FieldOptionAnnoInfo info) {
+        info.paramName(info.fieldName());
         fieldOptionAnnoInfoMap.put(info.fieldName(), info);
         return this;
     }

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ public CommanderClassMetaInfo superType(Type type) {`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`public CommanderClassMetaInfo addFieldOptionAnnotationInfo(FieldOptionAnnoInfo info) {`
	`82`	`+ info.paramName(info.fieldName());`
`82`	`83`	`fieldOptionAnnoInfoMap.put(info.fieldName(), info);`
`83`	`84`	`return this;`
`84`	`85`	`}`