skin: modified skin layout name

PhoneShapeSkin -> ProfileSpecificSkin

Change-Id: I75d0805ab8502f379e9c22efdc4648f80b3637ae
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 6d2c7f1..d76bb9c 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
@@ -91,7 +91,7 @@ import org.tizen.emulator.skin.image.ImageRegistry;
 import org.tizen.emulator.skin.info.SkinInformation;
 import org.tizen.emulator.skin.layout.GeneralPurposeSkinComposer;
 import org.tizen.emulator.skin.layout.ISkinComposer;
-import org.tizen.emulator.skin.layout.PhoneShapeSkinComposer;
+import org.tizen.emulator.skin.layout.ProfileSpecificSkinComposer;
 import org.tizen.emulator.skin.log.SkinLogger;
 import org.tizen.emulator.skin.menu.PopupMenu;
 import org.tizen.emulator.skin.screenshot.ScreenShotDialog;
@@ -253,10 +253,10 @@ public class EmulatorSkin {
                imageRegistry = ImageRegistry.getInstance();
 
                if (skinInfo.isGeneralPurposeSkin() == false) {
-                       skinComposer = new PhoneShapeSkinComposer(config, this,
+                       skinComposer = new ProfileSpecificSkinComposer(config, this,
                                        shell, currentState, imageRegistry, communicator);
 
-                       ((PhoneShapeSkinComposer) skinComposer).addPhoneShapeListener(shell);
+                       ((ProfileSpecificSkinComposer) skinComposer).addProfileSpecificListener(shell);
                } else { /* general purpose skin */
                        skinComposer = new GeneralPurposeSkinComposer(config, this,
                                        shell, currentState, imageRegistry);
@@ -1211,21 +1211,8 @@ public class EmulatorSkin {
                                shell.getDisplay().syncExec(new Runnable() {
                                        @Override
                                        public void run() {
-//                                             Point location = new Point(100, 100);
-//
-//                                             if (skinInfo.isPhoneShape()) { /* TODO: */
-//                                                     location = shell.getLocation();
-//                                                     shell.setVisible(false);
-//                                             }
-
                                                skinComposer.arrangeSkin(currentState.getCurrentScale(), rotationId);
 
-//                                             if (skinInfo.isPhoneShape()) { /* TODO: */
-//                                                     shell.setVisible(true);
-//                                                     shell.setLocation(location);
-//                                                     SkinUtil.setTopMost(shell, isOnTop);
-//                                             }
-
                                                /* location correction */
                                                Rectangle monitorBounds = Display.getDefault().getBounds();
                                                Rectangle emulatorBounds = shell.getBounds();
@@ -1291,21 +1278,8 @@ public class EmulatorSkin {
                                shell.getDisplay().syncExec(new Runnable() {
                                        @Override
                                        public void run() {
-//                                             Point location = new Point(100, 100);
-//
-//                                             if (skinInfo.isPhoneShape()) { /* TODO: */
-//                                                     location = shell.getLocation();
-//                                                     shell.setVisible(false);
-//                                             }
-
                                                skinComposer.arrangeSkin(scale, currentState.getCurrentRotationId());
 
-//                                             if (skinInfo.isPhoneShape()) { /* TODO: */
-//                                                     shell.setVisible(true);
-//                                                     shell.setLocation(location);
-//                                                     SkinUtil.setTopMost(shell, isOnTop);
-//                                             }
-
                                                /* location correction */
                                                Rectangle monitorBounds = Display.getDefault().getBounds();
                                                Rectangle emulatorBounds = shell.getBounds();

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 c47ad63..8acce3a 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
@@ -1,5 +1,5 @@
 /**
- * 
+ * General-Purpose Skin Layout
  *
  * Copyright (C) 2011 - 2013 Samsung Electronics Co., Ltd. All rights reserved.
  *

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/ProfileSpecificSkinComposer.java
similarity index 98%
rename from tizen/src/skin/client/src/org/tizen/emulator/skin/layout/PhoneShapeSkinComposer.java
rename to tizen/src/skin/client/src/org/tizen/emulator/skin/layout/ProfileSpecificSkinComposer.java
index 3413214..54852c0 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/ProfileSpecificSkinComposer.java
@@ -1,5 +1,5 @@
 /**
- * 
+ * Profile-Specific Skin Layout
  *
  * Copyright (C) 2011 - 2013 Samsung Electronics Co., Ltd. All rights reserved.
  *
@@ -68,9 +68,9 @@ import org.tizen.emulator.skin.util.SkinRotation;
 import org.tizen.emulator.skin.util.SkinUtil;
 import org.tizen.emulator.skin.util.SwtUtil;
 
-public class PhoneShapeSkinComposer implements ISkinComposer {
+public class ProfileSpecificSkinComposer implements ISkinComposer {
        private Logger logger = SkinLogger.getSkinLogger(
-                       PhoneShapeSkinComposer.class).getLogger();
+                       ProfileSpecificSkinComposer.class).getLogger();
 
        private EmulatorConfig config;
        private EmulatorSkin skin;
@@ -88,7 +88,7 @@ public class PhoneShapeSkinComposer implements ISkinComposer {
        private boolean isGrabbedShell;
        private Point grabPosition;
 
-       public PhoneShapeSkinComposer(EmulatorConfig config, EmulatorSkin skin,
+       public ProfileSpecificSkinComposer(EmulatorConfig config, EmulatorSkin skin,
                        Shell shell, EmulatorSkinState currentState,
                        ImageRegistry imageRegistry, SocketCommunicator communicator) {
                this.config = config;
@@ -270,7 +270,7 @@ public class PhoneShapeSkinComposer implements ISkinComposer {
                return lcdBounds;
        }
 
-       public void addPhoneShapeListener(final Shell shell) {
+       public void addProfileSpecificListener(final Shell shell) {
                shellPaintListener = new PaintListener() {
                        @Override
                        public void paintControl(final PaintEvent e) {