From da396b218f639ccdb181d85a43cbb8e5a4059cd1 Mon Sep 17 00:00:00 2001 From: Minkee Lee Date: Tue, 2 Feb 2016 14:45:23 +0900 Subject: [PATCH] refactoring: change option name ("defaultValue") Change "createDefault" to "defaultValue". It means an initial value of UI widget. Change-Id: If9e109ae46e16384c8f699b7422882108fd1ddce Signed-off-by: Minkee Lee --- .../manager/template/renewal/VMTemplateUtil.java | 4 ++-- .../manager/ui/renewal/item/CommonItemListFactory.java | 6 +++--- .../emulator/manager/ui/renewal/item/OptionName.java | 2 +- .../ui/renewal/item/modify/common/ComboItem.java | 18 +++++++++--------- .../ui/renewal/item/modify/vm/GLVersionItem.java | 6 +++--- .../ui/renewal/item/modify/vm/InputDeviceItem.java | 6 +++--- .../ui/renewal/item/modify/vm/ViewerTypeItem.java | 8 ++++---- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/org/tizen/emulator/manager/template/renewal/VMTemplateUtil.java b/src/org/tizen/emulator/manager/template/renewal/VMTemplateUtil.java index 06c1872..cc916c6 100644 --- a/src/org/tizen/emulator/manager/template/renewal/VMTemplateUtil.java +++ b/src/org/tizen/emulator/manager/template/renewal/VMTemplateUtil.java @@ -219,9 +219,9 @@ public class VMTemplateUtil { return optionMap; } - public static String getCreateDefault(List optionList) { + public static String getDefaultValue(List optionList) { for (VMItemOption option : optionList) { - if (option.getName().equals(OptionName.CREATE_DEFAULT)) { + if (option.getName().equals(OptionName.DEFAULT_VALUE)) { return option.getValue(); } } diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/CommonItemListFactory.java b/src/org/tizen/emulator/manager/ui/renewal/item/CommonItemListFactory.java index 6e45977..52d3be1 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/CommonItemListFactory.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/CommonItemListFactory.java @@ -257,7 +257,7 @@ public class CommonItemListFactory implements IItemListFactory{ } else if (name.equals(ItemName.GL_VERSION)) { itemList.add(new GLVersionItem(name, title, VMTemplateUtil.getOptionMap(item.getOptions()), - VMTemplateUtil.getCreateDefault(item.getOptions()))); + VMTemplateUtil.getDefaultValue(item.getOptions()))); } else if (name.equals(ItemName.OCI_DEVICE)) { // TODO this may be moved to tv plugin. @@ -271,7 +271,7 @@ public class CommonItemListFactory implements IItemListFactory{ } else if (name.equals(ItemName.INPUT_DEVICE)) { itemList.add(new InputDeviceItem(title, VMTemplateUtil.getOptionList(item.getOptions()), - VMTemplateUtil.getCreateDefault(item.getOptions()))); + VMTemplateUtil.getDefaultValue(item.getOptions()))); } else if (name.equals(ItemName.DISPLAY_MODE)) { itemList.add(new CheckBoxItem(name, item.getTitle(), @@ -280,7 +280,7 @@ public class CommonItemListFactory implements IItemListFactory{ } else if (name.equals(ItemName.VIEWER)) { itemList.add(new ViewerTypeItem(name, item.getTitle(), VMTemplateUtil.getOptionList(item.getOptions()), - VMTemplateUtil.getCreateDefault(item.getOptions()))); + VMTemplateUtil.getDefaultValue(item.getOptions()))); } else if (name.equals(ItemName.SUSPEND_SUPPORT)) { itemList.add(new SuspendSupportItem(item.getTitle())); diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/OptionName.java b/src/org/tizen/emulator/manager/ui/renewal/item/OptionName.java index 282698e..5b88f4b 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/OptionName.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/OptionName.java @@ -48,6 +48,6 @@ public class OptionName { public static final String WIN = "win"; //$NON-NLS-1$ public static final String MAC = "mac"; //$NON-NLS-1$ - public static final String CREATE_DEFAULT = "createDefault"; + public static final String DEFAULT_VALUE = "defaultValue"; } diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ComboItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ComboItem.java index 9aae0a5..393962b 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ComboItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ComboItem.java @@ -44,7 +44,7 @@ import org.tizen.emulator.manager.ui.renewal.widgets.WSTATE; public abstract class ComboItem extends ModifyDialogItem { protected ComboBox comboBox; - private String createDefault; + private String defaultValue; protected String comboValue; public static final int COMBO_WIDTH = 124; @@ -53,14 +53,14 @@ public abstract class ComboItem extends ModifyDialogItem { super(name, title); } - public ComboItem(String name, String title, String createDefault) { + public ComboItem(String name, String title, String defaultValue) { super(name, title); - this.createDefault = createDefault; + this.defaultValue = defaultValue; } - protected boolean useCreateDefault() { + protected boolean useDefaultValue() { return getItemListComp().isCreateMode() && - (createDefault != null && !createDefault.isEmpty()); + (defaultValue != null && !defaultValue.isEmpty()); } protected void addComboItem(String item) { @@ -164,11 +164,11 @@ public abstract class ComboItem extends ModifyDialogItem { item.setTitleEnable(enable); } - public void setCreateDefault(String createDefault) { - this.createDefault = createDefault; + public void setDefaultValue(String defaultValue) { + this.defaultValue = defaultValue; } - public String getCreateDefault() { - return createDefault; + public String getDefaultValue() { + return defaultValue; } } diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/GLVersionItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/GLVersionItem.java index 00f7e88..5c4a6aa 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/GLVersionItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/GLVersionItem.java @@ -131,8 +131,8 @@ public class GLVersionItem extends ComboItem { return; } - if (useCreateDefault()) { - glVersion = getCreateDefault(); + if (useDefaultValue()) { + glVersion = getDefaultValue(); } int index = -1; @@ -178,7 +178,7 @@ public class GLVersionItem extends ComboItem { @Override public ModifyDialogItem cloneItem() { - return new GLVersionItem(getName(), getTitle(), optionMap, getCreateDefault()); + return new GLVersionItem(getName(), getTitle(), optionMap, getDefaultValue()); } @Override diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/InputDeviceItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/InputDeviceItem.java index 0dbef7c..5b60dcb 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/InputDeviceItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/InputDeviceItem.java @@ -90,8 +90,8 @@ public class InputDeviceItem extends ComboItem{ return; } - if (useCreateDefault()) { - value = getCreateDefault(); + if (useDefaultValue()) { + value = getDefaultValue(); } // select item @@ -153,7 +153,7 @@ public class InputDeviceItem extends ComboItem{ @Override public ModifyDialogItem cloneItem() { - return new InputDeviceItem(getTitle(), optionList, getCreateDefault()); + return new InputDeviceItem(getTitle(), optionList, getDefaultValue()); } } diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/ViewerTypeItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/ViewerTypeItem.java index d8453ee..ede9b7f 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/ViewerTypeItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/ViewerTypeItem.java @@ -85,8 +85,8 @@ public class ViewerTypeItem extends ComboItem { return; } - if (useCreateDefault()) { - viewerType = getCreateDefault(); + if (useDefaultValue()) { + viewerType = getDefaultValue(); } int index = -1; @@ -131,13 +131,13 @@ public class ViewerTypeItem extends ComboItem { @Override public ModifyDialogItem cloneItem() { - return new ViewerTypeItem(getName(), getTitle(), optionList, getCreateDefault()); + return new ViewerTypeItem(getName(), getTitle(), optionList, getDefaultValue()); } @Override public void changeItem(ModifyDialogItem srcDialogItem) { if (getItemListComp().isCreateMode()) { - setCreateDefault(((ComboItem)srcDialogItem).getCreateDefault()); + setDefaultValue(((ComboItem)srcDialogItem).getDefaultValue()); } resetComboList(); } -- 2.7.4