From 9948ed8292a5db8e9975ed35cd5b07e585ffb2d6 Mon Sep 17 00:00:00 2001 From: Son Hyunjun Date: Fri, 23 Mar 2012 10:56:42 +0900 Subject: [PATCH] [Title] modify skin build, logging [Type] Feature [Module] [Priority] Minor [CQ#] [Redmine#] [Problem] [Cause] [Solution] --- .gitignore | 1 + tizen/src/skin/client/.classpath | 2 + tizen/src/skin/client/build.xml | 78 ++++++++---------- .../tizen/emulator/skin/dbi/ColorsType.java | 0 .../tizen/emulator/skin/dbi/EmulatorUI.java | 0 .../emulator/skin/dbi/EventInfoType.java | 0 .../emulator/skin/dbi/ImageListType.java | 0 .../emulator/skin/dbi/KeyMapListType.java | 0 .../tizen/emulator/skin/dbi/KeyMapType.java | 0 .../org/tizen/emulator/skin/dbi/LcdType.java | 0 .../emulator/skin/dbi/ObjectFactory.java | 0 .../tizen/emulator/skin/dbi/RegionType.java | 0 .../org/tizen/emulator/skin/dbi/RgbType.java | 0 .../emulator/skin/dbi/RotationNameType.java | 0 .../tizen/emulator/skin/dbi/RotationType.java | 0 .../emulator/skin/dbi/RotationsType.java | 0 .../tizen/emulator/skin/dbi/package-info.java | 0 .../client/{ => resource}/icons/Emulator.ico | Bin .../{ => resource}/icons/Emulator_20x20.png | Bin .../client/{ => resource}/icons/about.png | Bin .../client/{ => resource}/icons/advanced.png | Bin .../client/{ => resource}/icons/close.png | Bin .../{ => resource}/icons/device_info.png | Bin .../client/{ => resource}/icons/execute.png | Bin .../skin/client/{ => resource}/icons/gps.png | Bin .../client/{ => resource}/icons/keypad.png | Bin .../skin/client/{ => resource}/icons/open.png | Bin .../client/{ => resource}/icons/option.png | Bin .../client/{ => resource}/icons/rotate.png | Bin .../client/{ => resource}/icons/scaling.png | Bin .../{ => resource}/icons/screenshot.png | Bin .../client/{ => resource}/icons/shell.png | Bin .../client/{ => resource}/icons/telephony.png | Bin .../emulator/skin/EmulatorShutdownhook.java | 10 ++- .../org/tizen/emulator/skin/EmulatorSkin.java | 19 ++++- .../tizen/emulator/skin/EmulatorSkinMain.java | 2 +- .../skin/comm/sock/SocketCommunicator.java | 37 ++++++--- 37 files changed, 84 insertions(+), 65 deletions(-) rename tizen/src/skin/client/{src => jaxb_src}/org/tizen/emulator/skin/dbi/ColorsType.java (100%) rename tizen/src/skin/client/{src => jaxb_src}/org/tizen/emulator/skin/dbi/EmulatorUI.java (100%) rename tizen/src/skin/client/{src => jaxb_src}/org/tizen/emulator/skin/dbi/EventInfoType.java (100%) rename tizen/src/skin/client/{src => jaxb_src}/org/tizen/emulator/skin/dbi/ImageListType.java (100%) rename tizen/src/skin/client/{src => jaxb_src}/org/tizen/emulator/skin/dbi/KeyMapListType.java (100%) rename tizen/src/skin/client/{src => jaxb_src}/org/tizen/emulator/skin/dbi/KeyMapType.java (100%) rename tizen/src/skin/client/{src => jaxb_src}/org/tizen/emulator/skin/dbi/LcdType.java (100%) rename tizen/src/skin/client/{src => jaxb_src}/org/tizen/emulator/skin/dbi/ObjectFactory.java (100%) rename tizen/src/skin/client/{src => jaxb_src}/org/tizen/emulator/skin/dbi/RegionType.java (100%) rename tizen/src/skin/client/{src => jaxb_src}/org/tizen/emulator/skin/dbi/RgbType.java (100%) rename tizen/src/skin/client/{src => jaxb_src}/org/tizen/emulator/skin/dbi/RotationNameType.java (100%) rename tizen/src/skin/client/{src => jaxb_src}/org/tizen/emulator/skin/dbi/RotationType.java (100%) rename tizen/src/skin/client/{src => jaxb_src}/org/tizen/emulator/skin/dbi/RotationsType.java (100%) rename tizen/src/skin/client/{src => jaxb_src}/org/tizen/emulator/skin/dbi/package-info.java (100%) rename tizen/src/skin/client/{ => resource}/icons/Emulator.ico (100%) rename tizen/src/skin/client/{ => resource}/icons/Emulator_20x20.png (100%) rename tizen/src/skin/client/{ => resource}/icons/about.png (100%) rename tizen/src/skin/client/{ => resource}/icons/advanced.png (100%) rename tizen/src/skin/client/{ => resource}/icons/close.png (100%) rename tizen/src/skin/client/{ => resource}/icons/device_info.png (100%) rename tizen/src/skin/client/{ => resource}/icons/execute.png (100%) rename tizen/src/skin/client/{ => resource}/icons/gps.png (100%) rename tizen/src/skin/client/{ => resource}/icons/keypad.png (100%) rename tizen/src/skin/client/{ => resource}/icons/open.png (100%) rename tizen/src/skin/client/{ => resource}/icons/option.png (100%) rename tizen/src/skin/client/{ => resource}/icons/rotate.png (100%) rename tizen/src/skin/client/{ => resource}/icons/scaling.png (100%) rename tizen/src/skin/client/{ => resource}/icons/screenshot.png (100%) rename tizen/src/skin/client/{ => resource}/icons/shell.png (100%) rename tizen/src/skin/client/{ => resource}/icons/telephony.png (100%) diff --git a/.gitignore b/.gitignore index 74137d4061..b45254e34e 100644 --- a/.gitignore +++ b/.gitignore @@ -79,4 +79,5 @@ TAGS tizen/Emulator tizen/src/skin/client/src/about.properties tizen/src/skin/client/bin +tizen/src/skin/client/build tizen/src/skin/client/emulator-skin.jar \ No newline at end of file diff --git a/tizen/src/skin/client/.classpath b/tizen/src/skin/client/.classpath index e62f0e6f77..957bee2936 100644 --- a/tizen/src/skin/client/.classpath +++ b/tizen/src/skin/client/.classpath @@ -1,6 +1,8 @@ + + diff --git a/tizen/src/skin/client/build.xml b/tizen/src/skin/client/build.xml index 3f3276d18f..b507a59d43 100644 --- a/tizen/src/skin/client/build.xml +++ b/tizen/src/skin/client/build.xml @@ -18,12 +18,12 @@ - + - + @@ -44,91 +44,79 @@ - + - - + + + - + - - + + + - + - - + + + - - - - - + + + - - - - + - + - - - - - - - - - - - + + + + + + - + - - - - - - - - - - - + + + + + + - + \ No newline at end of file diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/ColorsType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/ColorsType.java similarity index 100% rename from tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/ColorsType.java rename to tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/ColorsType.java diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/EmulatorUI.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/EmulatorUI.java similarity index 100% rename from tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/EmulatorUI.java rename to tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/EmulatorUI.java diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/EventInfoType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/EventInfoType.java similarity index 100% rename from tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/EventInfoType.java rename to tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/EventInfoType.java diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/ImageListType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/ImageListType.java similarity index 100% rename from tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/ImageListType.java rename to tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/ImageListType.java diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/KeyMapListType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/KeyMapListType.java similarity index 100% rename from tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/KeyMapListType.java rename to tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/KeyMapListType.java diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/KeyMapType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/KeyMapType.java similarity index 100% rename from tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/KeyMapType.java rename to tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/KeyMapType.java diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/LcdType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/LcdType.java similarity index 100% rename from tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/LcdType.java rename to tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/LcdType.java diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/ObjectFactory.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/ObjectFactory.java similarity index 100% rename from tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/ObjectFactory.java rename to tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/ObjectFactory.java diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/RegionType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RegionType.java similarity index 100% rename from tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/RegionType.java rename to tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RegionType.java diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/RgbType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RgbType.java similarity index 100% rename from tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/RgbType.java rename to tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RgbType.java diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/RotationNameType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RotationNameType.java similarity index 100% rename from tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/RotationNameType.java rename to tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RotationNameType.java diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/RotationType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RotationType.java similarity index 100% rename from tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/RotationType.java rename to tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RotationType.java diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/RotationsType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RotationsType.java similarity index 100% rename from tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/RotationsType.java rename to tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RotationsType.java diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/package-info.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/package-info.java similarity index 100% rename from tizen/src/skin/client/src/org/tizen/emulator/skin/dbi/package-info.java rename to tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/package-info.java diff --git a/tizen/src/skin/client/icons/Emulator.ico b/tizen/src/skin/client/resource/icons/Emulator.ico similarity index 100% rename from tizen/src/skin/client/icons/Emulator.ico rename to tizen/src/skin/client/resource/icons/Emulator.ico diff --git a/tizen/src/skin/client/icons/Emulator_20x20.png b/tizen/src/skin/client/resource/icons/Emulator_20x20.png similarity index 100% rename from tizen/src/skin/client/icons/Emulator_20x20.png rename to tizen/src/skin/client/resource/icons/Emulator_20x20.png diff --git a/tizen/src/skin/client/icons/about.png b/tizen/src/skin/client/resource/icons/about.png similarity index 100% rename from tizen/src/skin/client/icons/about.png rename to tizen/src/skin/client/resource/icons/about.png diff --git a/tizen/src/skin/client/icons/advanced.png b/tizen/src/skin/client/resource/icons/advanced.png similarity index 100% rename from tizen/src/skin/client/icons/advanced.png rename to tizen/src/skin/client/resource/icons/advanced.png diff --git a/tizen/src/skin/client/icons/close.png b/tizen/src/skin/client/resource/icons/close.png similarity index 100% rename from tizen/src/skin/client/icons/close.png rename to tizen/src/skin/client/resource/icons/close.png diff --git a/tizen/src/skin/client/icons/device_info.png b/tizen/src/skin/client/resource/icons/device_info.png similarity index 100% rename from tizen/src/skin/client/icons/device_info.png rename to tizen/src/skin/client/resource/icons/device_info.png diff --git a/tizen/src/skin/client/icons/execute.png b/tizen/src/skin/client/resource/icons/execute.png similarity index 100% rename from tizen/src/skin/client/icons/execute.png rename to tizen/src/skin/client/resource/icons/execute.png diff --git a/tizen/src/skin/client/icons/gps.png b/tizen/src/skin/client/resource/icons/gps.png similarity index 100% rename from tizen/src/skin/client/icons/gps.png rename to tizen/src/skin/client/resource/icons/gps.png diff --git a/tizen/src/skin/client/icons/keypad.png b/tizen/src/skin/client/resource/icons/keypad.png similarity index 100% rename from tizen/src/skin/client/icons/keypad.png rename to tizen/src/skin/client/resource/icons/keypad.png diff --git a/tizen/src/skin/client/icons/open.png b/tizen/src/skin/client/resource/icons/open.png similarity index 100% rename from tizen/src/skin/client/icons/open.png rename to tizen/src/skin/client/resource/icons/open.png diff --git a/tizen/src/skin/client/icons/option.png b/tizen/src/skin/client/resource/icons/option.png similarity index 100% rename from tizen/src/skin/client/icons/option.png rename to tizen/src/skin/client/resource/icons/option.png diff --git a/tizen/src/skin/client/icons/rotate.png b/tizen/src/skin/client/resource/icons/rotate.png similarity index 100% rename from tizen/src/skin/client/icons/rotate.png rename to tizen/src/skin/client/resource/icons/rotate.png diff --git a/tizen/src/skin/client/icons/scaling.png b/tizen/src/skin/client/resource/icons/scaling.png similarity index 100% rename from tizen/src/skin/client/icons/scaling.png rename to tizen/src/skin/client/resource/icons/scaling.png diff --git a/tizen/src/skin/client/icons/screenshot.png b/tizen/src/skin/client/resource/icons/screenshot.png similarity index 100% rename from tizen/src/skin/client/icons/screenshot.png rename to tizen/src/skin/client/resource/icons/screenshot.png diff --git a/tizen/src/skin/client/icons/shell.png b/tizen/src/skin/client/resource/icons/shell.png similarity index 100% rename from tizen/src/skin/client/icons/shell.png rename to tizen/src/skin/client/resource/icons/shell.png diff --git a/tizen/src/skin/client/icons/telephony.png b/tizen/src/skin/client/resource/icons/telephony.png similarity index 100% rename from tizen/src/skin/client/icons/telephony.png rename to tizen/src/skin/client/resource/icons/telephony.png diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShutdownhook.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShutdownhook.java index d961f27fb8..bf171dc1ef 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShutdownhook.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShutdownhook.java @@ -29,7 +29,10 @@ package org.tizen.emulator.skin; +import java.util.logging.Logger; + import org.tizen.emulator.skin.comm.ICommunicator; +import org.tizen.emulator.skin.log.SkinLogger; /** * @@ -37,18 +40,17 @@ import org.tizen.emulator.skin.comm.ICommunicator; */ public class EmulatorShutdownhook extends Thread { + private Logger logger = SkinLogger.getSkinLogger( EmulatorShutdownhook.class ).getLogger(); private ICommunicator communicator; - private EmulatorSkin skin; - public EmulatorShutdownhook( ICommunicator communicator, EmulatorSkin skin ) { + public EmulatorShutdownhook( ICommunicator communicator ) { this.communicator = communicator; - this.skin = skin; } @Override public void run() { + logger.warning( " EmulatorShutdownhook run by a signal." ); communicator.terminate(); - skin.shutdown(); } } 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 86526cdf33..f4e3ee7b2b 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 @@ -312,6 +312,9 @@ public class EmulatorSkin { if ( null != currentImage ) { currentImage.dispose(); } + if ( null != currentKeyPressedImage ) { + currentKeyPressedImage.dispose(); + } imageRegistry.dispose(); @@ -491,11 +494,15 @@ public class EmulatorSkin { @Override public void dragDetected( DragDetectEvent e ) { - logger.fine( "dragDetected e.button:" + e.button ); + if( logger.isLoggable( Level.FINE ) ) { + logger.fine( "dragDetected e.button:" + e.button ); + } if ( 1 == e.button && // left button e.x > 0 && e.x < canvas.getSize().x && e.y > 0 && e.y < canvas.getSize().y ) { - logger.fine( "dragDetected in LCD" ); + if( logger.isLoggable( Level.FINE ) ) { + logger.fine( "dragDetected in LCD" ); + } EmulatorSkin.this.isDragStartedInLCD = true; } @@ -612,7 +619,9 @@ public class EmulatorSkin { deviceInfoItem.addSelectionListener( new SelectionAdapter() { @Override public void widgetSelected( SelectionEvent e ) { - logger.fine( "Selected Info." ); + if( logger.isLoggable( Level.FINE ) ) { + logger.fine( "Open device info" ); + } } } ); @@ -627,7 +636,9 @@ public class EmulatorSkin { @Override public void widgetSelected( SelectionEvent e ) { - logger.fine( "Selected Always On Top." ); + if( logger.isLoggable( Level.FINE ) ) { + logger.fine( "Select Always On Top. : " + aotItem.getSelection() ); + } isTop = !isTop; //TODO } 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 ef19709457..c8a24921ed 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 @@ -103,7 +103,7 @@ public class EmulatorSkinMain { if ( null != commSocket ) { - Runtime.getRuntime().addShutdownHook( new EmulatorShutdownhook( communicator, skin ) ); + Runtime.getRuntime().addShutdownHook( new EmulatorShutdownhook( communicator ) ); Thread communicatorThread = new Thread( communicator ); communicatorThread.start(); diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java index 9b8a4f3c50..f1c41fb1f8 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java @@ -164,7 +164,9 @@ public class SocketCommunicator implements ICommunicator { int reqId = dis.readInt(); short cmd = dis.readShort(); - logger.fine( "Socket read - reqId:" + reqId + ", command:" + cmd + ", " ); + if( logger.isLoggable( Level.FINE ) ) { + logger.fine( "[Socket] read - reqId:" + reqId + ", command:" + cmd + ", " ); + } ReceiveCommand command = null; @@ -176,26 +178,33 @@ public class SocketCommunicator implements ICommunicator { } switch ( command ) { - case HEART_BEAT: + case HEART_BEAT: { resetHeartbeatCount(); - logger.fine( "received HEAR_BEAT from QEMU." ); + if( logger.isLoggable( Level.FINE ) ) { + logger.fine( "received HEAR_BEAT from QEMU." ); + } sendToQEMU( SendCommand.RESPONSE_HEART_BEAT, null ); break; - case SENSOR_DAEMON_START: + } + case SENSOR_DAEMON_START: { logger.info( "received SENSOR_DAEMON_START from QEMU." ); synchronized ( this ) { isSensorDaemonStarted = true; } break; - case SHUTDOWN: + } + case SHUTDOWN: { logger.info( "received RESPONSE_SHUTDOWN from QEMU." ); sendToQEMU( SendCommand.RESPONSE_SHUTDOWN, null ); isTerminated = true; terminate(); break; - default: + } + default: { + logger.warning( "Unknown command from QEMU. command:" + cmd ); break; } + } } catch ( IOException e ) { logger.log( Level.SEVERE, e.getMessage(), e ); @@ -237,12 +246,16 @@ public class SocketCommunicator implements ICommunicator { dos.write(bao.toByteArray()); dos.flush(); - logger.fine( "Socket write - uid:" + uId + ", reqId:" + reqId + ", command:" + command.value() + " - " - + command.toString() + ", length:" + length ); + if( logger.isLoggable( Level.FINE ) ) { + logger.fine( "[Socket] write - uid:" + uId + ", reqId:" + reqId + ", command:" + command.value() + " - " + + command.toString() + ", length:" + length ); + } if ( 0 < length ) { - logger.fine( "== data ==" ); - logger.fine( data.toString() ); + if( logger.isLoggable( Level.FINE ) ) { + logger.fine( "== data ==" ); + logger.fine( data.toString() ); + } } } catch ( IOException e ) { @@ -261,7 +274,9 @@ public class SocketCommunicator implements ICommunicator { private void increaseHeartbeatCount() { int count = heartbeatCount.incrementAndGet(); - logger.fine("HB count : " + count); + if( logger.isLoggable( Level.FINE ) ) { + logger.fine("HB count : " + count); + } } private boolean isHeartbeatExpired() { -- 2.34.1