From 7e2085531c60452407cefc8799ce1603e52b43ca Mon Sep 17 00:00:00 2001 From: GiWoong Kim Date: Tue, 11 Mar 2014 17:07:53 +0900 Subject: [PATCH] skin: source clean-up add HW key informations to SkinRotations modified some variable names move HWKeyRegion to layout package Change-Id: Icdd777654030f3ac4cd564ca91bf633d46913329 Signed-off-by: GiWoong Kim --- .../org/tizen/emulator/skin/EmulatorSkin.java | 12 +++---- .../skin/image/ProfileSkinImageRegistry.java | 3 +- .../org/tizen/emulator/skin/layout/HWKey.java | 1 - .../skin/{util => layout}/HWKeyRegion.java | 2 +- .../layout/ProfileSpecificSkinComposer.java | 11 ++++--- .../skin/layout/rotation/Rotation.java | 31 +++++++++++++++++-- .../emulator/skin/menu/SpecialKeyWindow.java | 2 +- .../tizen/emulator/skin/util/SkinUtil.java | 29 +++++------------ 8 files changed, 53 insertions(+), 38 deletions(-) rename tizen/src/skin/client/src/org/tizen/emulator/skin/{util => layout}/HWKeyRegion.java (97%) 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 089d06a3fb..4a33e7335d 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 @@ -567,11 +567,11 @@ public class EmulatorSkin { } } - DisplayStateData lcdStateData = new DisplayStateData( + DisplayStateData stateData = new DisplayStateData( currentState.getCurrentScale(), currentState.getCurrentRotationId()); communicator.sendToQEMU(SendCommand.SEND_DISPLAY_STATE, - lcdStateData, false); + stateData, false); } }; @@ -1509,10 +1509,10 @@ public class EmulatorSkin { } }); - DisplayStateData lcdStateData = new DisplayStateData( + DisplayStateData stateData = new DisplayStateData( currentState.getCurrentScale(), rotationId); communicator.sendToQEMU(SendCommand.SEND_DISPLAY_STATE, - lcdStateData, false); + stateData, false); } }; @@ -1553,10 +1553,10 @@ public class EmulatorSkin { } }); - DisplayStateData lcdStateData = new DisplayStateData(scale, + DisplayStateData stateData = new DisplayStateData(scale, currentState.getCurrentRotationId()); communicator.sendToQEMU(SendCommand.SEND_DISPLAY_STATE, - lcdStateData, false); + stateData, false); } }; 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 8bc35efdec..b83bfa7611 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,6 +42,7 @@ 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.Rotation; import org.tizen.emulator.skin.layout.rotation.SkinRotations; import org.tizen.emulator.skin.log.SkinLogger; @@ -87,7 +88,7 @@ public class ProfileSkinImageRegistry { logger.info("get skin image from " + skinPath); - RotationType targetRotation = SkinRotations.getRotation(id); + Rotation targetRotation = SkinRotations.getRotation(id); if (targetRotation == null) { return null; } diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/HWKey.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/HWKey.java index 23ba4abcd2..73a5d6a764 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/HWKey.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/HWKey.java @@ -28,7 +28,6 @@ package org.tizen.emulator.skin.layout; -import org.tizen.emulator.skin.util.HWKeyRegion; import org.tizen.emulator.skin.util.SkinUtil; public class HWKey { diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/util/HWKeyRegion.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/HWKeyRegion.java similarity index 97% rename from tizen/src/skin/client/src/org/tizen/emulator/skin/util/HWKeyRegion.java rename to tizen/src/skin/client/src/org/tizen/emulator/skin/layout/HWKeyRegion.java index 140d736077..a45dca1381 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/util/HWKeyRegion.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/HWKeyRegion.java @@ -27,7 +27,7 @@ * */ -package org.tizen.emulator.skin.util; +package org.tizen.emulator.skin.layout; /** * 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 6e0fe03070..56819551dd 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 @@ -59,16 +59,15 @@ import org.tizen.emulator.skin.config.EmulatorConfig.SkinPropertiesConstants; import org.tizen.emulator.skin.custom.CustomProgressBar; import org.tizen.emulator.skin.dbi.DisplayType; import org.tizen.emulator.skin.dbi.RegionType; -import org.tizen.emulator.skin.dbi.RotationType; 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.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.util.HWKeyRegion; import org.tizen.emulator.skin.util.SkinUtil; import org.tizen.emulator.skin.util.SwtUtil; @@ -269,7 +268,7 @@ public class ProfileSpecificSkinComposer implements ISkinComposer { Rectangle displayBounds = new Rectangle(0, 0, 0, 0); float convertedScale = SkinUtil.convertScale(scale); - RotationType rotation = SkinRotations.getRotation(rotationId); + Rotation rotation = SkinRotations.getRotation(rotationId); if (rotation == null) { return null; } @@ -434,7 +433,8 @@ public class ProfileSpecificSkinComposer implements ISkinComposer { } final HWKey hwKey = SkinUtil.getHWKey(e.x, e.y, - currentState.getCurrentRotationId(), currentState.getCurrentScale()); + currentState.getCurrentScale(), + currentState.getCurrentRotationId()); if (hwKey == null) { shell.setToolTipText(null); @@ -521,7 +521,8 @@ public class ProfileSpecificSkinComposer implements ISkinComposer { /* HW key handling */ final HWKey hwKey = SkinUtil.getHWKey(e.x, e.y, - currentState.getCurrentRotationId(), currentState.getCurrentScale()); + currentState.getCurrentScale(), + currentState.getCurrentRotationId()); if (hwKey == null) { logger.info("mouseDown in Skin : " + e.x + ", " + e.y); 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 4dafc8dce3..b441083e98 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 @@ -28,17 +28,44 @@ package org.tizen.emulator.skin.layout.rotation; +import java.util.List; + +import org.tizen.emulator.skin.dbi.KeyMapListType; +import org.tizen.emulator.skin.dbi.KeyMapType; import org.tizen.emulator.skin.dbi.RotationType; public class Rotation extends RotationType { private int angle; + private List listHWKey; + + public int getAngle() { + return angle; + } public void setAngle(int degree) { this.angle = degree; } - public int getAngle() { - return angle; + public List getListHWKey() { + if (listHWKey == null) { + KeyMapListType list = getKeyMapList(); + if (list == null) { + /* try to using a KeyMapList of portrait */ + Rotation rotation = SkinRotations.getRotation(SkinRotations.PORTRAIT_ID); + if (rotation == null) { + return null; + } + + list = rotation.getKeyMapList(); + if (list == null) { + return null; + } + } + + listHWKey = list.getKeyMap(); + } + + return listHWKey; } } diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/SpecialKeyWindow.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/SpecialKeyWindow.java index a235bc00a0..ad68a27157 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/SpecialKeyWindow.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/SpecialKeyWindow.java @@ -69,7 +69,7 @@ import org.tizen.emulator.skin.keywindow.dbi.KeyMapType; import org.tizen.emulator.skin.keywindow.dbi.KeyWindowUI; import org.tizen.emulator.skin.keywindow.dbi.RegionType; import org.tizen.emulator.skin.layout.HWKey; -import org.tizen.emulator.skin.util.HWKeyRegion; +import org.tizen.emulator.skin.layout.HWKeyRegion; import org.tizen.emulator.skin.util.IOUtil; import org.tizen.emulator.skin.util.JaxbUtil; import org.tizen.emulator.skin.util.SkinUtil; 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 209795491c..e2c9ac5f77 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 @@ -52,11 +52,11 @@ import org.eclipse.swt.widgets.Shell; import org.tizen.emulator.skin.config.EmulatorConfig; import org.tizen.emulator.skin.config.EmulatorConfig.ArgsConstants; import org.tizen.emulator.skin.dbi.EventInfoType; -import org.tizen.emulator.skin.dbi.KeyMapListType; 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.HWKeyRegion; +import org.tizen.emulator.skin.layout.rotation.Rotation; import org.tizen.emulator.skin.layout.rotation.SkinRotations; import org.tizen.emulator.skin.log.SkinLogger; @@ -169,30 +169,16 @@ public class SkinUtil { } public static List getHWKeyMapList(short rotationId) { - RotationType rotation = SkinRotations.getRotation(rotationId); + Rotation rotation = SkinRotations.getRotation(rotationId); if (rotation == null) { return null; } - KeyMapListType list = rotation.getKeyMapList(); - if (list == null) { - /* try to using a KeyMapList of portrait */ - rotation = SkinRotations.getRotation(SkinRotations.PORTRAIT_ID); - if (rotation == null) { - return null; - } - - list = rotation.getKeyMapList(); - if (list == null) { - return null; - } - } - - return list.getKeyMap(); + return rotation.getListHWKey(); } - public static HWKey getHWKey( - int currentX, int currentY, short rotationId, int scale) { + public static HWKey getHWKey(int currentX, int currentY, + int scale, short rotationId) { float convertedScale = convertScale(scale); List keyMapList = getHWKeyMapList(rotationId); @@ -200,8 +186,9 @@ public class SkinUtil { return null; } + RegionType region = null; for (KeyMapType keyEntry : keyMapList) { - RegionType region = keyEntry.getRegion(); + region = keyEntry.getRegion(); int scaledX = (int) (region.getLeft() * convertedScale); int scaledY = (int) (region.getTop() * convertedScale); -- 2.34.1