[Title] fix compile error

[Type] Bugfix
[Module]
[Priority] Minor
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]

Change-Id: Ib61001d3644ff8eaf88e894b43cba13b1ba3360b

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 f327779737dd9d67584df11e0f933c009d562d32..bfa9cb3ef1b2592b3eef2eb9826b6f515ce615b9 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
@@ -92,10 +92,7 @@ import org.tizen.emulator.skin.dialog.AboutDialog;
 import org.tizen.emulator.skin.image.ImageRegistry;
 import org.tizen.emulator.skin.image.ImageRegistry.ImageType;
 import org.tizen.emulator.skin.log.SkinLogger;
-<<<<<<< HEAD
-=======
 import org.tizen.emulator.skin.screenshot.ScreenShotDialog;
->>>>>>> release-0.21
 import org.tizen.emulator.skin.util.SkinRegion;
 import org.tizen.emulator.skin.util.SkinRotation;
 import org.tizen.emulator.skin.util.SkinUtil;
@@ -713,11 +710,7 @@ public class EmulatorSkin {
                        @Override
                        public void keyReleased( KeyEvent e ) {
                                logger.info( "key released. key event:" + e );
-<<<<<<< HEAD
-                               int keyCode = e.keyCode;
-=======
                                int keyCode = e.keyCode | e.stateMask;
->>>>>>> release-0.21
 
                                KeyEventData keyEventData = new KeyEventData( KeyEventType.RELEASED.value(), keyCode );
                                communicator.sendToQEMU( SendCommand.SEND_KEY_EVENT, keyEventData );
@@ -726,11 +719,7 @@ public class EmulatorSkin {
                        @Override
                        public void keyPressed( KeyEvent e ) {
                                logger.info( "key pressed. key event:" + e );
-<<<<<<< HEAD
-                               int keyCode = e.keyCode;
-=======
                                int keyCode = e.keyCode | e.stateMask;
->>>>>>> release-0.21
                                KeyEventData keyEventData = new KeyEventData( KeyEventType.PRESSED.value(), keyCode );
                                communicator.sendToQEMU( SendCommand.SEND_KEY_EVENT, keyEventData );
                        }
@@ -979,12 +968,8 @@ public class EmulatorSkin {
                screenshotItem.addSelectionListener( new SelectionAdapter() {
                        @Override
                        public void widgetSelected( SelectionEvent e ) {
-<<<<<<< HEAD
-                               
-=======
                                ScreenShotDialog dialog = new ScreenShotDialog( shell, lcdCanvas );
                                dialog.open();
->>>>>>> release-0.21
 //                             Display display = shell.getDisplay();
 //                             final Image image = new Image( display, lcdCanvas.getBounds() );
 //
@@ -1076,21 +1061,16 @@ public class EmulatorSkin {
 
                final MenuItem aboutItem = new MenuItem( menu, SWT.PUSH );
                aboutItem.setText( "About" );
-               aboutItem.setEnabled( false );
                aboutItem.addSelectionListener( new SelectionAdapter() {
                        private boolean isOpen;
                        @Override
                        public void widgetSelected( SelectionEvent e ) {
-<<<<<<< HEAD
-                               // TODO
-=======
                                if( !isOpen ) {
                                        isOpen = true;
                                        AboutDialog dialog = new AboutDialog( shell, "Tizen Emulator Info", SWT.DIALOG_TRIM );
                                        dialog.open();
                                        isOpen = false;
                                }
->>>>>>> release-0.21
                        }
                } );
 
@@ -1117,4 +1097,4 @@ public class EmulatorSkin {
 
        }
 
-}
+}
\ No newline at end of file

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 ca103e84d456b228c45b30a19cacdfea134c8406..0d1ad657efd976f68ea5619cf6b0745381e46d3f 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkinMain.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkinMain.java
@@ -71,27 +71,6 @@ public class EmulatorSkinMain {
                        
                        initLog( args );
 
-<<<<<<< HEAD
-               initLog( args );
-
-               Map<String, String> argsMap = parsArgs( args );
-
-               int lcdWidth = Integer.parseInt( argsMap.get( ArgsConstants.RESOLUTION_WIDTH ) );
-               int lcdHeight = Integer.parseInt( argsMap.get( ArgsConstants.RESOLUTION_HEIGHT ) );
-               EmulatorUI dbiContents = loadDbi( lcdWidth, lcdHeight );
-               if ( null == dbiContents ) {
-                       logger.severe( "Fail to load dbi file." );
-                       return;
-               }
-
-               String vmPath = (String) argsMap.get( ArgsConstants.VM_PATH );
-               String propFilePath = vmPath + File.separator + PROPERTIES_FILE_NAME;
-               Properties properties = loadProperties( propFilePath );
-               if ( null == properties ) {
-                       logger.severe( "Fail to load properties file." );
-                       return;
-               }
-=======
                        Map<String, String> argsMap = parsArgs( args );
 
                        int lcdWidth = Integer.parseInt( argsMap.get( ArgsConstants.RESOLUTION_WIDTH ) );
@@ -114,7 +93,6 @@ public class EmulatorSkinMain {
 
                        EmulatorSkin skin = new EmulatorSkin( config );
                        int windowHandleId = skin.compose();
->>>>>>> release-0.21
 
                        int pid = Integer.parseInt( config.getArg( ArgsConstants.UID ) );
                        SocketCommunicator communicator = new SocketCommunicator( config, pid, windowHandleId, skin );
@@ -144,13 +122,8 @@ public class EmulatorSkinMain {
                                e.printStackTrace();
                        }
 
-<<<<<<< HEAD
-               } else {
-                       logger.severe( "CommSocket is null." );
-=======
                } finally {
                        SkinLogger.end();
->>>>>>> release-0.21
                }
 
        }
@@ -208,11 +181,6 @@ public class EmulatorSkinMain {
                        }
                }
 
-<<<<<<< HEAD
-               map.put( ArgsConstants.EMULATOR_NAME, "emulator-26100" );
-
-=======
->>>>>>> release-0.21
                logger.info( "========================================" );
                logger.info( "args:" + map );
                logger.info( "========================================" );
@@ -281,4 +249,4 @@ public class EmulatorSkinMain {
 
        }
 
-}
+}
\ No newline at end of file

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 7a7c354ab44393f2d7d2613fa861496e17368050..918787abdeb6c1d813d60123be0bbfa0babb2591 100644 (file)
--- 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
@@ -180,11 +180,7 @@ public class SocketCommunicator implements ICommunicator {
                                switch ( command ) {
                                case HEART_BEAT:
                                        resetHeartbeatCount();
-<<<<<<< HEAD
-                                       logger.info( "received HEAR_BEAT from QEMU." );
-=======
                                        logger.fine( "received HEAR_BEAT from QEMU." );
->>>>>>> release-0.21
                                        sendToQEMU( SendCommand.RESPONSE_HEART_BEAT, null );
                                        break;
                                case SENSOR_DAEMON_START:
@@ -287,4 +283,4 @@ public class SocketCommunicator implements ICommunicator {
                skin.shutdown();
        }
 
-}
+}
\ No newline at end of file

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/config/EmulatorConfig.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/config/EmulatorConfig.java
index 35771a770f7cc3050f7e6d3bed5deebb94f13c8d..915d2f00b08f7a8113b598b244d61ce101ea4d03 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/config/EmulatorConfig.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/config/EmulatorConfig.java
@@ -58,10 +58,7 @@ public class EmulatorConfig {
                public static final String TEST_HEART_BEAT_IGNORE = "test.hb.ignore";
                public static final String VM_PATH = "vm.path";
                public static final String LOG_LEVEL = "log.level";
-<<<<<<< HEAD
-=======
                public static final String NET_BASE_PORT = "net.baseport";
->>>>>>> release-0.21
        }
        
        public interface PropertiesConstants {
@@ -161,4 +158,4 @@ public class EmulatorConfig {
                properties.put( key, Integer.toString( value ) );
        }
 
-}
+}
\ No newline at end of file

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/log/SkinLogger.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/log/SkinLogger.java
index aa239c9214185bb6682390faa9678f5a6300625c..335a1b9806f2b344d6de915a3692547e94af98b6 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/log/SkinLogger.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/log/SkinLogger.java
@@ -142,27 +142,18 @@ public class SkinLogger {
                
        }
        
-<<<<<<< HEAD
-=======
        public static void end() {
                loggerMap.clear();
        }
        
->>>>>>> release-0.21
        public static <T> SkinLogger getSkinLogger( Class<T> clazz ) {
                
                String name = null;
                
                if( null == clazz ) {
-<<<<<<< HEAD
-                       name = SkinLogger.class.getSimpleName();
-               }else {
-                       name = clazz.getSimpleName();
-=======
                        name = SkinLogger.class.getName();
                }else {
                        name = clazz.getName();
->>>>>>> release-0.21
                }
                
                SkinLogger skinLogger = loggerMap.get( clazz );
@@ -185,4 +176,4 @@ public class SkinLogger {
                
        }
 
-}
+}
\ No newline at end of file

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 b53cc7fb1ce94b2785038b1772723599d813fc67..feba244c8b93ac9b401c98427bb00dea01e49f05 100644 (file)
--- 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
@@ -29,7 +29,6 @@
 
 package org.tizen.emulator.skin.screenshot;
 
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
@@ -57,7 +56,6 @@ import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.ToolBar;
 import org.eclipse.swt.widgets.ToolItem;
-
 import org.tizen.emulator.skin.util.IOUtil;
 
 public class ScreenShotDialog {