From c199ca855ba7ae5a29234ff295a2348236d129fd Mon Sep 17 00:00:00 2001
From: Heongseok Heo <hyeongseok.heo@samsung.com>
Date: Mon, 25 Nov 2013 20:38:05 +0900
Subject: [PATCH] CLI : Fix argument counting logic in Main

Fix counting argument length . Because there is default argument
'--current-workspace-path' , argument length should be 3 at least.

Change-Id: I8da62a7701150c961e1958bc6a15a38f76cfc86e

Change-Id: I8da62a7701150c961e1958bc6a15a38f76cfc86e
Signed-off-by: Heongseok Heo <hyeongseok.heo@samsung.com>
---
 org.tizen.ncli.ide/src/org/tizen/core/ide/BuildWebAppModule.java   | 3 +--
 org.tizen.ncli.ide/src/org/tizen/ncli/core/CommandLineParser.java  | 2 +-
 org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/Main.java          | 4 ++--
 .../src/org/tizen/ncli/ide/subcommands/BuildWebCLICommand.java     | 7 ++++++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/org.tizen.ncli.ide/src/org/tizen/core/ide/BuildWebAppModule.java b/org.tizen.ncli.ide/src/org/tizen/core/ide/BuildWebAppModule.java
index 46d338e..b08536f 100644
--- a/org.tizen.ncli.ide/src/org/tizen/core/ide/BuildWebAppModule.java
+++ b/org.tizen.ncli.ide/src/org/tizen/core/ide/BuildWebAppModule.java
@@ -144,7 +144,6 @@ public class BuildWebAppModule {
         } else {
             throw new BuildException(null);
         }
-        Assert.notNull(cwd, "Current Working Directory should not be NULL.");
     }
 
     private void deleteOutput() {
@@ -320,7 +319,7 @@ public class BuildWebAppModule {
      * Add UI framework builder to buildProcess.
      * 
      * @param isExclude
-     *            If set true, Tizen web UI framework library will be excluded output path. Application will be used
+     *            If set true, Tizen web UI framework library will be excluded output path. Application will use
      *            target's Tizen web UI framework library.
      * @param useMin
      *            If 'isExclude' parameter set true and this parameter set true, application will be used target's
diff --git a/org.tizen.ncli.ide/src/org/tizen/ncli/core/CommandLineParser.java b/org.tizen.ncli.ide/src/org/tizen/ncli/core/CommandLineParser.java
index 597790c..84d1950 100644
--- a/org.tizen.ncli.ide/src/org/tizen/ncli/core/CommandLineParser.java
+++ b/org.tizen.ncli.ide/src/org/tizen/ncli/core/CommandLineParser.java
@@ -95,6 +95,7 @@ public class CommandLineParser extends CmdLineParser {
             log.trace("parseArgument CLP:{}\tCommand:{}", this, current);
             super.parseArgument(args);
         } catch (CmdLineException e) {
+            log.trace("CmdLineException occurred.\n{}", e.getMessage());
             /*
              * To show SubCommand information , make a information for SubCommand.
              */
@@ -102,7 +103,6 @@ public class CommandLineParser extends CmdLineParser {
             if (this == calleeParser) {
                 log.trace("Same CmdLineParser");
                 log.trace("args count: {}", args.length);
-                log.trace("CmdLineException occurred.\n{}", e.getMessage());
                 // process parsing subcommand infos
                 log.trace("make sub command reference infos.");
                 try {
diff --git a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/Main.java b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/Main.java
index b265ace..223a337 100644
--- a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/Main.java
+++ b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/Main.java
@@ -72,7 +72,7 @@ public class Main {
         } catch (CmdLineException e) {
             if (args.length == 0 || helpOpt) {
                 printDefaultCommandUsage(errorWriter);
-            } else if (args.length == 1) {
+            } else if (args.length == 3) {
                 /*
                  * Check if command name is correct and print proper message
                  */
@@ -85,7 +85,7 @@ public class Main {
                     printSubCommandOrArgUsage(command, errorWriter);
                 }
 
-            } else if (args.length > 1) {
+            } else if (args.length > 3) {
                 errorWriter.println();
                 errorWriter.println("Argument is not valid!");
                 errorWriter.println(MessageFormat.format("Error: {0}", e.getMessage()));
diff --git a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/BuildWebCLICommand.java b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/BuildWebCLICommand.java
index cd0f7ae..7e6f0bc 100644
--- a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/BuildWebCLICommand.java
+++ b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/BuildWebCLICommand.java
@@ -29,6 +29,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.tizen.common.builder.BuildProcess;
 import org.tizen.common.builder.Builder;
 import org.tizen.common.builder.Resource;
@@ -58,6 +60,7 @@ import org.tizen.web.common.WebConstant;
  * 
  */
 public class BuildWebCLICommand extends AbstractSubCommand<BuildWebParameter> {
+    private Logger log = LoggerFactory.getLogger(getClass());
 
     // file filter. If you want to exclude a directory, append '/*'
     private static final String[] DEFAULT_EXCLUDES = { ".build" + File.separator + "*", ".project",
@@ -79,7 +82,9 @@ public class BuildWebCLICommand extends AbstractSubCommand<BuildWebParameter> {
     @Override
     protected BuildWebParameter call() {
         log.trace("BuildWeb command started ...");
-        log.info("Build started...");
+        log.info("-----------------------------------------------------");
+        log.info("Starting Tizen project build:");
+        log.info("-----------------------------------------------------");
         initExcludes();
         if (log.isTraceEnabled()) {
             log.trace("BuildData: {}", webAppBuildData);
-- 
2.7.4