skin: modified function name

isPhoneShape -> isGeneralPurposeSkin

Change-Id: I09019c6a7b1ba427fcf42dda360f34cbd61f1a88
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 1616c11b98129a2ee6ce20742e65baaa2b873f72..463f382b661808ed37dc7182bb97f8720ed1de3b 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
@@ -252,7 +252,7 @@ public class EmulatorSkin {
        public long initLayout() {
                imageRegistry = ImageRegistry.getInstance();
 
-               if (skinInfo.isPhoneShape() == true) { /* phone shape skin */
+               if (skinInfo.isGeneralPurposeSkin() == false) {
                        skinComposer = new PhoneShapeSkinComposer(config, this,
                                        shell, currentState, imageRegistry, communicator);
 
@@ -426,9 +426,7 @@ public class EmulatorSkin {
                                                config.saveSkinProperties();
 
                                                /* close the Key Window */
-                                               if (skinInfo.isPhoneShape() == false) {
-                                                       closeKeyWindow();
-                                               }
+                                               closeKeyWindow();
 
                                                /* dispose the color */
                                                if (colorVM != null) {

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkinMain.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkinMain.java
index c01f4835ab6aa9ec5e24d1362498ae70f3cb76d1..d50a289a7f25fc2b915134b4bbe009c2d66a71e4 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkinMain.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkinMain.java
@@ -166,18 +166,18 @@ public class EmulatorSkinMain {
                                logger.info("skin info:" + skinInfoProperties); //TODO:
                        }
 
-                       boolean skinPhoneShape = true;
                        String skinInfoResolutionW =
                                        skinInfoProperties.getProperty(SkinInfoConstants.RESOLUTION_WIDTH);
                        String skinInfoResolutionH =
                                        skinInfoProperties.getProperty(SkinInfoConstants.RESOLUTION_HEIGHT);
 
+                       boolean isGeneralSkin = false;
                        if (skinInfoResolutionW.equalsIgnoreCase("all") ||
                                        skinInfoResolutionH.equalsIgnoreCase("all")) {
-                               skinPhoneShape = false;
+                               isGeneralSkin = true;
                        }
                        SkinInformation skinInfo = new SkinInformation(
-                                       skinInfoProperties.getProperty(SkinInfoConstants.SKIN_NAME), skinPhoneShape);
+                                       skinInfoProperties.getProperty(SkinInfoConstants.SKIN_NAME), isGeneralSkin);
 
                        /* set emulator window skin property */
                        String skinPropFilePath = vmPath + File.separator + SKIN_PROPERTIES_FILE_NAME;

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/AboutDialog.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/AboutDialog.java
index bc79b17261e4371649672841059e28d39cc464a6..17acbf7d0a4b7c9ccae9bf36e1be8a9745a2f06c 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/AboutDialog.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/AboutDialog.java
@@ -36,7 +36,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Color;
@@ -45,7 +44,6 @@ import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.program.Program;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/info/SkinInformation.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/info/SkinInformation.java
index 434ea1526fe6d49251bdf9a1ef9e1248e30c7a02..09dc1abbdd9a82a8079a8a31722249690c3fc6fd 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/info/SkinInformation.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/info/SkinInformation.java
@@ -1,7 +1,7 @@
 /**
  * 
  *
- * Copyright (C) 2011 - 2012 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (C) 2011 - 2013 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Contact:
  * GiWoong Kim <giwoong.kim@samsung.com>
@@ -33,12 +33,12 @@ package org.tizen.emulator.skin.info;
  */
 public class SkinInformation {
        private String skinName;
-       private boolean skinPhoneShape;
+       private boolean isGeneralSkin;
        private int skinOption;
 
-       public SkinInformation(String skinName, boolean skinPhoneShape) {
+       public SkinInformation(String skinName, boolean isGeneralSkin) {
                this.skinName = skinName;
-               this.skinPhoneShape = skinPhoneShape;
+               this.isGeneralSkin = isGeneralSkin;
                this.skinOption = 0;
        }
 
@@ -46,8 +46,8 @@ public class SkinInformation {
                return skinName;
        }
 
-       public boolean isPhoneShape() {
-               return skinPhoneShape;
+       public boolean isGeneralPurposeSkin() {
+               return isGeneralSkin;
        }
        
        public int getSkinOption() {

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java
index a932632268b79f27b182bda2df74985046557052..aa4475d26de062cb75162622b1085add1d5ca469 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java
@@ -48,8 +48,6 @@ import org.eclipse.swt.widgets.Shell;
 import org.tizen.emulator.skin.EmulatorSkin;
 import org.tizen.emulator.skin.EmulatorSkinState;
 import org.tizen.emulator.skin.comm.ICommunicator.RotationInfo;
-import org.tizen.emulator.skin.comm.ICommunicator.SendCommand;
-import org.tizen.emulator.skin.comm.sock.data.DisplayStateData;
 import org.tizen.emulator.skin.config.EmulatorConfig;
 import org.tizen.emulator.skin.config.EmulatorConfig.ArgsConstants;
 import org.tizen.emulator.skin.config.EmulatorConfig.SkinPropertiesConstants;
@@ -231,9 +229,9 @@ public class GeneralPurposeSkinComposer implements ISkinComposer {
                                currentState.getCurrentResolutionHeight(), scale, rotationId);
 
                if (displayBounds == null) {
-                       logger.severe("Failed to lcd information for phone shape skin.");
+                       logger.severe("Failed to read display information for skin.");
                        SkinUtil.openMessage(shell, null,
-                                       "Failed to read lcd information for phone shape skin.\n" +
+                                       "Failed to read display information for skin.\n" +
                                        "Check the contents of skin dbi file.",
                                        SWT.ICON_ERROR, config);
                        System.exit(-1);

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/PhoneShapeSkinComposer.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/PhoneShapeSkinComposer.java
index 44210638417e3d9c6fdbc75b0cbdae0a5422ca72..b1e85598e8995e9488adeeb2dccc1f778f72b29b 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/PhoneShapeSkinComposer.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/PhoneShapeSkinComposer.java
@@ -174,9 +174,9 @@ public class PhoneShapeSkinComposer implements ISkinComposer {
                                currentState.getCurrentResolutionHeight(), scale, rotationId);
 
                if (lcdBounds == null) {
-                       logger.severe("Failed to lcd information for phone shape skin.");
+                       logger.severe("Failed to read display information for skin.");
                        SkinUtil.openMessage(shell, null,
-                                       "Failed to read lcd information for phone shape skin.\n" +
+                                       "Failed to read display information for skin.\n" +
                                        "Check the contents of skin dbi file.",
                                        SWT.ICON_ERROR, config);
                        System.exit(-1);