option: remove SWT skin option from 3.0
authorminkee.lee <minkee.lee@samsung.com>
Wed, 27 Jan 2016 06:47:22 +0000 (15:47 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Wed, 27 Jan 2016 08:00:16 +0000 (17:00 +0900)
From tizen-3.0, skin option is removed in "vm_launch.conf" file.
(SWT skin is not used from 3.0)

Change-Id: Ifb2e6af952e33487f60282905f220dfe5c9bd515
Signed-off-by: minkee.lee <minkee.lee@samsung.com>
src/org/tizen/emulator/manager/vms/option/DisplayOption.java
src/org/tizen/emulator/manager/vms/option/LaunchConfig.java

index 2102cd0..58d63df 100644 (file)
@@ -58,10 +58,13 @@ public class DisplayOption extends Option {
                }
 
                config.addVariable(opt_resolution, width + "x" + height); //$NON-NLS-1$
-               config.addSkinOption("resolution", varForm(opt_resolution)); //$NON-NLS-1$
-               config.addSkinOption("skin.path", varForm(OPTION_KEY.VAR_SKIN_PATH)); //$NON-NLS-1$
-               config.addSkinOption("vm.path", varForm(OPTION_KEY.VAR_VMS_PATH) + File.separator //$NON-NLS-1$
-                               + varForm(OPTION_KEY.VAR_VM_NAME));
+
+               if (islesserThan(property.getImageVersion(), "3.0")) {
+                       config.addSkinOption("resolution", varForm(opt_resolution)); //$NON-NLS-1$
+                       config.addSkinOption("skin.path", varForm(OPTION_KEY.VAR_SKIN_PATH)); //$NON-NLS-1$
+                       config.addSkinOption("vm.path", varForm(OPTION_KEY.VAR_VMS_PATH) + File.separator //$NON-NLS-1$
+                                       + varForm(OPTION_KEY.VAR_VM_NAME));
+               }
 
                config.addKernelOption("video", "LVDS-1:" + varForm(opt_resolution) //$NON-NLS-1$ //$NON-NLS-2$
                                + "-32@60"); //$NON-NLS-1$
index 65cfcdf..58845f2 100644 (file)
@@ -189,12 +189,14 @@ public class LaunchConfig {
                        bw.newLine();
 
                        // Write skin options.
-                       bw.newLine();
-                       bw.write(SKIN_OPTIONS);
-                       bw.newLine();
-                       for (String str : skinOptions) {
-                               bw.write(str);
+                       if (skinOptions.size() > 0) {
                                bw.newLine();
+                               bw.write(SKIN_OPTIONS);
+                               bw.newLine();
+                               for (String str : skinOptions) {
+                                       bw.write(str);
+                                       bw.newLine();
+                               }
                        }
 
                        // Write qemu options.