CLI: modify 'create' help message
authorjihye424.kim <jihye424.kim@samsung.com>
Wed, 17 Feb 2016 10:13:33 +0000 (19:13 +0900)
committerjihye424.kim <jihye424.kim@samsung.com>
Fri, 19 Feb 2016 09:56:04 +0000 (18:56 +0900)
Change-Id: I8653500da41afbe6acf934e45d027257cb1d0ace
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>
resource/strings/climessages.properties
src/org/tizen/emulator/manager/console/CommandList.java
src/org/tizen/emulator/manager/console/RemoteCommandList.java
src/org/tizen/emulator/manager/console/resources/StringResources.java

index 9671378..36ad62a 100644 (file)
@@ -1,7 +1,27 @@
-Action.AddOptionHelp=Add other qemu's options.
-Action.DeviceHelp.0=Select device template.
-Action.DeviceHelp.1=\t\t(Available device template can be found using 'list-device' command)
-Action.BaseImageIDHelp.2=Select path of base target image.
+Create.ShortDescription=Create a new virtual machine
+Create.Description=Create a new VM(Virtual Machine)
+Create.Usage.1=Create a VM by using default platform: create -n test [options]
+Create.Usage.2=Create a VM by using platform: create -n test -p mobile-2.4 [options]
+Create.Usage.3=Create a VM by using platform and device: create -n test -p mobile-2.4 -d HD-Mobile [options]
+Create.Usage.4=Create a VM by using custom image: create -n test -c path [options]
+Create.Usage.5=Create a VM by using custom image: create -n test -c path -p mobile-2.4 [options]
+Create.Usage.6=Create a VM by using custom image: create -n test -c path -p mobile-2.4 -d HD-Mobile [options]
+Create.Usage.7=If SDK has two or more platforms, you have to choose one platform.
+
+Create.Desc.Name=Name of new VM
+Create.Desc.Platform=Select 'platform' of base disk image. You can find available platforms by using 'list-platform' command.
+Create.Desc.Device=Select 'device' template. You can find available device templates by using 'list-device' command.
+Create.Desc.CustomImagePath=Use a custom qcow2 image on the 'path'
+Create.Desc.Skin.1=Select the style number of skin. (1, 2)
+Create.Desc.Skin.2=1  General-purpose skin
+Create.Desc.Skin.3=2  Profile-specific skin
+Create.Desc.Skin.4=Default skin style is dependent on profile.
+Create.Desc.FileShare.1=Shared path between host and VM.
+Create.Desc.FileShare.2=If the path is "", the option is ignored.
+Create.Desc.VT=Enable CPU virtualization or not (yes, no)
+Create.Desc.GPU=Enable hardware GL acceleration (yes, no)
+Create.Desc.RAMSize=Size of memory
+
 Action.CompressImage=Create compressed image.
 Action.CountHelp=Display count of VM list (only display number).
 Action.DefaultBaseImage=ID of standard image in each platform
@@ -10,49 +30,26 @@ Action.DeleteName=Name of VM to delete.
 Action.DetailHelp.0=Display more information of VMs.
 Action.DetailHelp.1=Name of virtual machine.
 Action.DetailHelp.2=\t\t\tIf you do not enter a name, emulator manager's information is printed.
-Action.DPIHelp=DPI. (100 ~ 480)
 Action.ExportAsPath=Setting Location to generate base target image.
 Action.ExportName=Name of VM to create base target image.
-Action.FileShareHelp=File sharing path. If path is "", file sharing is disabled.
-Action.GPIHelp=Select enable or disable hardware GL acceleration.(yes | no)
 Action.Help=Display information of specific command.
 Action.LaunchName=Name of VM to start.
 Action.LaunchPath=Setting path of emulator program.
-Action.Name=Name of new VM.
 Action.NameMod=Name of VM.
-Action.PlatformHelp.0=Select Platform of base disk image.
-Action.PlatformHelp.1=\t\t(Available platform can be found using 'list-platform' command)
 Action.ProfileHelp.0=Select profile
 Action.DetailPlatformHelp.0=Display more information of platform
-Action.RAMSizenDescription.0=RAM size. (
-Action.RAMSizenDescription.1=)
 Action.RemoteHelp.0=User account of remote.
 Action.RemoteHelp.1=IP address of remote.
 Action.RemoteHelp.2=SDK path number of remote.
 Action.ResetName=Name of VM to reset image.
-Action.ResolutionDescription.0=Resolution of VM. (
-Action.ResolutionDescription.1=\t\t(Custom resolution is supported as experimental feature.
-Action.ResolutionDescription.2=\ Range is from 320 to 1920).
-Action.SkinHelp=Select skin style (1:General-purpose, 2:Profile-specific)
 Action.SpiceMode=Enable spice mode
 Action.TestOptionHelp=Print parameters of emulator without executing emulator.
 Action.VervosHelp=Display information running emulator-manager's state
-Action.VTHelp=Select enable or disable hardware virtualization.(yes | no)
 ActionList.AcountOption=User account of remote.
 ActionList.Clone.0=Create new VM which has the same configurations as you selected..
 ActionList.Clone.1=clone -n test -t target
 ActionList.CloneBaseNameOption=Name of VM to create base target image.
 ActionList.CloneTargetNameOption=Input new VM's name.
-ActionList.Create.0=Create new 'Virtual Machine'.
-ActionList.Create.1=Standard Image: create -n test [options]
-ActionList.Create.2=\tStandard Image: create -n test -p mobile-2.4 [options]
-ActionList.Create.3=\tStandard Image: create -n test -p mobile-2.4 -d HD-Mobile [options]
-ActionList.Create.4=\tCustom Image: create -n test -c path [options]
-ActionList.Create.5=\tCustom Image: create -n test -c path -p mobile-2.4 [options]
-ActionList.Create.6=\tCustom Image: create -n test -c path -p mobile-2.4 -d HD-Mobile [options]
-ActionList.Create.7=\tIf SDK has one or more platforms, you have to choose one platform.
-ActionList.CreateOptionError.0=Error: Option of 'create' is allowed only one of two.(--base or --path)
-ActionList.CreateOptionError.1=Error: One of '--base' and '--path' should come as option of 'create'
 ActionList.Delete.0=Delete selected VM.
 ActionList.Delete.1=delete -n test
 ActionList.DeleteNameOption=Name of VM to delete.
index d83b5c5..ce346bc 100644 (file)
@@ -43,7 +43,6 @@ import org.tizen.emulator.manager.job.CheckVT;
 import org.tizen.emulator.manager.resources.FilePathResources;
 import org.tizen.emulator.manager.tool.RemoteManager;
 import org.tizen.emulator.manager.vms.RAM_SIZE;
-import org.tizen.emulator.manager.vms.RESOLUTION;
 
 public class CommandList {
        private static Global globalCommand = null;
@@ -61,11 +60,11 @@ public class CommandList {
                // add global action
                globalCommand = new Global();
 
+               addCommnad(new Create());
                addCommnad(new ListVM());
                addCommnad(new ListPlatform());
                addCommnad(new Detail());
                addCommnad(new Launch());
-               addCommnad(new Create());
                addCommnad(new Modify());
                addCommnad(new Delete());
                addCommnad(new Reset());
@@ -254,38 +253,41 @@ class Detail extends Command {
 class Create extends Command {
        public Create() {
                this.command    = StringResources.AC_CREATE;
-               this.description = Messages.getString("ActionList.Create.0"); //$NON-NLS-1$
-               this.usage = Messages.getString("ActionList.Create.1") + StringResources.NEW_LINE + //$NON-NLS-1$
-                               Messages.getString("ActionList.Create.2") + StringResources.NEW_LINE + //$NON-NLS-1$
-                               Messages.getString("ActionList.Create.3") + StringResources.NEW_LINE + //$NON-NLS-1$
-                               Messages.getString("ActionList.Create.4") + StringResources.NEW_LINE + //$NON-NLS-1$
-                               Messages.getString("ActionList.Create.5") + StringResources.NEW_LINE + //$NON-NLS-1$
-                               Messages.getString("ActionList.Create.6") + StringResources.NEW_LINE + //$NON-NLS-1$
-                               Messages.getString("ActionList.Create.7"); //$NON-NLS-1$
+               this.description = Messages.getString("Create.Description"); //$NON-NLS-1$
+               this.shortDescription = Messages.getString("Create.ShortDescription");
+               this.usage = Messages.getString("Create.Usage.1") + StringResources.NEW_LINE + //$NON-NLS-1$
+                               Messages.getString("Create.Usage.2") + StringResources.NEW_LINE + //$NON-NLS-1$
+                               Messages.getString("Create.Usage.3") + StringResources.NEW_LINE + //$NON-NLS-1$
+                               Messages.getString("Create.Usage.4") + StringResources.NEW_LINE + //$NON-NLS-1$
+                               Messages.getString("Create.Usage.5") + StringResources.NEW_LINE + //$NON-NLS-1$
+                               Messages.getString("Create.Usage.6") + StringResources.NEW_LINE + //$NON-NLS-1$
+                               Messages.getString("Create.Usage.7"); //$NON-NLS-1$
+
+               Option name = new Option("n", StringResources.OP_NAME, //$NON-NLS-1$
+                               StringResources.DESC_CREATE_NAME, "", true, true, "name");
+               name.setShortUsage("-n <VM name>");
+               optionList.add(name);
 
-               optionList.add(new Option("n", StringResources.OP_NAME, //$NON-NLS-1$
-                               StringResources.DESC_NAME, "", true, true)); //$NON-NLS-1$
-
-               optionList.add(new Option("c", StringResources.OP_PATH, //$NON-NLS-1$
-                               StringResources.DESC_PATH, "", false, true)); //$NON-NLS-1$
                optionList.add(new Option("p", StringResources.OP_PLATFORM, //$NON-NLS-1$
-                               StringResources.DESC_PLATFORM, "", false, true)); //$NON-NLS-1$
+                               StringResources.DESC_PLATFORM, "", false, true, "platform")); //$NON-NLS-1$
+               optionList.add(new Option("c", StringResources.OP_PATH, //$NON-NLS-1$
+                               StringResources.DESC_CUSTOM_PATH, "", false, true, "path")); //$NON-NLS-1$
                optionList.add(new Option("d", StringResources.OP_DEVICE, //$NON-NLS-1$
-                               StringResources.DESC_DEVICE, "", false, true));
+                               StringResources.DESC_DEVICE, "", false, true, "device"));
 
                // Options
                optionList.add(new Option("k", StringResources.OP_SKIN, //$NON-NLS-1$
-                               StringResources.DESC_SKIN, StringResources.DEFAULT_SKIN, false, true));
+                               StringResources.DESC_SKIN, "", false, true, "number"));
                optionList.add(new Option("s", StringResources.OP_RAM, //$NON-NLS-1$
-                               StringResources.DESC_RAM, RAM_SIZE.RAM512.toString(), false, true));
+                               StringResources.DESC_RAM, "", false, true, "value"));
                optionList.add(new Option("f", StringResources.OP_FILESHAREPATH, //$NON-NLS-1$
-                               StringResources.DESC_FILESHAREPATH, "", false, true)); //$NON-NLS-1$
+                               StringResources.DESC_FILESHAREPATH, "", false, true, "path")); //$NON-NLS-1$
                optionList.add(new Option("v", StringResources.OP_VIRTUALIZATION, //$NON-NLS-1$
                                StringResources.DESC_VIRTUALIZATION,
-                               CheckVT.isVTSupported() ? "yes" : "no", false, true)); //$NON-NLS-1$ //$NON-NLS-2$
+                               CheckVT.isVTSupported() ? "yes" : "no", false, true, "yes|no")); //$NON-NLS-1$ //$NON-NLS-2$
                optionList.add(new Option("g", StringResources.OP_GLACCELERATION, //$NON-NLS-1$
                                StringResources.DESC_GLACCELERATION,
-                               CheckGPU.isGPUSupported() ? "yes" : "no", false, true)); //$NON-NLS-1$ //$NON-NLS-2$
+                               CheckGPU.isGPUSupported() ? "yes" : "no", false, true, "yes|no")); //$NON-NLS-1$ //$NON-NLS-2$
        }
 
        @Override
@@ -304,27 +306,8 @@ class Modify extends Command {
                                StringResources.DESC_NAME_MOD, "", true, true)); //$NON-NLS-1$
 
                // Options
-               optionList.add(new Option("r", StringResources.OP_RESOLUTION, //$NON-NLS-1$
-                               StringResources.DESC_RESOLUTION, RESOLUTION.HD.getType(), false, true));
-               optionList.add(new Option("d", StringResources.OP_DPI, //$NON-NLS-1$
-                               StringResources.DESC_DPI, Integer.toString(RESOLUTION.HD.getDPI()), false, true));
-
-               /** TODO : resolution and skin..***********************************************/
-               /*
-               ArrayList<Skin> skinList = SkinList.getInstance().findSkinList(RESOLUTION.HD);
-
-               String skinType = "";
-               int i = 1;
-               for (Skin skin : skinList) {
-                       skinType += i++ + " - " + skin.getName() + " | ";
-               }
-               if (skinType.length() > 3) {
-                       skinType = skinType.substring(0, skinType.length() - 3);
-               }
-               */
-
                optionList.add(new Option("k", StringResources.OP_SKIN, //$NON-NLS-1$
-                               StringResources.DESC_SKIN, StringResources.DEFAULT_SKIN, false, true));
+                               StringResources.DESC_SKIN, "", false, true));
                /*****************************************************************************/
 
                /*
index 892b754..e4733fb 100644 (file)
@@ -176,7 +176,7 @@ class RemoteCreate extends Command {
                optionList.add(new Option("d", StringResources.OP_DEVICE, //$NON-NLS-1$
                                StringResources.DESC_DEVICE, "", false, true)); //$NON-NLS-1$
                optionList.add(new Option("p", StringResources.OP_PATH, //$NON-NLS-1$
-                               StringResources.DESC_PATH, "", false, true)); //$NON-NLS-1$
+                               StringResources.DESC_CUSTOM_PATH, "", false, true)); //$NON-NLS-1$
                optionList.add(new Option("u", StringResources.OP_USER_ACCOUNT, //$NON-NLS-1$
                                StringResources.DESC_USER_ACCOUNT, "", true, true)); //$NON-NLS-1$
                optionList.add(new Option("e", StringResources.OP_IP, //$NON-NLS-1$
index 20a6ef2..3ab0547 100644 (file)
@@ -31,7 +31,6 @@
 package org.tizen.emulator.manager.console.resources;
 
 import org.tizen.emulator.manager.vms.RAM_SIZE;
-import org.tizen.emulator.manager.vms.RESOLUTION;
 
 public class StringResources {
        public static final String NEW_LINE = System.getProperty("line.separator"); //$NON-NLS-1$
@@ -109,62 +108,50 @@ public class StringResources {
        public final static String DESC_INQUIRY_NAME = Messages.getString("Action.DetailHelp.1") //$NON-NLS-1$
                        + NEW_LINE
                        + Messages.getString("Action.DetailHelp.2"); //$NON-NLS-1$
-       public final static String DESC_NAME = Messages.getString("Action.Name"); //$NON-NLS-1$
+
        public final static String DESC_NAME_MOD = Messages.getString("Action.NameMod"); //$NON-NLS-1$
        public final static String DESC_LAUNCH_NAME = Messages.getString("Action.LaunchName"); //$NON-NLS-1$
        public final static String DESC_DELETE_NAME = Messages.getString("Action.DeleteName"); //$NON-NLS-1$
        public final static String DESC_RESET_NAME = Messages.getString("Action.ResetName"); //$NON-NLS-1$
        public final static String DESC_EXPORT_NAME = Messages.getString("Action.ExportName"); //$NON-NLS-1$
-       public final static String DESC_DEVICE = Messages.getString("Action.DeviceHelp.0") //$NON-NLS-1$
-                       + NEW_LINE
-                       + Messages.getString("Action.DeviceHelp.1"); //$NON-NLS-1$
+
        public final static String DESC_COMPRESS_IMAGE = Messages.getString("Action.CompressImage");
-       public final static String DESC_PATH = Messages.getString("Action.BaseImageIDHelp.2"); //$NON-NLS-1$
        public final static String DESC_LAUNCH_PATH = Messages.getString("Action.LaunchPath"); //$NON-NLS-1$
        public final static String DESC_EXPORT_PATH = Messages.getString("Action.ExportAsPath"); //$NON-NLS-1$
-       public final static String DESC_PLATFORM = Messages.getString("Action.PlatformHelp.0") //$NON-NLS-1$
-                       + NEW_LINE
-                       + Messages.getString("Action.PlatformHelp.1"); //$NON-NLS-1$
        public final static String DESC_PROFILE = Messages.getString("Action.ProfileHelp.0");
        public final static String DESC_DETAIL_PLATFORM = Messages.getString("Action.DetailPlatformHelp.0");
-       public final static String DESC_RESOLUTION = resolutionDescription();
-       public final static String DESC_DPI = Messages.getString("Action.DPIHelp"); //$NON-NLS-1$
-       public final static String DESC_SKIN = Messages.getString("Action.SkinHelp"); //$NON-NLS-1$
+
+       // create
+       public final static String DESC_CREATE_NAME = Messages.getString("Create.Desc.Name"); //$NON-NLS-1$
+       public final static String DESC_PLATFORM = Messages.getString("Create.Desc.Platform"); //$NON-NLS-1$
+       public final static String DESC_CUSTOM_PATH = Messages.getString("Create.Desc.CustomImagePath"); //$NON-NLS-1$
+       // create and modify
+       public final static String DESC_DEVICE = Messages.getString("Create.Desc.Device"); //$NON-NLS-1$
+       public final static String DESC_SKIN = Messages.getString("Create.Desc.Skin.1")//$NON-NLS-1$
+                       + NEW_LINE
+                       + Messages.getString("Create.Desc.Skin.2")//$NON-NLS-1$
+                       + NEW_LINE
+                       + Messages.getString("Create.Desc.Skin.3")//$NON-NLS-1$
+                       + NEW_LINE
+                       + Messages.getString("Create.Desc.Skin.4");//$NON-NLS-1$
        public final static String DESC_RAM = ramSizeDescription();
-       public final static String DESC_FILESHAREPATH = Messages.getString("Action.FileShareHelp"); //$NON-NLS-1$
-       public final static String DESC_VIRTUALIZATION = Messages.getString("Action.VTHelp"); //$NON-NLS-1$
-       public final static String DESC_GLACCELERATION = Messages.getString("Action.GPIHelp"); //$NON-NLS-1$
-       public final static String DESC_ADDOPTION = Messages.getString("Action.AddOptionHelp"); //$NON-NLS-1$
+       public final static String DESC_FILESHAREPATH = Messages.getString("Create.Desc.FileShare.1")//$NON-NLS-1$
+                       + NEW_LINE
+                       + Messages.getString("Create.Desc.FileShare.2"); //$NON-NLS-1$
+       public final static String DESC_VIRTUALIZATION = Messages.getString("Create.Desc.VT"); //$NON-NLS-1$
+       public final static String DESC_GLACCELERATION = Messages.getString("Create.Desc.GPU"); //$NON-NLS-1$
+
        public final static String DESC_TEST = Messages.getString("Action.TestOptionHelp"); //$NON-NLS-1$
        public final static String DESC_SPICE_PORT = Messages.getString("Action.SpiceMode"); //$NON-NLS-1$
 
-       public final static String DEFAULT_BASE = Messages.getString("Action.DefaultBaseImage"); //$NON-NLS-1$
-       public final static String DEFAULT_SKIN = Messages.getString("Action.DefaultSkin"); //$NON-NLS-1$
-       public static String resolutionDescription() {
-               String resolution = ""; //$NON-NLS-1$
-               for (RESOLUTION r : RESOLUTION.values()) {
-                       if (!r.getType().isEmpty()) {
-                               resolution += (r.getType() + " | "); //$NON-NLS-1$
-                       } else {
-                               resolution += (r.getStrValue() + " | "); //$NON-NLS-1$
-                       }
-               }
-               resolution = resolution.substring(0, resolution.length() - 3);
-
-               return Messages.getString("Action.ResolutionDescription.0") //$NON-NLS-1$
-                               + resolution
-                               + ")" //$NON-NLS-1$
-                               + StringResources.NEW_LINE
-                               + Messages.getString("Action.ResolutionDescription.1") //$NON-NLS-1$
-                               + Messages.getString("Action.ResolutionDescription.2"); //$NON-NLS-1$
-       }
-
        public static String ramSizeDescription() {
                String ram = ""; //$NON-NLS-1$
                for (RAM_SIZE size : RAM_SIZE.values()) {
-                       ram += (size.toString() + " | "); //$NON-NLS-1$
+                       ram += (size.toString() + ", "); //$NON-NLS-1$
                }
-               ram = ram.substring(0, ram.length() - 3);
-               return Messages.getString("Action.RAMSizenDescription.0") + ram + Messages.getString("Action.RAMSizenDescription.1"); //$NON-NLS-1$ //$NON-NLS-2$
+               ram = ram.substring(0, ram.length() - 2);
+               ram = "(" + ram + ")";
+
+               return Messages.getString("Create.Desc.RAMSize") + ram; //$NON-NLS-1$
        }
 }