skin: modified skin mode name

none -> general

Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
index e19c8ea..7ffd628 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
@@ -203,7 +203,7 @@ public class EmulatorSkin {
                this.pressedKeyEventList = new LinkedList<KeyEventData>();
                
                int style = SWT.NO_TRIM;
-               if (skinMode == SkinMode.NONE) {
+               if (skinMode == SkinMode.GENERAL) {
                        style = SWT.TITLE | SWT.CLOSE | SWT.MIN | SWT.BORDER;
                }
 
@@ -260,7 +260,7 @@ public class EmulatorSkin {
 
                arrangeSkin(lcdWidth, lcdHeight, scale, rotationId);
 
-               if (skinMode != SkinMode.NONE && null == currentImage) {
+               if (skinMode != SkinMode.GENERAL && null == currentImage) {
                        logger.severe("Failed to load initial skin image file. Kill this skin process.");
                        SkinUtil.openMessage(shell, null,
                                        "Failed to load Skin image file.", SWT.ICON_ERROR, config);
@@ -439,7 +439,7 @@ public class EmulatorSkin {
                this.currentRotationId = rotationId;
                this.currentAngle = SkinRotation.getAngle( rotationId );
 
-               if (skinMode != SkinMode.NONE) {
+               if (skinMode != SkinMode.GENERAL) {
                        Image tempImage = null;
                        Image tempKeyPressedImage = null;
 
@@ -565,7 +565,7 @@ public class EmulatorSkin {
                        }
                };
 
-               if (skinMode != SkinMode.NONE) {
+               if (skinMode != SkinMode.GENERAL) {
                        shell.addPaintListener(shellPaintListener);
                }
 
@@ -619,7 +619,7 @@ public class EmulatorSkin {
 
                };
 
-               if (skinMode != SkinMode.NONE) {
+               if (skinMode != SkinMode.GENERAL) {
                        shell.addMouseTrackListener(shellMouseTrackListener);
                }
 
@@ -685,7 +685,7 @@ public class EmulatorSkin {
                        } //end of mouseMove
                };
 
-               if (skinMode != SkinMode.NONE) {
+               if (skinMode != SkinMode.GENERAL) {
                        shell.addMouseMoveListener(shellMouseMoveListener);
                }
 
@@ -790,7 +790,7 @@ public class EmulatorSkin {
                        }
                };
 
-               if (skinMode != SkinMode.NONE) {
+               if (skinMode != SkinMode.GENERAL) {
                        shell.addMouseListener(shellMouseListener);
                }
 

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/mode/SkinMode.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/mode/SkinMode.java
index 36a6519..7e3a376 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/mode/SkinMode.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/mode/SkinMode.java
@@ -32,7 +32,7 @@ package org.tizen.emulator.skin.mode;
  *
  */
 public enum SkinMode {
-       NONE("none"),
+       GENERAL("general"),
        FULLSCREEN("fullscreen"), /* not used yet */
        DEFAULT("default"),
        CUSTOM("custom"); /* not used yet */

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java
index 5cfe94a..d481916 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java
@@ -117,8 +117,8 @@ public class SkinUtil {
                LcdType lcd = rotation.getLcd();
                RegionType region = lcd.getRegion();
 
-               Integer left = (mode != SkinMode.NONE) ? region.getLeft() : 0;
-               Integer top = (mode != SkinMode.NONE) ? region.getTop() : 0;
+               Integer left = (mode != SkinMode.GENERAL) ? region.getLeft() : 0;
+               Integer top = (mode != SkinMode.GENERAL) ? region.getTop() : 0;
                Integer width = region.getWidth();
                Integer height = region.getHeight();