From acda41df91003e2028dbd2dae865a8833f1dad1a Mon Sep 17 00:00:00 2001
From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Sun, 15 Jun 2014 18:57:12 +0900
Subject: [PATCH] skin: "resolution" option is added

Change-Id: I080b99012c0e35f37c3619de84afacc72f5ed0d6
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
---
 .../tizen/emulator/skin/EmulatorSkinMain.java |  3 +-
 .../emulator/skin/config/EmulatorConfig.java  | 48 ++++++++++++-------
 2 files changed, 32 insertions(+), 19 deletions(-)

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 7bc8859aef..8108f3964b 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
@@ -150,8 +150,7 @@ public class EmulatorSkinMain {
 			String skinPath = ".." + File.separator +
 					SKINS_FOLDER + File.separator + DEFAULT_SKIN_FOLDER;
 
-			File f = new File(argSkinPath);
-			if (f.isDirectory() == false) {
+			if (argSkinPath == null || new File(argSkinPath).isDirectory() == false) {
 				/* When emulator receive a invalid skin path,
 				 emulator uses default skin path instead of it */
 				logger.info("Emulator uses default skin path (" + skinPath +
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 fbdb821c3b..7e30c44391 100644
--- 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
@@ -49,7 +49,7 @@ import org.tizen.emulator.skin.util.StringUtil;
 
 
 /**
- * 
+ *
  *
  */
 public class EmulatorConfig {
@@ -69,6 +69,7 @@ public class EmulatorConfig {
 	public interface ArgsConstants {
 		public static final String SIMPLE_MESSAGE = "simple.msg";
 		public static final String UID = "uid";
+		public static final String RESOLUTION = "resolution";
 		public static final String RESOLUTION_WIDTH = "width";
 		public static final String RESOLUTION_HEIGHT = "height";
 		public static final String HEART_BEAT_IGNORE = "hb.ignore";
@@ -190,26 +191,26 @@ public class EmulatorConfig {
 			throw new ConfigException(msg);
 		}
 
-		if (args.containsKey(ArgsConstants.UID)) {
-			String uid = args.get(ArgsConstants.UID);
+		String value = null;
+
+		if ((value = args.get(ArgsConstants.UID)) != null) {
 			try {
-				Integer.parseInt(uid);
+				Integer.parseInt(value);
 			} catch (NumberFormatException e) {
 				String msg = INVALID_OPTION_MESSAGE + "The \'" +
 						ArgsConstants.UID +
-						"\' argument is not numeric.\n: " + uid;
+						"\' argument is not numeric.\n: " + value;
 				throw new ConfigException(msg);
 			}
 		}
 
-		if (args.containsKey(ArgsConstants.VM_SKIN_PORT)) {
-			String serverPort = args.get(ArgsConstants.VM_SKIN_PORT);
+		if ((value = args.get(ArgsConstants.VM_SKIN_PORT)) != null) {
 			try {
-				Integer.parseInt(serverPort);
+				Integer.parseInt(value);
 			} catch (NumberFormatException e) {
 				String msg = INVALID_OPTION_MESSAGE + "The \'" +
 						ArgsConstants.VM_SKIN_PORT +
-						"\' argument is not numeric.\n: " + serverPort;
+						"\' argument is not numeric.\n: " + value;
 				throw new ConfigException(msg);
 			}
 		} else {
@@ -218,14 +219,28 @@ public class EmulatorConfig {
 			throw new ConfigException(msg);
 		}
 
-		if (args.containsKey(ArgsConstants.RESOLUTION_WIDTH)) {
-			String width = args.get(ArgsConstants.RESOLUTION_WIDTH);
+		// If "resolution" is exists, override "width" and "height".
+		if ((value = args.get(ArgsConstants.RESOLUTION)) != null) {
+			String[] splitted = value.split("x");
+			if(splitted.length == 2) {
+				args.put(ArgsConstants.RESOLUTION_WIDTH, splitted[0]);
+				args.put(ArgsConstants.RESOLUTION_HEIGHT, splitted[1]);
+			}
+			else {
+				String msg = INVALID_OPTION_MESSAGE + "The \'" +
+						ArgsConstants.RESOLUTION +
+						"\' argument is invalid.\n: " + value;
+				throw new ConfigException(msg);
+			}
+		}
+
+		if ((value = args.get(ArgsConstants.RESOLUTION_WIDTH)) != null) {
 			try {
-				Integer.parseInt(width);
+				Integer.parseInt(value);
 			} catch (NumberFormatException e) {
 				String msg = INVALID_OPTION_MESSAGE + "The \'" +
 						ArgsConstants.RESOLUTION_WIDTH +
-						"\' argument is not numeric.\n: " + width;
+						"\' argument is not numeric.\n: " + value;
 				throw new ConfigException(msg);
 			}
 		} else {
@@ -234,14 +249,13 @@ public class EmulatorConfig {
 			throw new ConfigException(msg);
 		}
 
-		if (args.containsKey(ArgsConstants.RESOLUTION_HEIGHT)) {
-			String height = args.get(ArgsConstants.RESOLUTION_HEIGHT);
+		if ((value = args.get(ArgsConstants.RESOLUTION_HEIGHT)) != null) {
 			try {
-				Integer.parseInt(height);
+				Integer.parseInt(value);
 			} catch (NumberFormatException e) {
 				String msg = INVALID_OPTION_MESSAGE + "The \'" +
 						ArgsConstants.RESOLUTION_HEIGHT +
-						"\' argument is not numeric.\n: " + height;
+						"\' argument is not numeric.\n: " + value;
 				throw new ConfigException(msg);
 			}
 		} else {
-- 
2.34.1