From 6dc079ef2e282955660878963414ed2ed7ee930a Mon Sep 17 00:00:00 2001 From: "giwoong.kim" Date: Mon, 7 Jan 2013 14:26:02 +0900 Subject: [PATCH] skin: modified class name modified class name for skin Signed-off-by: GiWoong Kim --- .../org/tizen/emulator/skin/EmulatorSdlSkin.java | 3 +- .../org/tizen/emulator/skin/EmulatorShmSkin.java | 5 ++-- .../src/org/tizen/emulator/skin/EmulatorSkin.java | 32 +++++++++++----------- .../{LcdStateData.java => DisplayStateData.java} | 6 ++-- .../ImageButton.java => custom/CustomButton.java} | 6 ++-- .../skin/{window => custom}/CustomProgressBar.java | 2 +- .../ControlPanel.java => custom/KeyWindow.java} | 12 ++++---- .../skin/{window => custom}/SkinWindow.java | 2 +- .../skin/layout/GeneralPurposeSkinComposer.java | 8 +++--- .../skin/layout/PhoneShapeSkinComposer.java | 2 +- 10 files changed, 40 insertions(+), 38 deletions(-) rename tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/data/{LcdStateData.java => DisplayStateData.java} (90%) rename tizen/src/skin/client/src/org/tizen/emulator/skin/{window/ImageButton.java => custom/CustomButton.java} (97%) rename tizen/src/skin/client/src/org/tizen/emulator/skin/{window => custom}/CustomProgressBar.java (98%) rename tizen/src/skin/client/src/org/tizen/emulator/skin/{window/ControlPanel.java => custom/KeyWindow.java} (97%) rename tizen/src/skin/client/src/org/tizen/emulator/skin/{window => custom}/SkinWindow.java (98%) diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSdlSkin.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSdlSkin.java index fa12d0b..8721eee 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSdlSkin.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSdlSkin.java @@ -49,7 +49,8 @@ public class EmulatorSdlSkin extends EmulatorSkin { /** * Constructor */ - public EmulatorSdlSkin(EmulatorSkinState state, EmulatorFingers finger, EmulatorConfig config, SkinInformation skinInfo, boolean isOnTop) { + public EmulatorSdlSkin(EmulatorSkinState state, EmulatorFingers finger, + EmulatorConfig config, SkinInformation skinInfo, boolean isOnTop) { super(state, finger, config, skinInfo, isOnTop); } 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 2f24ce1..90eb1bd 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 @@ -87,7 +87,7 @@ public class EmulatorShmSkin extends EmulatorSkin { this.runnable = new Runnable() { public void run() { - // logger.info("update lcd framebuffer"); + // logger.info("update display framebuffer"); if(lcdCanvas.isDisposed() == false) { lcdCanvas.redraw(); } @@ -133,7 +133,8 @@ public class EmulatorShmSkin extends EmulatorSkin { /** * Constructor */ - public EmulatorShmSkin(EmulatorSkinState state, EmulatorFingers finger, EmulatorConfig config, SkinInformation skinInfo, boolean isOnTop) { + public EmulatorShmSkin(EmulatorSkinState state, EmulatorFingers finger, + EmulatorConfig config, SkinInformation skinInfo, boolean isOnTop) { super(state, finger, config, skinInfo, isOnTop); this.paletteData = new PaletteData(RED_MASK, GREEN_MASK, BLUE_MASK); } 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 3678cf0..3f7f267 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java @@ -70,11 +70,13 @@ import org.tizen.emulator.skin.comm.ICommunicator.SendCommand; import org.tizen.emulator.skin.comm.sock.SocketCommunicator; import org.tizen.emulator.skin.comm.sock.data.BooleanData; import org.tizen.emulator.skin.comm.sock.data.KeyEventData; -import org.tizen.emulator.skin.comm.sock.data.LcdStateData; +import org.tizen.emulator.skin.comm.sock.data.DisplayStateData; import org.tizen.emulator.skin.comm.sock.data.MouseEventData; import org.tizen.emulator.skin.config.EmulatorConfig; import org.tizen.emulator.skin.config.EmulatorConfig.ArgsConstants; import org.tizen.emulator.skin.config.EmulatorConfig.SkinPropertiesConstants; +import org.tizen.emulator.skin.custom.CustomProgressBar; +import org.tizen.emulator.skin.custom.KeyWindow; import org.tizen.emulator.skin.dbi.ColorsType; import org.tizen.emulator.skin.dbi.KeyMapType; import org.tizen.emulator.skin.dbi.RgbType; @@ -93,8 +95,6 @@ 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; -import org.tizen.emulator.skin.window.ControlPanel; -import org.tizen.emulator.skin.window.CustomProgressBar; /** * @@ -143,8 +143,8 @@ public class EmulatorSkin { private boolean isOnKbd; private Menu contextMenu; - private MenuItem panelItem; /* key window menu */ - public ControlPanel keyWindow; + private MenuItem keyWindowItem; /* key window menu */ + public KeyWindow keyWindow; public Color colorPairTag; public Canvas pairTagCanvas; public CustomProgressBar bootingProgress; @@ -943,7 +943,7 @@ public class EmulatorSkin { /* toggle a key window */ public void setIsControlPanel(boolean value) { isControlPanel = value; - panelItem.setSelection(isControlPanel); + keyWindowItem.setSelection(isControlPanel); logger.info("Select Key Window : " + isControlPanel); } @@ -973,7 +973,7 @@ public class EmulatorSkin { } try { - keyWindow = new ControlPanel(this, shell, colorPairTag, + keyWindow = new KeyWindow(this, shell, colorPairTag, communicator, keyMapList); SkinUtil.setTopMost(keyWindow.getShell(), isOnTop); @@ -1059,14 +1059,14 @@ public class EmulatorSkin { /* Key Window menu */ if (skinInfo.isPhoneShape() == false) { //TODO: - panelItem = new MenuItem(menu, SWT.CHECK); - panelItem.setText("&Key Window"); - panelItem.setSelection(isControlPanel); + keyWindowItem = new MenuItem(menu, SWT.CHECK); + keyWindowItem.setText("&Key Window"); + keyWindowItem.setSelection(isControlPanel); - panelItem.addSelectionListener(new SelectionAdapter() { + keyWindowItem.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - final boolean isControlPanel = panelItem.getSelection(); + final boolean isControlPanel = keyWindowItem.getSelection(); setIsControlPanel(isControlPanel); if (isControlPanel == true) { @@ -1243,8 +1243,8 @@ public class EmulatorSkin { SkinUtil.setTopMost(shell, isOnTop); } - LcdStateData lcdStateData = - new LcdStateData(currentState.getCurrentScale(), rotationId); + DisplayStateData lcdStateData = + new DisplayStateData(currentState.getCurrentScale(), rotationId); communicator.sendToQEMU(SendCommand.CHANGE_LCD_STATE, lcdStateData); } }; @@ -1311,8 +1311,8 @@ public class EmulatorSkin { SkinUtil.setTopMost(shell, isOnTop); } - LcdStateData lcdStateData = - new LcdStateData(scale, currentState.getCurrentRotationId()); + DisplayStateData lcdStateData = + new DisplayStateData(scale, currentState.getCurrentRotationId()); communicator.sendToQEMU(SendCommand.CHANGE_LCD_STATE, lcdStateData); } diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/data/LcdStateData.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/data/DisplayStateData.java similarity index 90% rename from tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/data/LcdStateData.java rename to tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/data/DisplayStateData.java index df1cd9f..a22ef4d 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/data/LcdStateData.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/data/DisplayStateData.java @@ -35,12 +35,12 @@ import java.io.IOException; * * */ -public class LcdStateData extends AbstractSendData { +public class DisplayStateData extends AbstractSendData { int scale; short rotation; - public LcdStateData(int scale, short rotation) { + public DisplayStateData(int scale, short rotation) { this.scale = scale; this.rotation = rotation; } @@ -54,7 +54,7 @@ public class LcdStateData extends AbstractSendData { @Override public String toString() { StringBuilder builder = new StringBuilder(); - builder.append("LcdStateData [scale="); + builder.append("DisplayStateData [scale="); builder.append(scale); builder.append(", rotation="); builder.append(rotation); diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/window/ImageButton.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/CustomButton.java similarity index 97% rename from tizen/src/skin/client/src/org/tizen/emulator/skin/window/ImageButton.java rename to tizen/src/skin/client/src/org/tizen/emulator/skin/custom/CustomButton.java index 351f62c..aad16e1 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/window/ImageButton.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/CustomButton.java @@ -26,7 +26,7 @@ * */ -package org.tizen.emulator.skin.window; +package org.tizen.emulator.skin.custom; import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyAdapter; @@ -46,7 +46,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; -public class ImageButton extends Canvas { +public class CustomButton extends Canvas { /* state */ private int mouse = 0; private boolean hit = false; @@ -62,7 +62,7 @@ public class ImageButton extends Canvas { private static Color white; private static Color gray; - public ImageButton(Composite parent, int style, + public CustomButton(Composite parent, int style, Image imageNormal, Image imageHover, Image imagePushed) { super(parent, style); diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/window/CustomProgressBar.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/CustomProgressBar.java similarity index 98% rename from tizen/src/skin/client/src/org/tizen/emulator/skin/window/CustomProgressBar.java rename to tizen/src/skin/client/src/org/tizen/emulator/skin/custom/CustomProgressBar.java index 64e45fc..98ded49 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/window/CustomProgressBar.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/CustomProgressBar.java @@ -26,7 +26,7 @@ * */ -package org.tizen.emulator.skin.window; +package org.tizen.emulator.skin.custom; import java.util.logging.Logger; diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/window/ControlPanel.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/KeyWindow.java similarity index 97% rename from tizen/src/skin/client/src/org/tizen/emulator/skin/window/ControlPanel.java rename to tizen/src/skin/client/src/org/tizen/emulator/skin/custom/KeyWindow.java index f960a01..b62deda 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/window/ControlPanel.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/KeyWindow.java @@ -26,7 +26,7 @@ * */ -package org.tizen.emulator.skin.window; +package org.tizen.emulator.skin.custom; import java.util.List; @@ -61,7 +61,7 @@ import org.tizen.emulator.skin.dbi.KeyMapType; import org.tizen.emulator.skin.layout.SkinPatches; import org.tizen.emulator.skin.util.SwtUtil; -public class ControlPanel extends SkinWindow { +public class KeyWindow extends SkinWindow { private static final String PATCH_IMAGES_PATH = "images/key-window/"; private static final int SHELL_MARGIN_BOTTOM = 3; private static final int PAIRTAG_CIRCLE_SIZE = 8; @@ -88,7 +88,7 @@ public class ControlPanel extends SkinWindow { private boolean isGrabbedShell; private Point grabPosition; - public ControlPanel(EmulatorSkin skin, Shell parent, Color colorPairTag, + public KeyWindow(EmulatorSkin skin, Shell parent, Color colorPairTag, SocketCommunicator communicator, List keyMapList) { super(parent, SWT.RIGHT | SWT.CENTER); @@ -133,7 +133,7 @@ public class ControlPanel extends SkinWindow { createContents(); trimPatchedShell(shell, imageFrame); - addControlPanelListener(); + addKeyWindowListener(); shell.setBackground(colorFrame); shell.setSize(imageFrame.getImageData().width, @@ -183,7 +183,7 @@ public class ControlPanel extends SkinWindow { if (keyMapList != null && keyMapList.isEmpty() == false) { for (KeyMapType keyEntry : keyMapList) { - ImageButton HWKeyButton = new ImageButton(compositeBase, SWT.NONE, + CustomButton HWKeyButton = new CustomButton(compositeBase, SWT.NONE, imageNormal, imageHover, imagePushed); HWKeyButton.setText(keyEntry.getEventInfo().getKeyName()); HWKeyButton.setToolTipText(keyEntry.getTooltip()); @@ -256,7 +256,7 @@ public class ControlPanel extends SkinWindow { shell.setRegion(region); } - private void addControlPanelListener() { + private void addKeyWindowListener() { shellPaintListener = new PaintListener() { @Override public void paintControl(final PaintEvent e) { diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/window/SkinWindow.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/SkinWindow.java similarity index 98% rename from tizen/src/skin/client/src/org/tizen/emulator/skin/window/SkinWindow.java rename to tizen/src/skin/client/src/org/tizen/emulator/skin/custom/SkinWindow.java index ed2c0d1..35f31fa 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/window/SkinWindow.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/SkinWindow.java @@ -26,7 +26,7 @@ * */ -package org.tizen.emulator.skin.window; +package org.tizen.emulator.skin.custom; import java.util.logging.Logger; 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 c4bc015..8218469 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 @@ -51,14 +51,14 @@ import org.tizen.emulator.skin.comm.ICommunicator.RotationInfo; import org.tizen.emulator.skin.config.EmulatorConfig; import org.tizen.emulator.skin.config.EmulatorConfig.ArgsConstants; import org.tizen.emulator.skin.config.EmulatorConfig.SkinPropertiesConstants; +import org.tizen.emulator.skin.custom.CustomButton; +import org.tizen.emulator.skin.custom.CustomProgressBar; import org.tizen.emulator.skin.image.ImageRegistry; import org.tizen.emulator.skin.image.ImageRegistry.IconName; import org.tizen.emulator.skin.log.SkinLogger; import org.tizen.emulator.skin.util.SkinRotation; import org.tizen.emulator.skin.util.SkinUtil; import org.tizen.emulator.skin.util.SwtUtil; -import org.tizen.emulator.skin.window.CustomProgressBar; -import org.tizen.emulator.skin.window.ImageButton; public class GeneralPurposeSkinComposer implements ISkinComposer { private static final String PATCH_IMAGES_PATH = "images/emul-window/"; @@ -70,7 +70,7 @@ public class GeneralPurposeSkinComposer implements ISkinComposer { private EmulatorSkin skin; private Shell shell; private Canvas lcdCanvas; - private ImageButton toggleButton; + private CustomButton toggleButton; private EmulatorSkinState currentState; private ImageRegistry imageRegistry; @@ -149,7 +149,7 @@ public class GeneralPurposeSkinComposer implements ISkinComposer { loader.getResourceAsStream(PATCH_IMAGES_PATH + "arrow_pushed.png")); /* create a toggle button of key window */ - toggleButton = new ImageButton(shell, SWT.DRAW_TRANSPARENT | SWT.NO_FOCUS, + toggleButton = new CustomButton(shell, SWT.DRAW_TRANSPARENT | SWT.NO_FOCUS, imageNormal, imageHover, imagePushed); toggleButton.setBackground( new Color(shell.getDisplay(), new RGB(0x1f, 0x1f, 0x1f))); 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 4ceb4c7..e3c1e48 100644 --- 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 @@ -56,6 +56,7 @@ import org.tizen.emulator.skin.comm.sock.data.KeyEventData; import org.tizen.emulator.skin.config.EmulatorConfig; import org.tizen.emulator.skin.config.EmulatorConfig.ArgsConstants; import org.tizen.emulator.skin.config.EmulatorConfig.SkinPropertiesConstants; +import org.tizen.emulator.skin.custom.CustomProgressBar; import org.tizen.emulator.skin.dbi.LcdType; import org.tizen.emulator.skin.dbi.RegionType; import org.tizen.emulator.skin.dbi.RotationType; @@ -66,7 +67,6 @@ import org.tizen.emulator.skin.log.SkinLogger; import org.tizen.emulator.skin.util.SkinRotation; import org.tizen.emulator.skin.util.SkinUtil; import org.tizen.emulator.skin.util.SwtUtil; -import org.tizen.emulator.skin.window.CustomProgressBar; public class PhoneShapeSkinComposer implements ISkinComposer { private Logger logger = SkinLogger.getSkinLogger( -- 2.7.4