option: changed function parameter.

- changed to pass ENUM object.

Change-Id: I7945f567afe680a374575c0ef6821c790130adfd
Signed-off-by: minkee.lee <minkee.lee@samsung.com>

diff --git a/src/org/tizen/emulator/manager/vms/option/BaseImageOption.java b/src/org/tizen/emulator/manager/vms/option/BaseImageOption.java
index d209ed3..1b4865f 100644 (file)
--- a/src/org/tizen/emulator/manager/vms/option/BaseImageOption.java
+++ b/src/org/tizen/emulator/manager/vms/option/BaseImageOption.java
@@ -44,9 +44,9 @@ public class BaseImageOption extends Option {
                                + File.separator + "swap-${vm_name}.img"
                                + ",if=none,index=2");
 
-               config.addQemuOption("-drive", varForm(OPTION_KEY.VAR_DRIVE.toString()) + ",id=drive");
+               config.addQemuOption("-drive", varForm(OPTION_KEY.VAR_DRIVE) + ",id=drive");
                config.addQemuOption("-device", "virtio-blk-pci,drive=drive");
-               config.addQemuOption("-drive", varForm(OPTION_KEY.VAR_SWAP.toString()) + ",id=swap");
+               config.addQemuOption("-drive", varForm(OPTION_KEY.VAR_SWAP) + ",id=swap");
                config.addQemuOption("-device", "virtio-blk-pci,drive=swap");
        }
 

diff --git a/src/org/tizen/emulator/manager/vms/option/CommonOption.java b/src/org/tizen/emulator/manager/vms/option/CommonOption.java
index f1d8bb0..be83b88 100644 (file)
--- a/src/org/tizen/emulator/manager/vms/option/CommonOption.java
+++ b/src/org/tizen/emulator/manager/vms/option/CommonOption.java
@@ -46,10 +46,10 @@ public class CommonOption extends Option {
 
                // kernel log
                config.addKernelOption("console", "ttyS0");
-               config.addVariableWithSpace(OPTION_KEY.VAR_KERNEL_LOG, varForm(OPTION_KEY.VAR_VMS_PATH.toString())
-                               + File.separator + varForm(OPTION_KEY.VAR_VM_NAME.toString()) + File.separator
+               config.addVariableWithSpace(OPTION_KEY.VAR_KERNEL_LOG, varForm(OPTION_KEY.VAR_VMS_PATH)
+                               + File.separator + varForm(OPTION_KEY.VAR_VM_NAME) + File.separator
                                + "logs" + File.separator + "emulator.klog");
-               config.addQemuOption("-chardev", "file,path=" + varForm(OPTION_KEY.VAR_KERNEL_LOG.toString())
+               config.addQemuOption("-chardev", "file,path=" + varForm(OPTION_KEY.VAR_KERNEL_LOG)
                                + ",id=con0");
                config.addQemuOption("-device isa-serial,chardev=con0");
                config.addQemuOption("-device virtio-serial");
@@ -69,15 +69,15 @@ public class CommonOption extends Option {
                String emulatorPath = property.getPropertyValue().baseImage.getPlatform().getEmulatorPath();
                // bios
                config.addVariableWithSpace(OPTION_KEY.VAR_BIOS_PATH, FilePathResources.getEmulatorBiosPath(emulatorPath));
-               config.addQemuOption("-L", varForm(OPTION_KEY.VAR_BIOS_PATH.toString()));
+               config.addQemuOption("-L", varForm(OPTION_KEY.VAR_BIOS_PATH));
 
                // kernel image
                config.addVariableWithSpace(OPTION_KEY.VAR_KERNEL, FilePathResources.getEmulatorKernelPath(emulatorPath)
                                + File.separator + "bzImage." + property.getArch().toString());
-               config.addQemuOption("-kernel", varForm(OPTION_KEY.VAR_KERNEL.toString()));
+               config.addQemuOption("-kernel", varForm(OPTION_KEY.VAR_KERNEL));
 
                // kernel
-               config.addQemuOption("-append", varForm(OPTION_KEY.VAR_APPEND.toString()));
+               config.addQemuOption("-append", varForm(OPTION_KEY.VAR_APPEND));
 
        }
 

diff --git a/src/org/tizen/emulator/manager/vms/option/DisplayOption.java b/src/org/tizen/emulator/manager/vms/option/DisplayOption.java
index f654165..3deb540 100644 (file)
--- a/src/org/tizen/emulator/manager/vms/option/DisplayOption.java
+++ b/src/org/tizen/emulator/manager/vms/option/DisplayOption.java
@@ -56,12 +56,12 @@ public class DisplayOption extends Option {
                }
                config.addVariable(OPTION_KEY.VAR_RESOLUTION, width + "x" + height);
 
-               config.addSkinOption("skin.path", varForm(OPTION_KEY.VAR_SKIN_PATH.toString()));
-               config.addSkinOption("resolution", varForm(OPTION_KEY.VAR_RESOLUTION.toString()));
-               config.addSkinOption("vm.path", varForm(OPTION_KEY.VAR_VMS_PATH.toString()) + File.separator
-                               + varForm(OPTION_KEY.VAR_VM_NAME.toString()));
+               config.addSkinOption("skin.path", varForm(OPTION_KEY.VAR_SKIN_PATH));
+               config.addSkinOption("resolution", varForm(OPTION_KEY.VAR_RESOLUTION));
+               config.addSkinOption("vm.path", varForm(OPTION_KEY.VAR_VMS_PATH) + File.separator
+                               + varForm(OPTION_KEY.VAR_VM_NAME));
 
-               config.addKernelOption("video", "LVDS-1:" + varForm(OPTION_KEY.VAR_RESOLUTION.toString())
+               config.addKernelOption("video", "LVDS-1:" + varForm(OPTION_KEY.VAR_RESOLUTION)
                                + "-32@60");
                config.addKernelOption("dpi", String.valueOf(dpi * 10));
 

diff --git a/src/org/tizen/emulator/manager/vms/option/NetProxyOption.java b/src/org/tizen/emulator/manager/vms/option/NetProxyOption.java
index 30e9903..1ac2179 100644 (file)
--- a/src/org/tizen/emulator/manager/vms/option/NetProxyOption.java
+++ b/src/org/tizen/emulator/manager/vms/option/NetProxyOption.java
@@ -87,7 +87,7 @@ public class NetProxyOption extends Option {
 
                if (proxyConfig != null) {
                        config.addVariable(OPTION_KEY.VAR_NETWORK_PROXY, "\"" + proxyConfig + "\"", comment);
-                       config.addKernelOption(varForm(OPTION_KEY.VAR_NETWORK_PROXY.toString()));
+                       config.addKernelOption(varForm(OPTION_KEY.VAR_NETWORK_PROXY));
                }
        }
 

diff --git a/src/org/tizen/emulator/manager/vms/option/NetworkOption.java b/src/org/tizen/emulator/manager/vms/option/NetworkOption.java
index 597cc85..1bc40ff 100644 (file)
--- a/src/org/tizen/emulator/manager/vms/option/NetworkOption.java
+++ b/src/org/tizen/emulator/manager/vms/option/NetworkOption.java
@@ -63,7 +63,7 @@ public class NetworkOption extends Option {
                        }
                        netArgument = "virtio-net-pci,netdev=net0";
                        config.addVariable(OPTION_KEY.VAR_MAC, getMacAddr(isBridge, property));
-                       netArgument += ",mac=" + varForm(OPTION_KEY.VAR_MAC.toString());
+                       netArgument += ",mac=" + varForm(OPTION_KEY.VAR_MAC);
 
                } else {
                        config.addQemuOption("-netdev", "user,id=net0");

diff --git a/src/org/tizen/emulator/manager/vms/option/Option.java b/src/org/tizen/emulator/manager/vms/option/Option.java
index f66a193..a770ec7 100644 (file)
--- a/src/org/tizen/emulator/manager/vms/option/Option.java
+++ b/src/org/tizen/emulator/manager/vms/option/Option.java
@@ -43,7 +43,7 @@ public abstract class Option implements IOption {
                IOption opt = instanceMap.get(type);
                if (opt == null) {
                        try {
-                               opt = (IOption) type.newInstance();
+                               opt = type.newInstance();
                                instanceMap.put(type, opt);
 
                        } catch (InstantiationException e) {
@@ -56,7 +56,11 @@ public abstract class Option implements IOption {
                return opt;
        }
 
+       public static String varForm(OPTION_KEY key) {
+               return "${" + key.toString() + "}";
+       }
 
+       @Deprecated
        public static String varForm(String var) {
                return "${" + var + "}";
        }

diff --git a/src/org/tizen/emulator/manager/vms/option/ProcessorOption.java b/src/org/tizen/emulator/manager/vms/option/ProcessorOption.java
index 98bc644..58901e6 100644 (file)
--- a/src/org/tizen/emulator/manager/vms/option/ProcessorOption.java
+++ b/src/org/tizen/emulator/manager/vms/option/ProcessorOption.java
@@ -41,7 +41,7 @@ public class ProcessorOption extends Option {
        @Override
        public void getLaunchArgument(LaunchConfig config, VMProperty property) {
                config.addVariable(OPTION_KEY.VAR_PROCESS_NUM, String.valueOf(getCpuNum(property)));
-               config.addQemuOption("-smp", varForm(OPTION_KEY.VAR_PROCESS_NUM.toString()));
+               config.addQemuOption("-smp", varForm(OPTION_KEY.VAR_PROCESS_NUM));
        }
 
        @Override

diff --git a/src/org/tizen/emulator/manager/vms/option/RamSizeOption.java b/src/org/tizen/emulator/manager/vms/option/RamSizeOption.java
index fe37559..19c441e 100644 (file)
--- a/src/org/tizen/emulator/manager/vms/option/RamSizeOption.java
+++ b/src/org/tizen/emulator/manager/vms/option/RamSizeOption.java
@@ -37,7 +37,7 @@ public class RamSizeOption extends Option {
                int ramSize = property.getConfiguration().getDevice().getRAM()
                                .getSize().getValue();
                config.addVariable(OPTION_KEY.VAR_RAM, String.valueOf(ramSize));
-               config.addQemuOption("-m", varForm(OPTION_KEY.VAR_RAM.toString()));
+               config.addQemuOption("-m", varForm(OPTION_KEY.VAR_RAM));
        }
 
 }

diff --git a/src/org/tizen/emulator/manager/vms/option/TouchPointOption.java b/src/org/tizen/emulator/manager/vms/option/TouchPointOption.java
index 0a89be9..d8a6bb1 100644 (file)
--- a/src/org/tizen/emulator/manager/vms/option/TouchPointOption.java
+++ b/src/org/tizen/emulator/manager/vms/option/TouchPointOption.java
@@ -42,7 +42,7 @@ public class TouchPointOption extends Option {
                                        String.valueOf(touchType.getMaxTouchPoint()));
                }
                config.addQemuOption("-device", "virtio-touchscreen-pci,max_point="
-                               + varForm(OPTION_KEY.VAR_MAX_POINT.toString()));
+                               + varForm(OPTION_KEY.VAR_MAX_POINT));
        }
 
 }

diff --git a/src/org/tizen/emulator/manager/vms/option/VMNameOption.java b/src/org/tizen/emulator/manager/vms/option/VMNameOption.java
index 1e82477..b23fe4e 100644 (file)
--- a/src/org/tizen/emulator/manager/vms/option/VMNameOption.java
+++ b/src/org/tizen/emulator/manager/vms/option/VMNameOption.java
@@ -36,7 +36,7 @@ public class VMNameOption extends Option{
        @Override
        public void getLaunchArgument(LaunchConfig config, VMProperty property) {
                config.addVariable(OPTION_KEY.VAR_VM_NAME, property.getPropertyValue().vmsName);
-               config.addKernelOption("vm_name", varForm(OPTION_KEY.VAR_VM_NAME.toString()));
+               config.addKernelOption("vm_name", varForm(OPTION_KEY.VAR_VM_NAME));
        }
 
 }