skin: modified function name

modified function name

Change-Id: I698c8b37c2e0611b85cab1ee37d5387e162675b5
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

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 dcbdd84b9170275d6a56c38956988376ff682568..b3980d86728c389b2492fce6d00779ee6e2b5d45 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShmSkin.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShmSkin.java
@@ -71,6 +71,10 @@ public class EmulatorShmSkin extends EmulatorSkin {
        private int multiTouchKey;
        private int multiTouchKeySub;
 
+       /* touch values */
+       protected static int pressingX = -1, pressingY = -1;
+       protected static int pressingOriginX = -1, pressingOriginY = -1;
+
        static {
                /* load JNI library file */
                try {

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 dafbf81eb15696021574f2a81bef3573c2868063..44ac1c343d1db2320f21db4c20071f5c50cb25a9 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
@@ -191,16 +191,10 @@ public class EmulatorSkin {
        private KeyListener canvasKeyListener;
        private MenuDetectListener canvasMenuDetectListener;
        private FocusListener canvasFocusListener;
-
        private LinkedList<KeyEventData> pressedKeyEventList;
 
-       /* touch values */
-       protected static int pressingX = -1, pressingY = -1;
-       protected static int pressingOriginX = -1, pressingOriginY = -1;
-
-
        private EmulatorSkin reopenSkin;
-       
+
        /**
         * @brief constructor
         * @param config : configuration of emulator skin

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 997d5db299c9cd32e6fcd0c36391994ba7aef648..593bfe4eadce856025bbc1cfb334d9f75d45751c 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
@@ -134,7 +134,7 @@ public class EmulatorSkinMain {
                        logger.info("os version: " + System.getProperty("os.version"));
 
                        /* startup arguments parsing */
-                       Map<String, String> argsMap = parsArgs(args);
+                       Map<String, String> argsMap = parseArgs(args);
 
                        /* emulator resolution */
                        /*int resolutionW = Integer.parseInt(
@@ -413,32 +413,29 @@ public class EmulatorSkinMain {
 
        }
        
-       private static Map<String, String> parsArgs( String[] args ) {
-
+       private static Map<String, String> parseArgs(String[] args) {
                Map<String, String> map = new HashMap<String, String>();
 
-               for ( int i = 0; i < args.length; i++ ) {
+               for (int i = 0; i < args.length; i++) {
                        String arg = args[i];
-                       logger.info( "arg[" + i + "] " + arg );
-                       String[] split = arg.split( "=" );
-
-                       if ( 1 < split.length ) {
+                       logger.info("arg[" + i + "] " + arg);
 
+                       String[] split = arg.split("=");
+                       if (1 < split.length) {
                                String argKey = split[0].trim();
                                String argValue = split[1].trim();
-                               map.put( argKey, argValue );
 
+                               map.put(argKey, argValue);
                        } else {
-                               logger.info( "sinlge argv:" + arg );
+                               logger.info("sinlge argv:" + arg);
                        }
                }
 
-               logger.info( "================= argsMap =====================" );
-               logger.info( map.toString() );
-               logger.info( "===============================================" );
+               logger.info("================= argsMap =====================");
+               logger.info(map.toString());
+               logger.info("===============================================");
 
                return map;
-
        }
 
        private static EmulatorUI loadDbi(String skinPath) {

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java
index 5020f825eee07816d172bcbe41b93e08e5b1bb79..d6198e8c86a98dbee68d9e7755fee709c0995adf 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java
@@ -76,7 +76,7 @@ public class PopupMenu {
                this.skin = skin;
                this.shell = shell;
                this.imageRegistry = imageRegistry;
-               
+
                createMenu();
        }