From 5969b0bbaa7d6716549bd698b4eac35331ce71c8 Mon Sep 17 00:00:00 2001
From: "hyunsik.noh" <hyunsik.noh@samsung.com>
Date: Wed, 11 Dec 2013 18:42:06 +0900
Subject: [PATCH] CLI: Change run option from appId to pkgId

Change-Id: I96c8888222a77bb6457e2cad82e04615f160ca39
Signed-off-by: hyunsik.noh <hyunsik.noh@samsung.com>
---
 .../src/org/tizen/ncli/ide/shell/RunCLI.java          |  6 +++---
 .../org/tizen/ncli/ide/subcommands/RunCLICommand.java | 19 +++++++++----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/RunCLI.java b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/RunCLI.java
index 7cf6fb6..29fe028 100644
--- a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/RunCLI.java
+++ b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/RunCLI.java
@@ -41,8 +41,8 @@ public class RunCLI extends AbstractCLI{
     
     @Option(name = "--target", usage = "Target to run the app")
     private String target;
-    @Option(name = "--appid", usage = "App Id to run")
-    private String appId;
+    @Option(name = "--pkgId", usage = "Package Id to run")
+    private String pkgId;
     
     @Override
     public void execute() {
@@ -50,7 +50,7 @@ public class RunCLI extends AbstractCLI{
         RunCLICommand command = new RunCLICommand();
         command.setWorkingDir(workingDir == null ? currentWorkspacePath : workingDir);
         command.setTarget(target);
-        command.setAppId(appId);
+        command.setPackageId(pkgId);
         Run runCommand = command.runCommand();
     }
 
diff --git a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/RunCLICommand.java b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/RunCLICommand.java
index 4aaa1d2..e561bf4 100644
--- a/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/RunCLICommand.java
+++ b/org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/RunCLICommand.java
@@ -32,7 +32,7 @@ import org.tizen.sdblib.IDevice;
 
 public class RunCLICommand extends AbstractSubCommand<Run> {
     private IDevice target = null;
-    private String appId = null;
+    private String pkgId = null;
     private String appName = null;
     private String appType = null;
     
@@ -68,9 +68,9 @@ public class RunCLICommand extends AbstractSubCommand<Run> {
         log.debug("[target]: " + (target == null ? "null" : targetSerialId));
     }
 
-    public void setAppId(String appId) {
-        this.appId = appId;
-        log.debug("[appId]: " + (appId == null ? "null" : appId));
+    public void setPackageId(String pkgId) {
+        this.pkgId = pkgId;
+        log.debug("[pkgId]: " + (pkgId == null ? "null" : pkgId));
     }
     
     private String getAppName() {
@@ -78,7 +78,7 @@ public class RunCLICommand extends AbstractSubCommand<Run> {
         String appName = null;
         String returnStr = null;
         
-        String appNameCmd = String.format(appNameCommand, appId);
+        String appNameCmd = String.format(appNameCommand, pkgId);
         log.debug("[get app name command]: " + appNameCmd);
         returnStr = TargetUtil.getDefault().returnExecuteCommand(target, appNameCmd);
         if(returnStr.length() > 0) {
@@ -96,7 +96,7 @@ public class RunCLICommand extends AbstractSubCommand<Run> {
         String appType = null;
         String returnStr = null;
         
-        String appTypeCmd = String.format(appTypeCommand, appId);
+        String appTypeCmd = String.format(appTypeCommand, pkgId);
         log.debug("[get app type command]: " + appTypeCmd);
         returnStr = TargetUtil.getDefault().returnExecuteCommand(target, appTypeCmd);
         if(returnStr.length() > 0) {
@@ -119,14 +119,13 @@ public class RunCLICommand extends AbstractSubCommand<Run> {
         String result = null;
         String runCommand = null;
         if(CLIConstant.NATIVE_PKG_EXT.equals(appType)) {
-            runCommand = String.format(runNativeAppCommand, appId, appName);
+            runCommand = String.format(runNativeAppCommand, pkgId, appName);
         } else {
-            //TODO
-            runCommand = String.format(runWebAppCommand, appId, appName);
+            runCommand = String.format(runWebAppCommand, pkgId, appName);
         }
         log.debug("[Run Command]]: " + runCommand);
         result = TargetUtil.getDefault().returnExecuteCommand(target, runCommand);
         progressLog.info(result);
         return result;
     }
-}
\ No newline at end of file
+}
-- 
2.7.4