From c020bea4803b356b6a0d197246197ecadff0c824 Mon Sep 17 00:00:00 2001 From: "jihye424.kim" Date: Fri, 26 Feb 2016 17:54:49 +0900 Subject: [PATCH] Option: make option list using old version option factory Change-Id: I10dba03b677b7f2a32b53eb11144fa924461cf36 Signed-off-by: jihye424.kim --- .../manager/platform/StandardPlatform.java | 15 ++++++- .../ui/renewal/item/CommonOptionFactory.java | 6 ++- .../manager/vms/option/CommonOptionFactroy.java | 48 ++++++++++++---------- 3 files changed, 43 insertions(+), 26 deletions(-) diff --git a/src/org/tizen/emulator/manager/platform/StandardPlatform.java b/src/org/tizen/emulator/manager/platform/StandardPlatform.java index 913218e..09e34ad 100644 --- a/src/org/tizen/emulator/manager/platform/StandardPlatform.java +++ b/src/org/tizen/emulator/manager/platform/StandardPlatform.java @@ -54,6 +54,7 @@ import org.tizen.emulator.manager.vms.RESOLUTION; import org.tizen.emulator.manager.vms.SKIN_SHAPE; import org.tizen.emulator.manager.vms.VMProperty; import org.tizen.emulator.manager.vms.VMProperty.Architecture; +import org.tizen.emulator.manager.vms.option.CommonOptionFactroy; import org.tizen.emulator.manager.vms.option.IOption; public class StandardPlatform extends Platform { @@ -252,18 +253,28 @@ public class StandardPlatform extends Platform { private void makeOptionList() { IOptionFactory f = null; + CommonOptionFactroy oldFactory = null; if (plugin != null) { f = (IOptionFactory)plugin.newInstance(PluginStringResources.OptionFactoryV2); + //check old version factory + if (f == null + && getUITemplate().getVersion1ItemList() != null) { + oldFactory = (CommonOptionFactroy)plugin.newInstance(PluginStringResources.OptionFactory); + } } - if (f == null) { + if (f == null && oldFactory == null) { f = new CommonOptionFactory(); EMLogger.getLogger().warning("Fail to load OptionFactory."); EMLogger.getLogger().info("Use CommonOptionFactory."); } - optionList = f.makeOptionList(getVmItemList()); + if (oldFactory != null) { + optionList = oldFactory.makeOptionList(getUITemplate().getVersion1ItemList()); + } else { + optionList = f.makeOptionList(getVmItemList()); + } } private void makeItemList() { diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/CommonOptionFactory.java b/src/org/tizen/emulator/manager/ui/renewal/item/CommonOptionFactory.java index 2223a0f..f69201b 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/CommonOptionFactory.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/CommonOptionFactory.java @@ -90,7 +90,8 @@ public class CommonOptionFactory implements IOptionFactory { /** Sub class can override this for it's own option. */ public void addOption(List optionList, VMItem item) { String name = item.getName(); - if (name.equals(ItemName.NAME)) { + if (name.equals(ItemName.NAME) + || name.equals(ItemName.VM_NAME)) { optionList.add(Option.getInstance(VMNameOption.class)); } else if (name.equals(ItemName.BASE_IMAGE)) { @@ -124,7 +125,8 @@ public class CommonOptionFactory implements IOptionFactory { } else if (name.equals(ItemName.GL_VERSION)) { optionList.add(Option.getInstance(GLVersionOption.class)); - } else if (name.equals(ItemName.NETWORK)) { + } else if (name.equals(ItemName.NETWORK) + || name.equals(ItemName.NET_CONFIG)) { optionList.add(Option.getInstance(NetworkOption.class)); // add sub options (proxy option) if (item.getSubItems() != null) { diff --git a/src/org/tizen/emulator/manager/vms/option/CommonOptionFactroy.java b/src/org/tizen/emulator/manager/vms/option/CommonOptionFactroy.java index de39fd3..ba12318 100644 --- a/src/org/tizen/emulator/manager/vms/option/CommonOptionFactroy.java +++ b/src/org/tizen/emulator/manager/vms/option/CommonOptionFactroy.java @@ -30,38 +30,42 @@ package org.tizen.emulator.manager.vms.option; +import java.util.ArrayList; import java.util.List; +import org.tizen.emulator.manager.template.renewal.VMItem; +import org.tizen.emulator.manager.ui.renewal.item.CommonOptionFactory; import org.tizen.emulator.manager.vms.xml.template.Item; import org.tizen.emulator.manager.vms.xml.template.ItemList; @Deprecated -public abstract class CommonOptionFactroy implements IOptionFactory { - // Override if need. - public void makeCommonOptionList(List optionList, ItemList itemTemplate) { - - } - - // Plugin developer can override this if needed - public void addPropertyOption(Item item, List list) { - +public class CommonOptionFactroy extends CommonOptionFactory { + @ Deprecated + public List makeOptionList(ItemList itemTemplate) { + return new ArrayList(); } - // Plugin developer can override this if needed - public void addDeviceOption(Item item, List list) { - - } + @ Deprecated + public void makeCommonOptionList(List optionList, ItemList itemTemplate) { + for (Item item : itemTemplate.getPropertyList().getItem()) { - // Override if need - @Deprecated - public IOption findProeprtyOption(Item item) { - return null; + VMItem vmItem = new VMItem(); + vmItem.setName(item.getName()); + vmItem.setTitle(item.getTitle()); + vmItem.setType(item.getType()); + addOption(optionList, vmItem); + } + for (Item item : itemTemplate.getDeviceList().getItem()) { + addDeviceOption(item, optionList); + } } - // Override if need - @Deprecated - public IOption findDeviceOption(Item item) { - return null; + @ Deprecated + public void addDeviceOption(Item item, List optionList) { + VMItem vmItem = new VMItem(); + vmItem.setName(item.getName()); + vmItem.setTitle(item.getTitle()); + vmItem.setType(item.getType()); + addOption(optionList, vmItem); } - } -- 2.7.4