From: GiWoong Kim Date: Tue, 11 Mar 2014 01:59:51 +0000 (+0900) Subject: skin: modified SkinRotation class name X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~469^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=82f455554baeca787aa0819c5a73fcb5774baba8;p=sdk%2Femulator%2Fqemu.git skin: modified SkinRotation class name SkinRotation -> SkinRotations and move class to layout.rotation package Change-Id: Ie8c6646b09f2122498a6f28a75b613b2986e8daf Signed-off-by: GiWoong Kim --- diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorFingers.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorFingers.java index 79288e4988..8b2c43bf9a 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorFingers.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorFingers.java @@ -44,8 +44,8 @@ import org.tizen.emulator.skin.comm.ICommunicator.SendCommand; import org.tizen.emulator.skin.comm.sock.SocketCommunicator; import org.tizen.emulator.skin.comm.sock.data.MouseEventData; import org.tizen.emulator.skin.info.EmulatorSkinState; +import org.tizen.emulator.skin.layout.rotation.SkinRotations; import org.tizen.emulator.skin.log.SkinLogger; -import org.tizen.emulator.skin.util.SkinRotation; public class EmulatorFingers { private static final int MAX_FINGER_CNT = 10; @@ -432,13 +432,13 @@ public class EmulatorFingers { /* logger.info("rotatedPointX:" + rotatedPointX + " rotatedPointY:" + rotatedPointY); */ - if (rotationId == SkinRotation.LANDSCAPE_ID) { + if (rotationId == SkinRotations.LANDSCAPE_ID) { rotatedPointX = pointY; rotatedPointY = scaledDisplayWitdh - pointX; - } else if (rotationId == SkinRotation.REVERSE_PORTRAIT_ID) { + } else if (rotationId == SkinRotations.REVERSE_PORTRAIT_ID) { rotatedPointX = scaledDisplayWitdh - pointX; rotatedPointY = scaledDisplayHeight - pointY; - } else if (rotationId == SkinRotation.REVERSE_LANDSCAPE_ID) { + } else if (rotationId == SkinRotations.REVERSE_LANDSCAPE_ID) { rotatedPointX = scaledDisplayHeight - pointY; rotatedPointY = pointX; } else { diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShmSkin.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShmSkin.java index 6ada6e76d5..882b6ff173 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShmSkin.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShmSkin.java @@ -55,9 +55,9 @@ import org.tizen.emulator.skin.dbi.OptionType; import org.tizen.emulator.skin.exception.ScreenShotException; import org.tizen.emulator.skin.image.ImageRegistry.IconName; import org.tizen.emulator.skin.info.SkinInformation; +import org.tizen.emulator.skin.layout.rotation.SkinRotations; import org.tizen.emulator.skin.log.SkinLogger; import org.tizen.emulator.skin.screenshot.ShmScreenShotWindow; -import org.tizen.emulator.skin.util.SkinRotation; import org.tizen.emulator.skin.util.SkinUtil; import org.tizen.emulator.skin.util.SwtUtil; @@ -342,7 +342,7 @@ public class EmulatorShmSkin extends EmulatorSkin { } switch(currentState.getCurrentRotationId()) { - case SkinRotation.LANDSCAPE_ID: + case SkinRotations.LANDSCAPE_ID: /* landscape */ e.gc.setTransform(displayTransform); e.gc.drawImage(bufferPainter.imageFramebuffer, @@ -350,7 +350,7 @@ public class EmulatorShmSkin extends EmulatorSkin { 0, 0, screen_height, screen_width); e.gc.setTransform(null); /* set to the identity transform */ break; - case SkinRotation.REVERSE_PORTRAIT_ID: + case SkinRotations.REVERSE_PORTRAIT_ID: /* reverse-portrait */ e.gc.setTransform(displayTransform); e.gc.drawImage(bufferPainter.imageFramebuffer, @@ -358,7 +358,7 @@ public class EmulatorShmSkin extends EmulatorSkin { 0, 0, screen_width, screen_height); e.gc.setTransform(null); break; - case SkinRotation.REVERSE_LANDSCAPE_ID: + case SkinRotations.REVERSE_LANDSCAPE_ID: /* reverse-landscape */ e.gc.setTransform(displayTransform); e.gc.drawImage(bufferPainter.imageFramebuffer, 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 ec66a68861..089d06a3fb 100755 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java @@ -99,11 +99,11 @@ import org.tizen.emulator.skin.layout.GeneralPurposeSkinComposer; import org.tizen.emulator.skin.layout.ISkinComposer; import org.tizen.emulator.skin.layout.ProfileSpecificSkinComposer; import org.tizen.emulator.skin.layout.rotation.Rotation; +import org.tizen.emulator.skin.layout.rotation.SkinRotations; import org.tizen.emulator.skin.log.SkinLogger; import org.tizen.emulator.skin.menu.KeyWindowKeeper; import org.tizen.emulator.skin.menu.PopupMenu; import org.tizen.emulator.skin.screenshot.ScreenShotDialog; -import org.tizen.emulator.skin.util.SkinRotation; import org.tizen.emulator.skin.util.SkinUtil; import org.tizen.emulator.skin.util.SwtUtil; @@ -1274,18 +1274,18 @@ public class EmulatorSkin { displayTransform = new Transform(lcdCanvas.getDisplay()); short rotationId = currentState.getCurrentRotationId(); - displayTransform.rotate(SkinRotation.getAngle(rotationId)); + displayTransform.rotate(SkinRotations.getAngle(rotationId)); - if (rotationId == SkinRotation.LANDSCAPE_ID) { + if (rotationId == SkinRotations.LANDSCAPE_ID) { /* landscape */ displayTransform.translate( lcdCanvas.getSize().y * -1, 0); - } else if (rotationId == SkinRotation.REVERSE_PORTRAIT_ID) { + } else if (rotationId == SkinRotations.REVERSE_PORTRAIT_ID) { /* reverse-portrait */ displayTransform.translate( lcdCanvas.getSize().x * -1, lcdCanvas.getSize().y * -1); - } else if (rotationId == SkinRotation.REVERSE_LANDSCAPE_ID) { + } else if (rotationId == SkinRotations.REVERSE_LANDSCAPE_ID) { /* reverse-landscape */ displayTransform.translate( 0, lcdCanvas.getSize().x * -1); @@ -1417,7 +1417,7 @@ public class EmulatorSkin { final List rotationList = new ArrayList(); Iterator> iterator = - SkinRotation.getRotationIterator(); + SkinRotations.getRotationIterator(); while (iterator.hasNext()) { Entry entry = iterator.next(); @@ -1441,21 +1441,21 @@ public class EmulatorSkin { for (MenuItem m : rotationList) { short rotationId = (Short) m.getData(); - if (rotationId == SkinRotation.PORTRAIT_ID) { - String landscape = SkinRotation.getRotation( - SkinRotation.LANDSCAPE_ID).getName().value(); + if (rotationId == SkinRotations.PORTRAIT_ID) { + String landscape = SkinRotations.getRotation( + SkinRotations.LANDSCAPE_ID).getName().value(); m.setText(landscape); - } else if (rotationId == SkinRotation.LANDSCAPE_ID) { - String portrait = SkinRotation.getRotation( - SkinRotation.PORTRAIT_ID).getName().value(); + } else if (rotationId == SkinRotations.LANDSCAPE_ID) { + String portrait = SkinRotations.getRotation( + SkinRotations.PORTRAIT_ID).getName().value(); m.setText(portrait); - } else if (rotationId == SkinRotation.REVERSE_PORTRAIT_ID) { - String landscapeReverse = SkinRotation.getRotation( - SkinRotation.REVERSE_LANDSCAPE_ID).getName().value(); + } else if (rotationId == SkinRotations.REVERSE_PORTRAIT_ID) { + String landscapeReverse = SkinRotations.getRotation( + SkinRotations.REVERSE_LANDSCAPE_ID).getName().value(); m.setText(landscapeReverse); - } else if (rotationId == SkinRotation.REVERSE_LANDSCAPE_ID) { - String portraitReverse = SkinRotation.getRotation( - SkinRotation.REVERSE_PORTRAIT_ID).getName().value(); + } else if (rotationId == SkinRotations.REVERSE_LANDSCAPE_ID) { + String portraitReverse = SkinRotations.getRotation( + SkinRotations.REVERSE_PORTRAIT_ID).getName().value(); m.setText(portraitReverse); } } 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 1fe8429209..c8ef6d9f12 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkinMain.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkinMain.java @@ -57,12 +57,12 @@ import org.tizen.emulator.skin.dbi.RotationsType; import org.tizen.emulator.skin.exception.JaxbException; import org.tizen.emulator.skin.image.ImageRegistry; import org.tizen.emulator.skin.info.SkinInformation; +import org.tizen.emulator.skin.layout.rotation.SkinRotations; import org.tizen.emulator.skin.log.SkinLogger; import org.tizen.emulator.skin.log.SkinLogger.SkinLogLevel; import org.tizen.emulator.skin.util.CocoaUtil; import org.tizen.emulator.skin.util.IOUtil; import org.tizen.emulator.skin.util.JaxbUtil; -import org.tizen.emulator.skin.util.SkinRotation; import org.tizen.emulator.skin.util.SkinUtil; import org.tizen.emulator.skin.util.StringUtil; import org.tizen.emulator.skin.util.SwtUtil; @@ -442,7 +442,7 @@ public class EmulatorSkinMain { List rotationList = rotations.getRotation(); for (RotationType rotation : rotationList) { - SkinRotation.put(rotation); + SkinRotations.put(rotation); } } else { logger.severe("Fail to loading rotations element from XML"); diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/image/ProfileSkinImageRegistry.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/image/ProfileSkinImageRegistry.java index e3351c0bee..8bc35efdec 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/image/ProfileSkinImageRegistry.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/image/ProfileSkinImageRegistry.java @@ -42,8 +42,8 @@ import org.tizen.emulator.skin.dbi.EmulatorUI; import org.tizen.emulator.skin.dbi.ImageListType; import org.tizen.emulator.skin.dbi.RotationType; import org.tizen.emulator.skin.dbi.RotationsType; +import org.tizen.emulator.skin.layout.rotation.SkinRotations; import org.tizen.emulator.skin.log.SkinLogger; -import org.tizen.emulator.skin.util.SkinRotation; public class ProfileSkinImageRegistry { private static Logger logger = SkinLogger.getSkinLogger( @@ -87,7 +87,7 @@ public class ProfileSkinImageRegistry { logger.info("get skin image from " + skinPath); - RotationType targetRotation = SkinRotation.getRotation(id); + RotationType targetRotation = SkinRotations.getRotation(id); if (targetRotation == null) { return null; } diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/info/EmulatorSkinState.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/info/EmulatorSkinState.java index c680a5151e..c1e8fcadaa 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/info/EmulatorSkinState.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/info/EmulatorSkinState.java @@ -33,7 +33,7 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; import org.tizen.emulator.skin.config.EmulatorConfig; -import org.tizen.emulator.skin.util.SkinRotation; +import org.tizen.emulator.skin.layout.rotation.SkinRotations; public class EmulatorSkinState { private Point currentResolution; @@ -53,7 +53,7 @@ public class EmulatorSkinState { public EmulatorSkinState() { this.currentResolution = new Point(720, 1280); this.currentScale = EmulatorConfig.DEFAULT_WINDOW_SCALE; - this.currentRotationId = SkinRotation.PORTRAIT_ID; + this.currentRotationId = SkinRotations.PORTRAIT_ID; this.displayBounds = null; this.updateDisplayBounds = false; @@ -106,7 +106,7 @@ public class EmulatorSkinState { } public synchronized void setCurrentRotationId() { - this.currentRotationId = SkinRotation.PORTRAIT_ID; + this.currentRotationId = SkinRotations.PORTRAIT_ID; } public synchronized void setCurrentRotationId(short rotationId) { 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 083be4ff7e..192db9980b 100644 --- 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 @@ -60,10 +60,10 @@ import org.tizen.emulator.skin.image.GeneralSkinImageRegistry; import org.tizen.emulator.skin.image.GeneralSkinImageRegistry.GeneralSkinImageName; import org.tizen.emulator.skin.image.ImageRegistry.IconName; import org.tizen.emulator.skin.info.EmulatorSkinState; +import org.tizen.emulator.skin.layout.rotation.SkinRotations; import org.tizen.emulator.skin.log.SkinLogger; import org.tizen.emulator.skin.menu.KeyWindowKeeper; import org.tizen.emulator.skin.menu.PopupMenu; -import org.tizen.emulator.skin.util.SkinRotation; import org.tizen.emulator.skin.util.SkinUtil; import org.tizen.emulator.skin.util.SwtUtil; @@ -267,21 +267,21 @@ public class GeneralPurposeSkinComposer implements ISkinComposer { } /* arrange the pair tag */ - if (rotationId == SkinRotation.PORTRAIT_ID) { + if (rotationId == SkinRotations.PORTRAIT_ID) { pairTag.setBounds( PAIR_TAG_POSITION_X, PAIR_TAG_POSITION_Y, pairTag.getWidth(), pairTag.getHeight()); - } else if (rotationId == SkinRotation.LANDSCAPE_ID) { + } else if (rotationId == SkinRotations.LANDSCAPE_ID) { pairTag.setBounds( PAIR_TAG_POSITION_Y, shell.getSize().y - PAIR_TAG_POSITION_X - pairTag.getHeight(), pairTag.getWidth(), pairTag.getHeight()); - } else if (rotationId == SkinRotation.REVERSE_PORTRAIT_ID) { + } else if (rotationId == SkinRotations.REVERSE_PORTRAIT_ID) { pairTag.setBounds( shell.getSize().x - PAIR_TAG_POSITION_X - pairTag.getWidth(), shell.getSize().y - PAIR_TAG_POSITION_Y - pairTag.getHeight(), pairTag.getWidth(), pairTag.getHeight()); - } else if (rotationId == SkinRotation.REVERSE_LANDSCAPE_ID) { + } else if (rotationId == SkinRotations.REVERSE_LANDSCAPE_ID) { pairTag.setBounds( shell.getSize().x - PAIR_TAG_POSITION_Y - pairTag.getWidth(), PAIR_TAG_POSITION_X, @@ -308,8 +308,8 @@ public class GeneralPurposeSkinComposer implements ISkinComposer { float convertedScale = SkinUtil.convertScale(scale); /* resoultion, that is display size in general skin mode */ - if (SkinRotation.LANDSCAPE_ID == rotationId || - SkinRotation.REVERSE_LANDSCAPE_ID == rotationId) { + if (SkinRotations.LANDSCAPE_ID == rotationId || + SkinRotations.REVERSE_LANDSCAPE_ID == rotationId) { displayBounds.width = (int)(resolutionH * convertedScale); displayBounds.height = (int)(resolutionW * convertedScale); } else { diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/ProfileSpecificSkinComposer.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/ProfileSpecificSkinComposer.java index 8a917951ef..6e0fe03070 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/ProfileSpecificSkinComposer.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/ProfileSpecificSkinComposer.java @@ -64,11 +64,11 @@ import org.tizen.emulator.skin.image.ImageRegistry.IconName; import org.tizen.emulator.skin.image.ProfileSkinImageRegistry; import org.tizen.emulator.skin.image.ProfileSkinImageRegistry.SkinImageType; import org.tizen.emulator.skin.info.EmulatorSkinState; +import org.tizen.emulator.skin.layout.rotation.SkinRotations; import org.tizen.emulator.skin.log.SkinLogger; import org.tizen.emulator.skin.menu.KeyWindowKeeper; import org.tizen.emulator.skin.menu.PopupMenu; import org.tizen.emulator.skin.util.HWKeyRegion; -import org.tizen.emulator.skin.util.SkinRotation; import org.tizen.emulator.skin.util.SkinUtil; import org.tizen.emulator.skin.util.SwtUtil; @@ -269,7 +269,7 @@ public class ProfileSpecificSkinComposer implements ISkinComposer { Rectangle displayBounds = new Rectangle(0, 0, 0, 0); float convertedScale = SkinUtil.convertScale(scale); - RotationType rotation = SkinRotation.getRotation(rotationId); + RotationType rotation = SkinRotations.getRotation(rotationId); if (rotation == null) { return null; } diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/rotation/Rotation.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/rotation/Rotation.java index ee7310874e..4dafc8dce3 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/rotation/Rotation.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/rotation/Rotation.java @@ -5,6 +5,7 @@ * * Contact: * GiWoong Kim + * YeongKyoon Lee * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/rotation/SkinRotations.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/rotation/SkinRotations.java new file mode 100644 index 0000000000..2818ae0327 --- /dev/null +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/rotation/SkinRotations.java @@ -0,0 +1,106 @@ +/** + * Rotation Informations + * + * Copyright (C) 2011 - 2013 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: + * GiWoong Kim + * YeongKyoon Lee + * HyunJun Son + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Contributors: + * - S-Core Co., Ltd + * + */ + +package org.tizen.emulator.skin.layout.rotation; + +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Map.Entry; + +import org.tizen.emulator.skin.dbi.RotationNameType; +import org.tizen.emulator.skin.dbi.RotationType; + +/** + * + * + */ +public class SkinRotations { + public static final short PORTRAIT_ID = 0; + public static final short LANDSCAPE_ID = 1; + public static final short REVERSE_PORTRAIT_ID = 2; + public static final short REVERSE_LANDSCAPE_ID = 3; + + private static Map rotationMap = + new LinkedHashMap(); + + private SkinRotations() { + /* do nothing */ + } + + public static void put(RotationType rotationType) { + Rotation rotation = new Rotation(); + rotation.setName(rotationType.getName()); + rotation.setDisplay(rotationType.getDisplay()); + rotation.setImageList(rotationType.getImageList()); + rotation.setKeyMapList(rotationType.getKeyMapList()); + + if (RotationNameType.PORTRAIT.value() + .equalsIgnoreCase(rotationType.getName().value())) + { + rotation.setAngle(0); + rotationMap.put(PORTRAIT_ID, rotation); + } + else if (RotationNameType.LANDSCAPE.value() + .equalsIgnoreCase(rotationType.getName().value())) + { + rotation.setAngle(-90); + rotationMap.put(LANDSCAPE_ID, rotation); + } + else if (RotationNameType.REVERSE_PORTRAIT.value() + .equalsIgnoreCase(rotationType.getName().value())) + { + rotation.setAngle(180); + rotationMap.put(REVERSE_PORTRAIT_ID, rotation); + } + else if (RotationNameType.REVERSE_LANDSCAPE.value() + .equalsIgnoreCase(rotationType.getName().value())) + { + rotation.setAngle(90); + rotationMap.put(REVERSE_LANDSCAPE_ID, rotation); + } + } + + public static Rotation getRotation(Short rotationId) { + return rotationMap.get(rotationId); + } + + public static int getAngle(Short rotationId) { + Rotation rotation = rotationMap.get(rotationId); + if (rotation == null) { + return 0; + } + + return rotation.getAngle(); + } + + public static Iterator> getRotationIterator() { + return rotationMap.entrySet().iterator(); + } +} diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/ScreenShotDialog.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/ScreenShotDialog.java index 3adf5525a4..dcccacba7f 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/ScreenShotDialog.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/ScreenShotDialog.java @@ -76,9 +76,9 @@ import org.tizen.emulator.skin.config.EmulatorConfig; import org.tizen.emulator.skin.exception.ScreenShotException; import org.tizen.emulator.skin.image.ImageRegistry; import org.tizen.emulator.skin.image.ImageRegistry.IconName; +import org.tizen.emulator.skin.layout.rotation.SkinRotations; import org.tizen.emulator.skin.log.SkinLogger; import org.tizen.emulator.skin.util.IOUtil; -import org.tizen.emulator.skin.util.SkinRotation; import org.tizen.emulator.skin.util.SkinUtil; import org.tizen.emulator.skin.util.StringUtil; import org.tizen.emulator.skin.util.SwtUtil; @@ -347,15 +347,15 @@ public class ScreenShotDialog { int direction = SWT.NONE; switch (skin.getEmulatorSkinState().getCurrentRotationId()) { - case SkinRotation.PORTRAIT_ID: + case SkinRotations.PORTRAIT_ID: return srcData; - case SkinRotation.LANDSCAPE_ID: + case SkinRotations.LANDSCAPE_ID: direction = SWT.LEFT; break; - case SkinRotation.REVERSE_PORTRAIT_ID: + case SkinRotations.REVERSE_PORTRAIT_ID: direction = SWT.DOWN; break; - case SkinRotation.REVERSE_LANDSCAPE_ID: + case SkinRotations.REVERSE_LANDSCAPE_ID: direction = SWT.RIGHT; break; default: diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinRotation.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinRotation.java deleted file mode 100644 index 495b8545f2..0000000000 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinRotation.java +++ /dev/null @@ -1,107 +0,0 @@ -/** - * Rotation Informations - * - * Copyright (C) 2011 - 2013 Samsung Electronics Co., Ltd. All rights reserved. - * - * Contact: - * GiWoong Kim - * YeongKyoon Lee - * HyunJun Son - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * Contributors: - * - S-Core Co., Ltd - * - */ - -package org.tizen.emulator.skin.util; - -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Map.Entry; - -import org.tizen.emulator.skin.dbi.RotationNameType; -import org.tizen.emulator.skin.dbi.RotationType; -import org.tizen.emulator.skin.layout.rotation.Rotation; - -/** - * - * - */ -public class SkinRotation { - public static final short PORTRAIT_ID = 0; - public static final short LANDSCAPE_ID = 1; - public static final short REVERSE_PORTRAIT_ID = 2; - public static final short REVERSE_LANDSCAPE_ID = 3; - - private static Map rotationMap = - new LinkedHashMap(); - - private SkinRotation() { - /* do nothing */ - } - - public static void put(RotationType rotationType) { - Rotation rotation = new Rotation(); - rotation.setName(rotationType.getName()); - rotation.setDisplay(rotationType.getDisplay()); - rotation.setImageList(rotationType.getImageList()); - rotation.setKeyMapList(rotationType.getKeyMapList()); - - if (RotationNameType.PORTRAIT.value() - .equalsIgnoreCase(rotationType.getName().value())) - { - rotation.setAngle(0); - rotationMap.put(PORTRAIT_ID, rotation); - } - else if (RotationNameType.LANDSCAPE.value() - .equalsIgnoreCase(rotationType.getName().value())) - { - rotation.setAngle(-90); - rotationMap.put(LANDSCAPE_ID, rotation); - } - else if (RotationNameType.REVERSE_PORTRAIT.value() - .equalsIgnoreCase(rotationType.getName().value())) - { - rotation.setAngle(180); - rotationMap.put(REVERSE_PORTRAIT_ID, rotation); - } - else if (RotationNameType.REVERSE_LANDSCAPE.value() - .equalsIgnoreCase(rotationType.getName().value())) - { - rotation.setAngle(90); - rotationMap.put(REVERSE_LANDSCAPE_ID, rotation); - } - } - - public static Rotation getRotation(Short rotationId) { - return rotationMap.get(rotationId); - } - - public static int getAngle(Short rotationId) { - Rotation rotation = rotationMap.get(rotationId); - if (rotation == null) { - return 0; - } - - return rotation.getAngle(); - } - - public static Iterator> getRotationIterator() { - return rotationMap.entrySet().iterator(); - } -} 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 241233ac6d..209795491c 100644 --- 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 @@ -57,6 +57,7 @@ import org.tizen.emulator.skin.dbi.KeyMapType; import org.tizen.emulator.skin.dbi.RegionType; import org.tizen.emulator.skin.dbi.RotationType; import org.tizen.emulator.skin.layout.HWKey; +import org.tizen.emulator.skin.layout.rotation.SkinRotations; import org.tizen.emulator.skin.log.SkinLogger; @@ -168,7 +169,7 @@ public class SkinUtil { } public static List getHWKeyMapList(short rotationId) { - RotationType rotation = SkinRotation.getRotation(rotationId); + RotationType rotation = SkinRotations.getRotation(rotationId); if (rotation == null) { return null; } @@ -176,7 +177,7 @@ public class SkinUtil { KeyMapListType list = rotation.getKeyMapList(); if (list == null) { /* try to using a KeyMapList of portrait */ - rotation = SkinRotation.getRotation(SkinRotation.PORTRAIT_ID); + rotation = SkinRotations.getRotation(SkinRotations.PORTRAIT_ID); if (rotation == null) { return null; } @@ -302,13 +303,13 @@ public class SkinUtil { int rotatedX = x; int rotatedY = y; - if (rotationId == SkinRotation.LANDSCAPE_ID) { + if (rotationId == SkinRotations.LANDSCAPE_ID) { rotatedX = displayWidth - y; rotatedY = x; - } else if (rotationId == SkinRotation.REVERSE_PORTRAIT_ID) { + } else if (rotationId == SkinRotations.REVERSE_PORTRAIT_ID) { rotatedX = displayWidth - x; rotatedY = displayHeight - y; - } else if (rotationId == SkinRotation.REVERSE_LANDSCAPE_ID) { + } else if (rotationId == SkinRotations.REVERSE_LANDSCAPE_ID) { rotatedX = y; rotatedY = displayHeight - x; }