From cb071cb66725b97646f8e33391f3b09f31810c80 Mon Sep 17 00:00:00 2001
From: "minkee.lee" <minkee.lee@samsung.com>
Date: Tue, 12 Aug 2014 22:07:24 +0900
Subject: [PATCH] VM Template: Fix bug when generate custom platform's
 template.

Change-Id: I2a7e87819a34f076f1ba538bfb8dbeae2cc9a761
Signed-off-by: minkee.lee <minkee.lee@samsung.com>
---
 .../manager/ui/detail/item/CommonItemListFactory.java  | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/common-project/src/org/tizen/emulator/manager/ui/detail/item/CommonItemListFactory.java b/common-project/src/org/tizen/emulator/manager/ui/detail/item/CommonItemListFactory.java
index ff64240..0005f3d 100644
--- a/common-project/src/org/tizen/emulator/manager/ui/detail/item/CommonItemListFactory.java
+++ b/common-project/src/org/tizen/emulator/manager/ui/detail/item/CommonItemListFactory.java
@@ -216,7 +216,7 @@ public abstract class CommonItemListFactory implements IItemListFactory{
 				}
 			}
 			if (!itemExistInBase) {
-				baseItem.getItem().add(cloneItem(newItem));
+				baseItem.getItem().add(cloneItem(newSub));
 			}
 		}
 		// join options
@@ -224,7 +224,10 @@ public abstract class CommonItemListFactory implements IItemListFactory{
 			boolean optionExistInBase = false;
 			for (Option baseOption : baseItem.getOption()) {
 				if (baseOption.getName().equals(newOption.getName())) {
-					joinOption(baseOption, newOption);
+					optionExistInBase = true;
+					if (isListOption(baseOption, newOption)) {
+						joinOption(baseOption, newOption);
+					}
 				}
 			}
 
@@ -260,7 +263,7 @@ public abstract class CommonItemListFactory implements IItemListFactory{
 			optionSet.addAll(optionList);
 			optionList.clear();
 			optionList.addAll(optionSet);
-			Collections.sort(optionList);
+//			Collections.sort(optionList);
 			StringBuilder sb = new StringBuilder();
 
 			for (int i=0 ; i<optionList.size() ; i++) {
@@ -329,4 +332,13 @@ public abstract class CommonItemListFactory implements IItemListFactory{
 		newOption.setValue(option.getValue());
 		return newOption;
 	}
+
+	private boolean isListOption(Option baseOption, Option newOption) {
+		if (baseOption.getName().equals(OptionType.COMBO_LIST.getName())
+				&& newOption.getName().equals(OptionType.COMBO_LIST.getName())) {
+			return true;
+		}
+
+		return false;
+	}
 }
-- 
2.7.4