VM Template: Fix bug when generate custom platform's template.

Change-Id: I2a7e87819a34f076f1ba538bfb8dbeae2cc9a761
Signed-off-by: minkee.lee <minkee.lee@samsung.com>

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 (file)
--- 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;
+       }
 }