From e1cc22d4d906b632793d3ceecba23e9c8f1c9cd0 Mon Sep 17 00:00:00 2001 From: GiWoong Kim Date: Tue, 1 Oct 2013 11:37:37 +0900 Subject: [PATCH] skin: modified class name KeyWindowImageRegistry -> SpecialKeyWindowImageRegistry Change-Id: I43a8f738bb2284f6958d92f6d671d8b3ffe362e3 Signed-off-by: GiWoong Kim --- .../org/tizen/emulator/skin/custom/GeneralKeyWindow.java | 2 +- .../org/tizen/emulator/skin/custom/SpecialKeyWindow.java | 8 ++++---- .../skin/image/GeneralKeyWindowImageRegistry.java | 4 ++-- ...geRegistry.java => SpecialKeyWindowImageRegistry.java} | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) rename tizen/src/skin/client/src/org/tizen/emulator/skin/image/{KeyWindowImageRegistry.java => SpecialKeyWindowImageRegistry.java} (96%) diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/GeneralKeyWindow.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/GeneralKeyWindow.java index 5a1084e98e..a9c196a8b4 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/GeneralKeyWindow.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/GeneralKeyWindow.java @@ -108,7 +108,7 @@ public class GeneralKeyWindow extends SkinWindow { SWT.NO_TRIM | SWT.RESIZE | SWT.TOOL); } - this.imageRegistry = new GeneralKeyWindowImageRegistry(); + this.imageRegistry = new GeneralKeyWindowImageRegistry(shell.getDisplay()); this.frameMaker = new SkinPatches(PATCH_IMAGES_PATH); this.keyMapList = keyMapList; //TODO: null diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/SpecialKeyWindow.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/SpecialKeyWindow.java index 0663f8c08c..88db58851f 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/SpecialKeyWindow.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/SpecialKeyWindow.java @@ -59,8 +59,8 @@ import org.tizen.emulator.skin.comm.sock.data.MouseEventData; import org.tizen.emulator.skin.config.EmulatorConfig; import org.tizen.emulator.skin.dbi.EmulatorUI; import org.tizen.emulator.skin.exception.JaxbException; -import org.tizen.emulator.skin.image.KeyWindowImageRegistry; -import org.tizen.emulator.skin.image.KeyWindowImageRegistry.SpecailKeyWindowImageType; +import org.tizen.emulator.skin.image.SpecialKeyWindowImageRegistry; +import org.tizen.emulator.skin.image.SpecialKeyWindowImageRegistry.SpecailKeyWindowImageType; import org.tizen.emulator.skin.layout.HWKey; import org.tizen.emulator.skin.util.IOUtil; import org.tizen.emulator.skin.util.JaxbUtil; @@ -82,7 +82,7 @@ public class SpecialKeyWindow extends SkinWindow { private Image keyWindowPressedImage; private Color colorFrame; - private KeyWindowImageRegistry imageRegistry; + private SpecialKeyWindowImageRegistry imageRegistry; private SocketCommunicator communicator; private ShellListener shellListener; @@ -120,7 +120,7 @@ public class SpecialKeyWindow extends SkinWindow { EmulatorUI dbiContents = loadXMLForKeyWindow(specialKeyWindowPath); /* image init */ - this.imageRegistry = new KeyWindowImageRegistry(shell.getDisplay(), dbiContents, specialKeyWindowPath); + this.imageRegistry = new SpecialKeyWindowImageRegistry(shell.getDisplay(), dbiContents, specialKeyWindowPath); /* get keywindow image */ keyWindowImage = imageRegistry.getSpecialKeyWindowImage(EmulatorConfig.DEFAULT_WINDOW_ROTATION, SpecailKeyWindowImageType.SPECIAL_IMAGE_TYPE_NORMAL); diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/image/GeneralKeyWindowImageRegistry.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/image/GeneralKeyWindowImageRegistry.java index 4505d3a27d..e1c841c01a 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/image/GeneralKeyWindowImageRegistry.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/image/GeneralKeyWindowImageRegistry.java @@ -77,8 +77,8 @@ public class GeneralKeyWindowImageRegistry { /** * Constructor */ - public GeneralKeyWindowImageRegistry() { - this.display = Display.getDefault(); + public GeneralKeyWindowImageRegistry(Display display) { + this.display = display; this.keyWindowImageMap = new HashMap(); } diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/image/KeyWindowImageRegistry.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/image/SpecialKeyWindowImageRegistry.java similarity index 96% rename from tizen/src/skin/client/src/org/tizen/emulator/skin/image/KeyWindowImageRegistry.java rename to tizen/src/skin/client/src/org/tizen/emulator/skin/image/SpecialKeyWindowImageRegistry.java index 2b0d9dd78d..9e413c3d4d 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/image/KeyWindowImageRegistry.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/image/SpecialKeyWindowImageRegistry.java @@ -51,9 +51,9 @@ import org.tizen.emulator.skin.util.SkinRotation; * * */ -public class KeyWindowImageRegistry { +public class SpecialKeyWindowImageRegistry { private static Logger logger = - SkinLogger.getSkinLogger(KeyWindowImageRegistry.class).getLogger(); + SkinLogger.getSkinLogger(SpecialKeyWindowImageRegistry.class).getLogger(); public enum SpecailKeyWindowImageType { SPECIAL_IMAGE_TYPE_NORMAL, @@ -68,7 +68,7 @@ public class KeyWindowImageRegistry { /** * Constructor */ - public KeyWindowImageRegistry( + public SpecialKeyWindowImageRegistry( Display display, EmulatorUI dbiContents, String skinPath) { this.display = display; this.skinPath = skinPath; -- 2.34.1