modify-item: remove unnecessary function argument
authorminkee.lee <minkee.lee@samsung.com>
Fri, 4 Dec 2015 05:59:53 +0000 (14:59 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Fri, 4 Dec 2015 11:15:48 +0000 (20:15 +0900)
Remove argument 'PropertyValue' at below functions in
ModifyDialogItem class.
- setInitialValue()
- changeItemValue()
- setValue()

Change-Id: I61ac2288694416607a6828a29d2b89a6c7d5aa74
Signed-off-by: minkee.lee <minkee.lee@samsung.com>
47 files changed:
src/org/tizen/emulator/manager/ui/renewal/dialog/DeviceTemplateModifyDialog.java
src/org/tizen/emulator/manager/ui/renewal/dialog/ItemListComp.java
src/org/tizen/emulator/manager/ui/renewal/dialog/ModifyDialog.java
src/org/tizen/emulator/manager/ui/renewal/dialoghandler/BaseImageDialogHandler.java
src/org/tizen/emulator/manager/ui/renewal/dialoghandler/DeviceTemplateDialogHandler.java
src/org/tizen/emulator/manager/ui/renewal/dialoghandler/VMModifyHandler.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/BaseImageFileItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/BaseImageNameItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/DescriptionItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/baseimage/PlatformItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/common/CheckBoxItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ComboItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/common/DisplayItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/common/IModifyDialogItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ImageItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ModifyDialogItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/common/NameItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ProcessorItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/common/ProfileItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/common/RamSizeItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/common/SkinItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/common/SkinSubItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/common/TextBoxItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/AdvancedPropertyViewer.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CameraImageItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CameraItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CameraLegacyItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CameraTypeItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/CategoryItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/DeviceTemplateItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/FileSharingItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/GLVersionItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/HWSupportItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetConnectTypeItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetDnsItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetIPInfoItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetIPSubItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetMacItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetProxyItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetTapDeviceItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetTapDeviceItemForWin.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/NetworkItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/OCIDeviceItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/TunerCountryItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/TunerSystemItem.java
src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/TunerTableItem.java
src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTableViewer.java

index 7e2df1b..0cfdbf8 100644 (file)
@@ -83,7 +83,7 @@ public class DeviceTemplateModifyDialog extends ModifyDialog {
                                        new PropertyValue(prop.getDefaultTemplate().getValue()));
                }
                for (ModifyDialogItem item : itemListComp.getItemList()) {
-                       item.setInitialValue(itemListComp.getPropertyValue());
+                       item.setInitialValue();
                }
                DeviceTemplateDialogHandler.changeItemList(itemListComp.getItemList(), profile);
 
index a049a44..6d7a5aa 100644 (file)
@@ -122,7 +122,7 @@ public class ItemListComp {
                        item.setItemListComp(this);
 
                        // TODO we need default value for dialog
-                       item.setInitialValue(propertyValue);
+                       item.setInitialValue();
                        item.create(scrolledContent);
                        item.setVisible();
                }
@@ -149,6 +149,11 @@ public class ItemListComp {
 
        public void setPropertyValue(PropertyValue propertyValue) {
                this.propertyValue = propertyValue;
+               if (itemList != null) {
+                       for (ModifyDialogItem item : itemList) {
+                               item.setPropertyValue(propertyValue);
+                       }
+               }
        }
 
        public void create() {
@@ -209,7 +214,7 @@ public class ItemListComp {
                        }
                }
 
-               if (!isCreateMode()) {
+               if (isModifyMode()) {
                        // TODO check change
                }
 
@@ -257,11 +262,11 @@ public class ItemListComp {
 
                Profile prop = ProfileList.getProfile(profile);
                if (prop != null && prop.getDefaultTemplate() != null) {
-                       propertyValue = new PropertyValue(prop.getDefaultTemplate().getValue().clone());
+                       setPropertyValue(new PropertyValue(prop.getDefaultTemplate().getValue().clone()));
                }
 
                for (ModifyDialogItem item : itemList) {
-                       item.setInitialValue(propertyValue);
+                       item.setInitialValue();
                }
                DeviceTemplateDialogHandler.changeItemList(itemList, profile);
 
@@ -272,14 +277,14 @@ public class ItemListComp {
 
        public void changeItemListForBaseImageDialog() {
                for (ModifyDialogItem item : itemList) {
-                       item.changeItemValue(propertyValue);
+                       item.changeItemValue();
                }
        }
 
 
        public void changeAdvancedItemList(List<ModifyDialogItem> profileItems,
                        List<ModifyDialogItem> imageItems, PropertyValue value) {
-               propertyValue = value;
+               setPropertyValue(value);
 
                if (profileItems != null) {
                        itemList = profileItems;
@@ -288,7 +293,7 @@ public class ItemListComp {
 
                // change items with imageItems.
                for (ModifyDialogItem item : itemList) {
-                       item.setInitialValue(propertyValue);
+                       item.setInitialValue();
                }
                changeItemList(itemList, imageItems);
 
@@ -296,7 +301,6 @@ public class ItemListComp {
 
                layoutScrolledComposite();
 
-
        }
 
 
@@ -309,11 +313,9 @@ public class ItemListComp {
        }
 
 
-       public void saveDataInto(Object obj) {
-               PropertyValue value = new PropertyValue(obj);
-
+       public void saveDataInto() {
                for(ModifyDialogItem item : itemList) {
-                       item.setValue(value);
+                       item.setValue();
                }
        }
 
index 12bdefb..753731d 100644 (file)
@@ -95,8 +95,8 @@ public class ModifyDialog extends Dialog {
        public void checkValid() {
        }
 
-       public void saveDataInto(Object obj) {
-               itemListComp.saveDataInto(obj);
+       public void saveDataInto() {
+               itemListComp.saveDataInto();
        }
 
 
index 7534501..1d91470 100644 (file)
@@ -83,7 +83,7 @@ public class BaseImageDialogHandler {
                dialog.create(value, getDefaultItemList(), mode);
 
                if (dialog.open() == SWT.OK) {
-                       dialog.saveDataInto(value);
+                       dialog.saveDataInto();
                        return value;
                }
 
index 6b93f3e..e4c5743 100644 (file)
@@ -134,7 +134,7 @@ public class DeviceTemplateDialogHandler {
 
                int retValue = dialog.open();
                if (retValue == SWT.OK) {
-                       dialog.saveDataInto(value);
+                       dialog.saveDataInto();
                        // TODO for test
                        System.out.println(value.getPrintValue());
                        return value;
index ac57e9c..ed744bc 100644 (file)
@@ -81,7 +81,7 @@ public class VMModifyHandler {
                int retValue = dialog.open();
 
                if (retValue == SWT.OK) {
-                       dialog.saveDataInto(newValue);
+                       dialog.saveDataInto();
                        return newValue;
                }
                return null;
index 78416b9..b095701 100644 (file)
@@ -47,7 +47,6 @@ import org.tizen.emulator.manager.ui.renewal.MainDialog;
 import org.tizen.emulator.manager.ui.renewal.dialog.MessageBox;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.FileDialogItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.vms.VMProperty.Architecture;
 import org.tizen.emulator.manager.vms.helper.HelperClass;
 import org.tizen.emulator.manager.vms.helper.QemuImgProc;
@@ -81,13 +80,13 @@ public class BaseImageFileItem extends FileDialogItem {
        }
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               filePath = imageFilePath = value.getImageFilePath();
+       public void setInitialValue() {
+               filePath = imageFilePath = propertyValue.getImageFilePath();
        }
 
        @Override
-       public void setValue(PropertyValue value) {
-               value.setImageFilePath(imageFilePath);
+       public void setValue() {
+               propertyValue.setImageFilePath(imageFilePath);
        }
 
        @Override
@@ -182,7 +181,7 @@ public class BaseImageFileItem extends FileDialogItem {
        public void fileSelected() {
                imageFilePath = filePath;
                // for setting default name of custom base image
-               getItemListComp().getPropertyValue().setImageFilePath(imageFilePath);
+               propertyValue.setImageFilePath(imageFilePath);
                getItemListComp().changeItemListForBaseImageDialog();
                getItemListComp().checkValid();
        }
index d945c8d..d26c5e3 100644 (file)
@@ -39,7 +39,6 @@ import org.tizen.emulator.manager.resources.StringResources;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.NameItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.TextInputBoxItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.vms.helper.HelperClass;
 
 public class BaseImageNameItem extends TextInputBoxItem {
@@ -51,19 +50,20 @@ public class BaseImageNameItem extends TextInputBoxItem {
        }
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               if (value == null) {
+       public void setInitialValue() {
+
+               if (propertyValue == null) {
                        return;
                }
 
                if (getItemListComp().isCreateMode()) {
-                       this.value = value.getDefaultName();
+                       this.value = propertyValue.getDefaultName();
 
                } else if (getItemListComp().isCloneMode()){
-                       this.value = value.getCloneName();
+                       this.value = propertyValue.getCloneName();
 
                } else {
-                       this.value = value.getName();
+                       this.value = propertyValue.getName();
                }
 
                imageName = this.value;
@@ -88,8 +88,8 @@ public class BaseImageNameItem extends TextInputBoxItem {
        }
 
        @Override
-       public void setValue(PropertyValue value) {
-               value.setName(this.value);
+       public void setValue() {
+               propertyValue.setName(this.value);
        }
 
        @Override
@@ -155,14 +155,15 @@ public class BaseImageNameItem extends TextInputBoxItem {
        }
 
        @Override
-       public void changeItemValue(PropertyValue property) {
+       public void changeItemValue() {
                // item list comp's changeItemListForBaseImageDialog() -> chnageItemValue()
-               if (property.isBaseImageValue()) {
+
+               if (propertyValue.isBaseImageValue()) {
                        if (value != null && !value.isEmpty()) {
                                return;
                        }
 
-                       String path = property.getImageFilePath();
+                       String path = propertyValue.getImageFilePath();
                        if (path != null && !path.isEmpty()) {
                                String fileName = path.substring(path
                                                .lastIndexOf(File.separator) + 1, path.length());
index 1cd9b3f..4bf9e76 100644 (file)
@@ -9,7 +9,6 @@ import org.tizen.emulator.manager.renewal.resources.ImageResources;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.TextInputBoxItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.widgets.TextInputBox;
 
 public class DescriptionItem extends TextInputBoxItem {
@@ -23,12 +22,12 @@ public class DescriptionItem extends TextInputBoxItem {
        }
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               if (value == null) {
+       public void setInitialValue() {
+               if (propertyValue == null) {
                        return;
                }
 
-               this.value = value.getDescritpion();
+               this.value = propertyValue.getDescritpion();
        }
 
        @Override
@@ -66,8 +65,8 @@ public class DescriptionItem extends TextInputBoxItem {
        }
 
        @Override
-       public void setValue(PropertyValue value) {
-               value.setDescription(this.value);
+       public void setValue() {
+               propertyValue.setDescription(this.value);
        }
 
        @Override
index 056421f..a7865e6 100644 (file)
@@ -45,7 +45,6 @@ import org.tizen.emulator.manager.renewal.resources.ImageResources;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ComboItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.widgets.ComboBox;
 import org.tizen.emulator.manager.ui.renewal.widgets.ImageButton;
 import org.tizen.emulator.manager.vms.VMProperty.Architecture;
@@ -69,11 +68,11 @@ public class PlatformItem extends ComboItem {
        }
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               selectedPlatform = value.getPlatform();
-               arch = value.getArchitecture();
+       public void setInitialValue() {
+               selectedPlatform = propertyValue.getPlatform();
+               arch = propertyValue.getArchitecture();
 
-               profile = ProfileList.getProfile(value.getProfile());
+               profile = ProfileList.getProfile(propertyValue.getProfile());
        }
 
        @Override
@@ -97,9 +96,9 @@ public class PlatformItem extends ComboItem {
        }
 
        @Override
-       public void setValue(PropertyValue value) {
-               value.setPlatform(selectedPlatform);
-               value.setArchitecture(arch);
+       public void setValue() {
+               propertyValue.setPlatform(selectedPlatform);
+               propertyValue.setArchitecture(arch);
        }
 
        @Override
@@ -135,7 +134,7 @@ public class PlatformItem extends ComboItem {
                }
        }
 
-       private Listener radioButtonListener = new Listener() {
+       private final Listener radioButtonListener = new Listener() {
 
                @Override
                public void handleEvent(Event event) {
@@ -218,18 +217,18 @@ public class PlatformItem extends ComboItem {
        }
 
        @Override
-       public void changeItemValue(PropertyValue value) {
+       public void changeItemValue() {
                // changeItemLsitForBaseImageDialog call changeItemValue
 
                // change profile
-               if (profile == null || !profile.getName().equals(value.getProfile())) {
-                       profile = ProfileList.getProfile(value.getProfile());
+               if (profile == null || !profile.getName().equals(propertyValue.getProfile())) {
+                       profile = ProfileList.getProfile(propertyValue.getProfile());
                        initPlatformCombo();
                }
 
                // change image path
-               if (imagePath == null || !imagePath.equals(value.getImageFilePath())) {
-                       imagePath = value.getImageFilePath();
+               if (imagePath == null || !imagePath.equals(propertyValue.getImageFilePath())) {
+                       imagePath = propertyValue.getImageFilePath();
                        Architecture a = Architecture.findCpuTypeFromPath(imagePath);
                        if (a != null) {
                                Architecture temp = selectedPlatform.findArchitecture(a.getBit());
index 25e66ae..915bc3a 100644 (file)
@@ -40,7 +40,6 @@ import org.eclipse.swt.layout.FormData;
 import org.eclipse.swt.widgets.Composite;
 import org.tizen.emulator.manager.ui.renewal.item.ItemType;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubTreeModifyItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.TreeModifyItem;
 
@@ -289,27 +288,19 @@ public class CheckBoxItem extends ModifyDialogItem {
        }
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               Map<String, Boolean> valueMap = value.getCheckBoxOptions(getName());
+       public void setInitialValue() {
+               Map<String, Boolean> valueMap = propertyValue.getCheckBoxOptions(getName());
                this.valueMap = valueMap;
-//             if (getDialog().getDialogMode() == DIALOG_MODE.MODIFY) {
-//
-//
-//             } else {
-//                     for (CheckItemData data : this.dataList) {
-//                             data.setChecked(true);
-//                     }
-//             }
        }
 
 
        @Override
-       public void setValue(PropertyValue value) {
+       public void setValue() {
                valueMap.clear();
                for (CheckBoxSubItem subItem : getSubItemList()) {
                        valueMap.put(subItem.getName(), subItem.isChecked());
                }
-               value.setCheckBoxOptions(getName(), valueMap);
+               propertyValue.setCheckBoxOptions(getName(), valueMap);
        }
 
        @Override
@@ -324,8 +315,8 @@ public class CheckBoxItem extends ModifyDialogItem {
 
 
        @Override
-       public void changeItemValue(PropertyValue value) {
-               setInitialValue(value);
+       public void changeItemValue() {
+               setInitialValue();
                updateCheckBoxSubItems();
                layoutCheckBoxSubItems();
        }
index 7957df1..a4521ea 100644 (file)
@@ -140,6 +140,4 @@ public abstract class ComboItem extends ModifyDialogItem {
                comboBox.setEnabled(enable);
                item.setTitleEnable(enable);
        }
-
-
 }
index b178674..4d74964 100644 (file)
@@ -49,7 +49,6 @@ import org.tizen.emulator.manager.renewal.resources.ColorResources;
 import org.tizen.emulator.manager.renewal.resources.ImageResources;
 import org.tizen.emulator.manager.ui.renewal.dialog.DIALOG_MODE;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubTreeModifyItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.TreeModifyItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.template.TemplateSkinSubItem;
@@ -116,7 +115,7 @@ public class DisplayItem extends ModifyDialogItem {
                }
 
                // create skin item
-               if (getItemListComp().getPropertyValue().isTemplateValue()) {
+               if (propertyValue.isTemplateValue()) {
                        skinItem = new TemplateSkinSubItem(this);
                } else {
                        skinItem = new SkinSubItem(this);
@@ -168,18 +167,18 @@ public class DisplayItem extends ModifyDialogItem {
 
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               resolutionItem.setResolution(value.getResolution());
-               resolutionItem.setDisplayHeight(String.valueOf(value.getDisplayHeight()));
-               resolutionItem.setDisplayWidth(String.valueOf(value.getDisplayWidth()));
+       public void setInitialValue() {
+               resolutionItem.setResolution(propertyValue.getResolution());
+               resolutionItem.setDisplayHeight(String.valueOf(propertyValue.getDisplayHeight()));
+               resolutionItem.setDisplayWidth(String.valueOf(propertyValue.getDisplayWidth()));
 
-               displaySize = String.valueOf(value.getDisplaySize());
+               displaySize = String.valueOf(propertyValue.getDisplaySize());
 
                makeSkinItem();
-               skinItem.setSkin(value.getSkin());
+               skinItem.setSkin(propertyValue.getSkin());
 
                // for detail information
-               displayDPI = String.valueOf(value.getDisplayDPI());
+               displayDPI = String.valueOf(propertyValue.getDisplayDPI());
        }
 
 
@@ -303,21 +302,21 @@ public class DisplayItem extends ModifyDialogItem {
 
 
        @Override
-       public void setValue(PropertyValue value) {
+       public void setValue() {
                // set resolution
-               resolutionItem.setValue(value);
+               resolutionItem.setValue(propertyValue);
 
 
                try {
                        // set display size (inch)
-                       value.setDisplaySize(Double.parseDouble(displaySize));
+                       propertyValue.setDisplaySize(Double.parseDouble(displaySize));
 
                } catch (NumberFormatException e) {
                        EMLogger.getLogger().warning(e.getMessage());
                }
 
                // TODO skin
-               skinItem.setValue(value);
+               skinItem.setValue();
        }
 
 
@@ -369,12 +368,13 @@ public class DisplayItem extends ModifyDialogItem {
        }
 
        @Override
-       public void changeItemValue(PropertyValue value) {
+       public void changeItemValue() {
+
                // display resolution
-               resolutionItem.changeValue(value.getResolution());
+               resolutionItem.changeValue(propertyValue.getResolution());
 
                // size
-               displaySize = String.valueOf(value.getDisplaySize());
+               displaySize = String.valueOf(propertyValue.getDisplaySize());
                selectSize();
 
                // skin ?
index b927be8..87d67ce 100644 (file)
@@ -30,7 +30,6 @@
 package org.tizen.emulator.manager.ui.renewal.item.modify.common;
 
 import org.eclipse.swt.widgets.Composite;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 
 public interface IModifyDialogItem {
 
@@ -39,12 +38,12 @@ public interface IModifyDialogItem {
        /** To decide modify dialog */
        public int getHeight();
 
-       public void setInitialValue(PropertyValue value);
+       public void setInitialValue();
 
        public boolean isValid();
 
-       /** set dialog data to property value */
-       public void setValue(PropertyValue value);
+       /** set dialog data PropertyValue in ItemListComp */
+       public void setValue();
 
        public abstract ModifyDialogItem cloneItem();
 
index daff57c..d034ec8 100644 (file)
@@ -32,7 +32,6 @@ package org.tizen.emulator.manager.ui.renewal.item.modify.common;
 
 import org.eclipse.swt.widgets.Composite;
 import org.tizen.emulator.manager.renewal.resources.ImageResources;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 
 public class ImageItem extends TextLabelItem {
 
@@ -50,15 +49,15 @@ public class ImageItem extends TextLabelItem {
        }
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               if (value == null) {
+       public void setInitialValue() {
+               if (propertyValue == null) {
                        return;
                }
-               this.value = value.getImageName();
+               this.value = propertyValue.getImageName();
        }
 
        @Override
-       public void setValue(PropertyValue value) {
+       public void setValue() {
                // TODO Auto-generated method stub
 
        }
index 089084f..437b881 100644 (file)
@@ -61,6 +61,7 @@ public abstract class ModifyDialogItem implements IModifyDialogItem {
 
        private ItemListComp itemListComp;
 
+       protected PropertyValue propertyValue;
        protected Canvas stateIconCanvas;
 
        public static final int ERROR_ICON_SIZE = 16;
@@ -116,7 +117,8 @@ public abstract class ModifyDialogItem implements IModifyDialogItem {
        }
 
        /** change item value and redraw */
-       public void changeItemValue(PropertyValue value) {
+//     public void changeItemValue(PropertyValue value) {
+       public void changeItemValue() {
                // sub tree Dialog-item have to override
        }
 
@@ -163,8 +165,12 @@ public abstract class ModifyDialogItem implements IModifyDialogItem {
 
        public void setItemListComp(ItemListComp itemlistComp) {
                this.itemListComp = itemlistComp;
+               propertyValue = itemListComp.getPropertyValue();
        }
 
+       public void setPropertyValue(PropertyValue value) {
+               propertyValue = value;
+       }
 
        public ItemListComp getItemListComp() {
                return itemListComp;
index 95cc0a5..d22b162 100644 (file)
@@ -36,7 +36,6 @@ import org.tizen.emulator.manager.renewal.resources.ImageResources;
 import org.tizen.emulator.manager.resources.StringResources;
 import org.tizen.emulator.manager.ui.Messages;
 import org.tizen.emulator.manager.ui.renewal.dialog.DIALOG_MODE;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.vms.VMProperty;
 import org.tizen.emulator.manager.vms.helper.HelperClass;
 
@@ -60,18 +59,18 @@ public class NameItem extends TextInputBoxItem {
 
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               if (value == null) {
+       public void setInitialValue() {
+               if (propertyValue == null) {
                        return;
                }
                if (getItemListComp().isCreateMode()) {
-                       this.value = value.getDefaultName();
+                       this.value = propertyValue.getDefaultName();
 
                } else if (getItemListComp().isCloneMode()){
-                       this.value = value.getCloneName();
+                       this.value = propertyValue.getCloneName();
 
                } else {
-                       this.value = value.getName();
+                       this.value = propertyValue.getName();
                }
        }
 
@@ -107,10 +106,9 @@ public class NameItem extends TextInputBoxItem {
                }
 
                String msg = "";
-               PropertyValue property = getItemListComp().getPropertyValue();
-               if (property.isTemplateValue()) {
+               if (propertyValue.isTemplateValue()) {
                        msg = checkTemplateName(value);
-               } else if (property.isVMValue()) {
+               } else if (propertyValue.isVMValue()) {
                        msg = checkVMName(value);
                } else {
                        // TODO
@@ -126,8 +124,8 @@ public class NameItem extends TextInputBoxItem {
 
 
        @Override
-       public void setValue(PropertyValue value) {
-               value.setName(this.value);
+       public void setValue() {
+               propertyValue.setName(this.value);
        }
 
 
index 03c1660..d53b8d8 100644 (file)
@@ -37,7 +37,6 @@ import org.tizen.emulator.manager.logging.EMLogger;
 import org.tizen.emulator.manager.renewal.resources.ImageResources;
 import org.tizen.emulator.manager.ui.renewal.dialog.DIALOG_MODE;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubTreeModifyItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.TreeModifyItem;
 import org.tizen.emulator.manager.ui.renewal.widgets.ComboBox;
@@ -130,8 +129,8 @@ public class ProcessorItem extends ComboItem {
        }
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               if (value == null) {
+       public void setInitialValue() {
+               if (propertyValue == null) {
                        return;
                }
 
@@ -154,7 +153,7 @@ public class ProcessorItem extends ComboItem {
                        }
 
                } else {
-                       cpuNum = value.getCpuNum();
+                       cpuNum = propertyValue.getCpuNum();
                }
 
        }
@@ -165,8 +164,8 @@ public class ProcessorItem extends ComboItem {
        }
 
        @Override
-       public void setValue(PropertyValue value) {
-               value.setCpuNum(cpuNum);
+       public void setValue() {
+               propertyValue.setCpuNum(cpuNum);
 
        }
 
@@ -178,8 +177,8 @@ public class ProcessorItem extends ComboItem {
 
 
        @Override
-       public void changeItemValue(PropertyValue value) {
-               setInitialValue(value);
+       public void changeItemValue() {
+               setInitialValue();
                selectItem();
        }
 }
index 91d48ee..4a54574 100644 (file)
@@ -51,7 +51,6 @@ import org.tizen.emulator.manager.platform.Profile;
 import org.tizen.emulator.manager.platform.ProfileList;
 import org.tizen.emulator.manager.renewal.resources.ImageResources;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.widgets.ImageRadioButton;
 import org.tizen.emulator.manager.ui.renewal.widgets.WSTATE;
 
@@ -82,11 +81,11 @@ public class ProfileItem extends ModifyDialogItem {
        }
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               if (value == null) {
+       public void setInitialValue() {
+               if (propertyValue == null) {
                        return;
                }
-               this.currentProfile = value.getProfile();
+               this.currentProfile = propertyValue.getProfile();
        }
 
 
@@ -236,11 +235,10 @@ public class ProfileItem extends ModifyDialogItem {
                                                        return;
                                                }
 
-                                               PropertyValue value = getItemListComp().getPropertyValue();
-                                               if (value.isBaseImageValue()) {
-                                                       value.setProfile(profile);
+                                               if (propertyValue.isBaseImageValue()) {
+                                                       propertyValue.setProfile(profile);
                                                        getItemListComp().changeItemListForBaseImageDialog();
-                                               } else if (value.isTemplateValue()) {
+                                               } else if (propertyValue.isTemplateValue()) {
                                                        getItemListComp().changeItemListByProfile(profile);
                                                }
                                        }
@@ -260,15 +258,15 @@ public class ProfileItem extends ModifyDialogItem {
                for (String profile : buttonMap.keySet()) {
                        if (profile.equals(currentProfile)) {
                                buttonMap.get(profile).selectRadio();
-                               getItemListComp().getPropertyValue().setProfile(profile);
+                               propertyValue.setProfile(profile);
                        }
                }
        }
 
 
        @Override
-       public void setValue(PropertyValue value) {
-               value.setProfile(currentProfile);
+       public void setValue() {
+               propertyValue.setProfile(currentProfile);
 
        }
 
@@ -278,7 +276,7 @@ public class ProfileItem extends ModifyDialogItem {
        }
 
        @Override
-       public void changeItemValue(PropertyValue value) {
-               currentProfile = value.getProfile();
+       public void changeItemValue() {
+               setInitialValue();
        }
 }
index 0754451..d599da3 100644 (file)
@@ -39,7 +39,6 @@ import org.tizen.emulator.manager.logging.EMLogger;
 import org.tizen.emulator.manager.renewal.resources.ImageResources;
 import org.tizen.emulator.manager.ui.renewal.dialog.DIALOG_MODE;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubTreeModifyItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.TreeModifyItem;
 import org.tizen.emulator.manager.ui.renewal.widgets.ComboBox;
@@ -155,13 +154,13 @@ public class RamSizeItem extends ComboItem {
        }
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               ramSize = value.getRamSize();
+       public void setInitialValue() {
+               ramSize = propertyValue.getRamSize();
        }
 
        @Override
-       public void setValue(PropertyValue value) {
-               value.setRamSize(ramSize);
+       public void setValue() {
+               propertyValue.setRamSize(ramSize);
 
        }
 
@@ -180,8 +179,8 @@ public class RamSizeItem extends ComboItem {
 
 
        @Override
-       public void changeItemValue(PropertyValue value) {
-               setInitialValue(value);
+       public void changeItemValue() {
+               setInitialValue();
                selectItem();
        }
 }
index b6804f8..30e9b25 100644 (file)
@@ -41,7 +41,6 @@ import org.tizen.emulator.manager.logging.EMLogger;
 import org.tizen.emulator.manager.platform.Skin;
 import org.tizen.emulator.manager.platform.SkinList;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.vms.RESOLUTION;
 import org.tizen.emulator.manager.vms.SKIN_SHAPE;
 import org.tizen.emulator.manager.vms.SKIN_TYPE;
@@ -81,22 +80,22 @@ public class SkinItem extends ComboItem {
        }
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               skin = value.getSkin();
+       public void setInitialValue() {
+               skin = propertyValue.getSkin();
 
        }
 
        @Override
-       public void setValue(PropertyValue value) {
+       public void setValue() {
                // set skin
-               value.setSkin(skin);
+               propertyValue.setSkin(skin);
 
                // set skin path
                String skinPath = null;
                if (skin != null) {
                        skinPath = skin.getPath();
                }
-               value.setSkinPath(skinPath);
+               propertyValue.setSkinPath(skinPath);
 
        }
 
@@ -180,8 +179,8 @@ public class SkinItem extends ComboItem {
        }
 
        protected void initSkinCombo(RESOLUTION re, boolean isResolutionExist) {
-               imageSkinShape = getItemListComp().getPropertyValue().getImageSkinShape();
-               skinList = getItemListComp().getPropertyValue().getImageSkinList();
+               imageSkinShape = propertyValue.getImageSkinShape();
+               skinList = propertyValue.getImageSkinList();
 
 
                settingSkinList(re, isResolutionExist);
index 6375ec1..e8acff1 100644 (file)
@@ -78,7 +78,7 @@ public class SkinSubItem extends SkinItem {
                comboBox = new ComboBox(getItemListComp().getShell(), comp, SWT.NONE);
                comboBox.setLayoutData(data);
 
-               if (getItemListComp().getPropertyValue().isTemplateValue()) {
+               if (propertyValue.isTemplateValue()) {
                        return;
                }
 
index 63deabf..95eccbb 100644 (file)
@@ -36,7 +36,6 @@ import org.eclipse.swt.layout.FormAttachment;
 import org.eclipse.swt.layout.FormData;
 import org.eclipse.swt.widgets.Composite;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.widgets.TextBox;
 
 public class TextBoxItem extends ModifyDialogItem {
@@ -67,13 +66,13 @@ public class TextBoxItem extends ModifyDialogItem {
        }
 
        @Override
-       public void setInitialValue(PropertyValue value) {
+       public void setInitialValue() {
                // TODO Auto-generated method stub
 
        }
 
        @Override
-       public void setValue(PropertyValue value) {
+       public void setValue() {
                // TODO Auto-generated method stub
 
        }
index 0286131..3e2fca3 100644 (file)
@@ -233,8 +233,8 @@ public class AdvancedPropertyViewer {
                return listener;
        }
 
-       public void saveDataInto(Object value) {
-               itemListComp.saveDataInto(value);
+       public void saveDataInto() {
+               itemListComp.saveDataInto();
        }
 
        // return if item is showing in advanced option.
index 5dd7e57..a6b9e2f 100644 (file)
@@ -39,7 +39,6 @@ import org.tizen.emulator.manager.ui.Messages;
 import org.tizen.emulator.manager.ui.renewal.item.ItemName;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.FileDialogItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubItemTitle;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubModifyItem;
 
@@ -80,8 +79,8 @@ public class CameraImageItem extends FileDialogItem {
 
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               imagePath = value.getSubOptionValue(getParentItem().getName(), getName());
+       public void setInitialValue() {
+               imagePath = propertyValue.getSubOptionValue(getParentItem().getName(), getName());
                if (!getItemListComp().isDetailMode()) {
                        settingImagePath();
                }
@@ -90,8 +89,8 @@ public class CameraImageItem extends FileDialogItem {
        }
 
        @Override
-       public void setValue(PropertyValue value) {
-               value.setSubOptionValue(getParentItem().getName(), getName(), imagePath);
+       public void setValue() {
+               propertyValue.setSubOptionValue(getParentItem().getName(), getName(), imagePath);
 
        }
 
index ddbb64a..1889959 100644 (file)
@@ -38,7 +38,6 @@ import org.tizen.emulator.manager.resources.FilePathResources;
 import org.tizen.emulator.manager.ui.renewal.item.ItemName;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubTreeModifyItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.TreeModifyItem;
 import org.tizen.emulator.manager.vms.helper.HelperClass;
@@ -218,8 +217,8 @@ public class CameraItem extends CategoryItem {
        }
 
        @Override
-       public void changeItemValue(PropertyValue value) {
-               boolean useRear = value.getCheckBoxValue(ItemName.CAMERA, ItemName.CAMERA_REAR);
+       public void changeItemValue() {
+               boolean useRear = propertyValue.getCheckBoxValue(ItemName.CAMERA, ItemName.CAMERA_REAR);
                setRearCameraCheck(useRear);
        }
 
index face322..964caa1 100644 (file)
@@ -38,7 +38,6 @@ import org.tizen.emulator.manager.renewal.resources.ImageResources;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.CheckBoxItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.CheckBoxSubItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.CheckItemData;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.TreeModifyItem;
 
 public class CameraLegacyItem extends CheckBoxItem {
@@ -58,27 +57,27 @@ public class CameraLegacyItem extends CheckBoxItem {
        }
 
        @Override
-       public void changeItemValue(PropertyValue value) {
-               setInitialValue(value);
+       public void changeItemValue() {
+               setInitialValue();
                updateCheckBoxSubItems();
                layoutCheckBoxSubItems();
        }
 
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               Map<String, Boolean> valueMap = value.getCameraCheckOptions();
+       public void setInitialValue() {
+               Map<String, Boolean> valueMap = propertyValue.getCameraCheckOptions();
                this.valueMap = valueMap;
        }
 
 
        @Override
-       public void setValue(PropertyValue value) {
+       public void setValue() {
                valueMap.clear();
                for (CheckBoxSubItem subItem : getSubItemList()) {
                        valueMap.put(subItem.getName(), subItem.isChecked());
                }
-               value.setCheckBoxOptions(getName(), valueMap);
+               propertyValue.setCheckBoxOptions(getName(), valueMap);
        }
 
 }
index c0d61eb..e6ab8b6 100644 (file)
@@ -38,7 +38,6 @@ import org.tizen.emulator.manager.ui.detail.item.property.CameraViewItem;
 import org.tizen.emulator.manager.ui.renewal.item.ItemName;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ComboItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubItemTitle;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubModifyItem;
 import org.tizen.emulator.manager.ui.renewal.widgets.ComboBox;
@@ -183,13 +182,13 @@ public class CameraTypeItem extends ComboItem {
 
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               cameraType = value.getSubOptionValue(ItemName.CAMERA, getName());
+       public void setInitialValue() {
+               cameraType = propertyValue.getSubOptionValue(ItemName.CAMERA, getName());
        }
 
        @Override
-       public void setValue(PropertyValue value) {
-               value.setSubOptionValue(ItemName.CAMERA, getName(), cameraType);
+       public void setValue() {
+               propertyValue.setSubOptionValue(ItemName.CAMERA, getName(), cameraType);
 
        }
 
index 502c1c2..d125449 100644 (file)
@@ -34,13 +34,14 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 
 public abstract class CategoryItem extends ModifyDialogItem {
 
        protected final List<ModifyDialogItem> subItems =
                        new ArrayList<ModifyDialogItem>();
 
+       private boolean isAllItemCreated = false;
+
        public void addSubItems(ModifyDialogItem subItem) {
                subItems.add(subItem);
        }
@@ -63,9 +64,9 @@ public abstract class CategoryItem extends ModifyDialogItem {
        }
 
        @Override
-       public void setValue(PropertyValue value) {
+       public void setValue() {
                for (ModifyDialogItem item : subItems) {
-                       item.setValue(value);
+                       item.setValue();
                }
        }
 
@@ -83,16 +84,24 @@ public abstract class CategoryItem extends ModifyDialogItem {
                for (ModifyDialogItem item : subItems) {
                        item.setParentItem(this);
                        item.setItemListComp(this.getItemListComp());
-                       item.setInitialValue(this.getItemListComp().getPropertyValue());
+                       item.setInitialValue();
                        item.create(this.item.getBody());
                        item.setVisible();
                }
+               isAllItemCreated = true;
        }
 
 
        @Override
-       public void setInitialValue(PropertyValue value) {
+       public void setInitialValue() {
                // nothing to do
+               if (!isAllItemCreated) {
+                       return;
+               }
+
+               for (ModifyDialogItem item : subItems) {
+                       item.setInitialValue();
+               }
        }
 
 
index 223cab7..f51a787 100644 (file)
@@ -38,7 +38,6 @@ import org.tizen.emulator.manager.platform.ProfileList;
 import org.tizen.emulator.manager.ui.renewal.item.ItemName;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ComboItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubTreeModifyItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.TreeItemTitle;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.TreeModifyItem;
@@ -105,39 +104,39 @@ public class DeviceTemplateItem extends ComboItem {
        }
 
        @Override
-       public void setInitialValue(PropertyValue value) {
+       public void setInitialValue() {
                // TODO
-               template = value.getDeivceTemplate();
-               profile = ProfileList.getProfile(value.getProfile());
+               template = propertyValue.getDeivceTemplate();
+               profile = ProfileList.getProfile(propertyValue.getProfile());
        }
 
        @Override
        public void itemSelected(ComboBox comboBox) {
                template = (DeviceTemplate)comboBox.getSelectedData();
-               PropertyValue propertyValue = getItemListComp().getPropertyValue();
                propertyValue.setDeviceTemplate(template);
+
                // - change item list value
                for (SubTreeModifyItem subTree : treeModifyItem.getSubItemList()) {
                        ModifyDialogItem dialogItem = subTree.getDialogItem();
-                       dialogItem.changeItemValue(propertyValue);
+                       dialogItem.changeItemValue();
                }
 
                // change new camera item value
-               changeCameraItemValue(propertyValue);
+               changeCameraItemValue();
        }
 
 
-       private void changeCameraItemValue(PropertyValue value) {
+       private void changeCameraItemValue( ) {
                CameraItem cameraItem = (CameraItem)getItemListComp().getItem(ItemName.CAMERA);
                if (cameraItem == null) {
                        return;
                }
 
-               cameraItem.changeItemValue(value);
+               cameraItem.changeItemValue();
        }
 
        @Override
-       public void setValue(PropertyValue value) {
+       public void setValue() {
                // already set value when selected item
                //value.setDeviceTemplate(template);
        }
index 0b04d36..c03c2eb 100644 (file)
@@ -34,7 +34,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.tizen.emulator.manager.renewal.resources.ImageResources;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.FileDialogItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 
 public class FileSharingItem extends FileDialogItem {
 
@@ -69,18 +68,18 @@ public class FileSharingItem extends FileDialogItem {
        }
 
        @Override
-       public void setInitialValue(PropertyValue value) {
+       public void setInitialValue() {
                if (getItemListComp().isCreateMode()) {
                        sharingPath = "";
 
                } else {
-                       sharingPath = value.getFileSharingPath();
+                       sharingPath = propertyValue.getFileSharingPath();
                }
        }
 
        @Override
-       public void setValue(PropertyValue value) {
-               value.setFileSharingPath(sharingPath);
+       public void setValue() {
+               propertyValue.setFileSharingPath(sharingPath);
        }
 
        @Override
index e6bbff4..97e50a8 100644 (file)
@@ -38,7 +38,6 @@ import org.tizen.emulator.manager.job.CheckGPU;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ComboItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.widgets.ComboBox;
 
 public class GLVersionItem extends ComboItem {
@@ -110,7 +109,7 @@ public class GLVersionItem extends ComboItem {
                        isActivate = false;
 
                } else {
-                       isActivate = getItemListComp().getPropertyValue().getGPUAcceleration();
+                       isActivate = propertyValue.getGPUAcceleration();
                }
 
                return isActivate;
@@ -163,14 +162,14 @@ public class GLVersionItem extends ComboItem {
        }
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               glVersion = value.getSubOptionValue(getName());
+       public void setInitialValue() {
+               glVersion = propertyValue.getSubOptionValue(getName());
 
        }
 
        @Override
-       public void setValue(PropertyValue value) {
-               value.setSubOptionValue(getName(), glVersion);
+       public void setValue() {
+               propertyValue.setSubOptionValue(getName(), glVersion);
 
        }
 
@@ -179,4 +178,9 @@ public class GLVersionItem extends ComboItem {
                return new GLVersionItem(getName(), getTitle(), optionMap);
        }
 
+       @Override
+       public void changeItem(ModifyDialogItem srcDialogItem) {
+               resetCombo();
+       }
+
 }
index 73d62cf..6485efd 100644 (file)
@@ -45,7 +45,6 @@ import org.tizen.emulator.manager.ui.renewal.dialog.DIALOG_MODE;
 import org.tizen.emulator.manager.ui.renewal.item.ItemName;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.widgets.ImageButton;
 
 public class HWSupportItem extends ModifyDialogItem {
@@ -145,7 +144,7 @@ public class HWSupportItem extends ModifyDialogItem {
                                        gpuItem.setOnOffLabel();
 
                                        // reset GLVersion item
-                                       setValue(getItemListComp().getPropertyValue());
+                                       setValue();
                                        setEnableGLVersion();
                                }
                        }
@@ -173,17 +172,17 @@ public class HWSupportItem extends ModifyDialogItem {
 
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               isCpuOn = value.getCPUVirtualization();
-               isGpuOn = value.getGPUAcceleration();
+       public void setInitialValue() {
+               isCpuOn = propertyValue.getCPUVirtualization();
+               isGpuOn = propertyValue.getGPUAcceleration();
 
 
        }
 
        @Override
-       public void setValue(PropertyValue value) {
-               value.setCPUVirtualization(cpuItem.getOnOff());
-               value.setGPUAcceleration(gpuItem.getOnOff());
+       public void setValue() {
+               propertyValue.setCPUVirtualization(cpuItem.getOnOff());
+               propertyValue.setGPUAcceleration(gpuItem.getOnOff());
 
        }
 
index c8da796..4d3d884 100644 (file)
@@ -38,7 +38,6 @@ import org.tizen.emulator.manager.renewal.resources.ColorResources;
 import org.tizen.emulator.manager.tool.TapUtil;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ComboItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubItemTitle;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubModifyItem;
 import org.tizen.emulator.manager.ui.renewal.widgets.ComboBox;
@@ -132,7 +131,7 @@ public class NetConnectTypeItem extends ComboItem{
                }
 
                // for resetting
-               setValue(getItemListComp().getPropertyValue());
+               setValue();
 
                NetworkItem networkItem = (NetworkItem)getParentItem();
 
@@ -167,13 +166,13 @@ public class NetConnectTypeItem extends ComboItem{
 
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               connectType = value.getSubOptionValue(getName());
+       public void setInitialValue() {
+               connectType = propertyValue.getSubOptionValue(getName());
        }
 
        @Override
-       public void setValue(PropertyValue value) {
-               value.setSubOptionValue(getName(), connectType);
+       public void setValue() {
+               propertyValue.setSubOptionValue(getName(), connectType);
        }
 
 
index 54561e3..11199cc 100644 (file)
@@ -37,7 +37,6 @@ import org.tizen.emulator.manager.tool.TapUtil;
 import org.tizen.emulator.manager.ui.renewal.item.ItemName;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.TextInputBoxItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubItemTitle;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubModifyItem;
 
@@ -69,14 +68,14 @@ public class NetDnsItem extends TextInputBoxItem {
        }
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               super.value = value.getSubOptionValue(ItemName.NET_DNS);
+       public void setInitialValue() {
+               super.value = propertyValue.getSubOptionValue(ItemName.NET_DNS);
 
        }
 
        @Override
-       public void setValue(PropertyValue value) {
-               value.setSubOptionValue(ItemName.NET_DNS, super.value);
+       public void setValue() {
+               propertyValue.setSubOptionValue(ItemName.NET_DNS, super.value);
 
        }
 
@@ -106,7 +105,7 @@ public class NetDnsItem extends TextInputBoxItem {
        }
 
        public void resetItem() {
-               boolean useDHCP = getItemListComp().getPropertyValue().getCheckBoxValue(
+               boolean useDHCP = propertyValue.getCheckBoxValue(
                                ItemName.NET_IP_INFO, ItemName.NET_USE_DHCP);
                boolean isNAT = ((NetworkItem)getParentItem()).isNATType();
 
index 6615929..5f50634 100644 (file)
@@ -43,7 +43,6 @@ import org.tizen.emulator.manager.ui.renewal.item.ItemName;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.CheckBoxSubItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubItemTitle;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubModifyItem;
 import org.tizen.emulator.manager.ui.renewal.widgets.CheckBoxButton;
@@ -101,8 +100,8 @@ public class NetIPInfoItem extends ModifyDialogItem {
 
                for (NetIPSubItem ipSubItem : ipSubItems) {
                        ipSubItem.setParentItem(this);
-                       ipSubItem.setInitialValue(getItemListComp().getPropertyValue());
                        ipSubItem.setItemListComp(getItemListComp());
+                       ipSubItem.setInitialValue();
                        ipSubItem.create(item.getBody());
                }
 
@@ -136,7 +135,7 @@ public class NetIPInfoItem extends ModifyDialogItem {
 
 
        private void dhcpChanged() {
-               setValue(getItemListComp().getPropertyValue());
+               setValue();
 
                changeAddressItemState();
                changeDNSItemState();
@@ -161,16 +160,16 @@ public class NetIPInfoItem extends ModifyDialogItem {
        }
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               useDHCP = value.getCheckBoxValue(ItemName.NET_IP_INFO, ItemName.NET_USE_DHCP);
+       public void setInitialValue() {
+               useDHCP = propertyValue.getCheckBoxValue(ItemName.NET_IP_INFO, ItemName.NET_USE_DHCP);
 
        }
 
        @Override
-       public void setValue(PropertyValue value) {
-               value.setCheckBoxValue(ItemName.NET_IP_INFO, ItemName.NET_USE_DHCP, useDHCP);
+       public void setValue() {
+               propertyValue.setCheckBoxValue(ItemName.NET_IP_INFO, ItemName.NET_USE_DHCP, useDHCP);
                for (NetIPSubItem ipSubItem : ipSubItems) {
-                       ipSubItem.setValue(value);
+                       ipSubItem.setValue();
                }
        }
 
index 7780891..bcdc7b3 100644 (file)
@@ -39,7 +39,6 @@ import org.tizen.emulator.manager.tool.TapUtil;
 import org.tizen.emulator.manager.ui.renewal.item.ItemName;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.TextInputBoxItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubItemTitle;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubModifyItem;
 
@@ -68,12 +67,9 @@ public class NetIPSubItem extends TextInputBoxItem {
                if (isDetailMode()) {
                        return;
                }
-
                addFocusListener();
-
        }
 
-
        private void addFocusListener() {
                textInputBox.setFocusListener(new FocusListener() {
 
@@ -116,17 +112,14 @@ public class NetIPSubItem extends TextInputBoxItem {
                });
        }
 
-
-
        @Override
-       public void setInitialValue(PropertyValue value) {
-               this.value = value.getSubOptionValue(ItemName.NET_IP_INFO, getName());
+       public void setInitialValue() {
+               this.value = propertyValue.getSubOptionValue(ItemName.NET_IP_INFO, getName());
        }
 
        @Override
-       public void setValue(PropertyValue value) {
-               value.setSubOptionValue(ItemName.NET_IP_INFO, getName(), this.value);
-
+       public void setValue() {
+               propertyValue.setSubOptionValue(ItemName.NET_IP_INFO, getName(), this.value);
        }
 
        @Override
@@ -140,7 +133,6 @@ public class NetIPSubItem extends TextInputBoxItem {
                getItemListComp().checkValid();
        }
 
-
        @Override
        public boolean isValid() {
                boolean isValid = true;
@@ -155,7 +147,7 @@ public class NetIPSubItem extends TextInputBoxItem {
        }
 
        public void resetItem() {
-               boolean useDHCP = getItemListComp().getPropertyValue().getCheckBoxValue(
+               boolean useDHCP = propertyValue.getCheckBoxValue(
                                ItemName.NET_IP_INFO, ItemName.NET_USE_DHCP);
                boolean isNAT = ((NetworkItem)getParentItem().getParentItem()).isNATType();
 
index f0e63e7..3b932f6 100644 (file)
@@ -39,7 +39,6 @@ import org.tizen.emulator.manager.ui.detail.item.CommonItemListFactory;
 import org.tizen.emulator.manager.ui.renewal.item.ItemName;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.TextBoxItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubItemTitle;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubModifyItem;
 import org.tizen.emulator.manager.vms.EmulatorVMList;
@@ -85,13 +84,13 @@ public class NetMacItem extends TextBoxItem {
        }
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               this.value = value.getSubOptionValue(ItemName.NET_MAC);
+       public void setInitialValue() {
+               this.value = propertyValue.getSubOptionValue(ItemName.NET_MAC);
        }
 
        @Override
-       public void setValue(PropertyValue value) {
-               value.setSubOptionValue(ItemName.NET_MAC, this.value);
+       public void setValue() {
+               propertyValue.setSubOptionValue(ItemName.NET_MAC, this.value);
 
        }
 
@@ -100,7 +99,6 @@ public class NetMacItem extends TextBoxItem {
                return new NetMacItem(getTitle());
        }
 
-
        public void resetItem() {
                boolean isBridge = !((NetworkItem)getParentItem()).isNATType();
 
index 3d2786b..acefe29 100644 (file)
@@ -48,7 +48,6 @@ import org.tizen.emulator.manager.ui.dialog.ProxyDialog;
 import org.tizen.emulator.manager.ui.renewal.item.ItemName;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ComboItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubItemTitle;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubModifyItem;
 import org.tizen.emulator.manager.ui.renewal.widgets.ComboBox;
@@ -257,29 +256,27 @@ public class NetProxyItem extends ComboItem{
                comboSelected();
        }
 
-
        @Override
-       public void setInitialValue(PropertyValue value) {
-               proxyMode = value.getSubOptionValue(ItemName.NET_PROXY, ITEM_PROXY_MODE);
+       public void setInitialValue() {
+               proxyMode = propertyValue.getSubOptionValue(ItemName.NET_PROXY, ITEM_PROXY_MODE);
                if (proxyMode.isEmpty()) {
                        proxyMode = MODE_AUTO;
                }
                if (proxyMode.equals(MODE_MANUAL)) {
-                       httpProxy = value.getSubOptionValue(ItemName.NET_PROXY, ITEM_HTTP_PROXY);
-                       httpsProxy = value.getSubOptionValue(ItemName.NET_PROXY, ITEM_HTTPS_PROXY);
-                       ftpProxy = value.getSubOptionValue(ItemName.NET_PROXY, ITEM_FTP_PROXY);
-                       socksProxy = value.getSubOptionValue(ItemName.NET_PROXY,ITEM_SOCKS_PROXY);
+                       httpProxy = propertyValue.getSubOptionValue(ItemName.NET_PROXY, ITEM_HTTP_PROXY);
+                       httpsProxy = propertyValue.getSubOptionValue(ItemName.NET_PROXY, ITEM_HTTPS_PROXY);
+                       ftpProxy = propertyValue.getSubOptionValue(ItemName.NET_PROXY, ITEM_FTP_PROXY);
+                       socksProxy = propertyValue.getSubOptionValue(ItemName.NET_PROXY,ITEM_SOCKS_PROXY);
                }
        }
 
        @Override
-       public void setValue(PropertyValue value) {
-               value.setSubOptionValue(ItemName.NET_PROXY, ITEM_PROXY_MODE, proxyMode);
-               value.setSubOptionValue(ItemName.NET_PROXY, ITEM_HTTP_PROXY, httpProxy);
-               value.setSubOptionValue(ItemName.NET_PROXY, ITEM_HTTPS_PROXY, httpsProxy);
-               value.setSubOptionValue(ItemName.NET_PROXY, ITEM_FTP_PROXY, ftpProxy);
-               value.setSubOptionValue(ItemName.NET_PROXY, ITEM_SOCKS_PROXY, socksProxy);
-
+       public void setValue() {
+               propertyValue.setSubOptionValue(ItemName.NET_PROXY, ITEM_PROXY_MODE, proxyMode);
+               propertyValue.setSubOptionValue(ItemName.NET_PROXY, ITEM_HTTP_PROXY, httpProxy);
+               propertyValue.setSubOptionValue(ItemName.NET_PROXY, ITEM_HTTPS_PROXY, httpsProxy);
+               propertyValue.setSubOptionValue(ItemName.NET_PROXY, ITEM_FTP_PROXY, ftpProxy);
+               propertyValue.setSubOptionValue(ItemName.NET_PROXY, ITEM_SOCKS_PROXY, socksProxy);
        }
 
        @Override
@@ -333,4 +330,10 @@ public class NetProxyItem extends ComboItem{
                return httpProxy + "," + httpsProxy + "," //$NON-NLS-1$ //$NON-NLS-2$
                                + ftpProxy + "," + socksProxy; //$NON-NLS-1$
        }
+
+
+       @Override
+       public void changeItem(ModifyDialogItem srcDialogItem) {
+               selectItem(false);
+       }
 }
index 9b1c2e9..4ea273a 100644 (file)
@@ -42,7 +42,6 @@ import org.tizen.emulator.manager.ui.dialog.TapDeviceDialogForMac;
 import org.tizen.emulator.manager.ui.renewal.item.ItemName;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ComboItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubItemTitle;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubModifyItem;
 import org.tizen.emulator.manager.ui.renewal.widgets.ComboBox;
@@ -183,14 +182,14 @@ public class NetTapDeviceItem extends ComboItem{
        }
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               interfaceName = value.getSubOptionValue(ItemName.NET_TAP_DEVICE);
+       public void setInitialValue() {
+               interfaceName = propertyValue.getSubOptionValue(ItemName.NET_TAP_DEVICE);
 
        }
 
        @Override
-       public void setValue(PropertyValue value) {
-               value.setSubOptionValue(ItemName.NET_TAP_DEVICE, interfaceName);
+       public void setValue() {
+               propertyValue.setSubOptionValue(ItemName.NET_TAP_DEVICE, interfaceName);
 
        }
 
index 92f595d..ae0b757 100644 (file)
@@ -41,7 +41,6 @@ import org.tizen.emulator.manager.tool.TapUtil;
 import org.tizen.emulator.manager.ui.renewal.dialog.TapDeviceDialogForWin;
 import org.tizen.emulator.manager.ui.renewal.item.ItemName;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubModifyItem;
 import org.tizen.emulator.manager.ui.renewal.widgets.ImageButton;
 import org.tizen.emulator.manager.ui.renewal.widgets.WSTATE;
@@ -98,9 +97,9 @@ public class NetTapDeviceItemForWin extends NetTapDeviceItem {
        }
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               interfaceName = value.getSubOptionValue(ItemName.NET_TAP_DEVICE);
-               platformVersion = value.getPlatformVersion();
+       public void setInitialValue() {
+               interfaceName = propertyValue.getSubOptionValue(ItemName.NET_TAP_DEVICE);
+               platformVersion = propertyValue.getPlatformVersion();
        }
 
        @Override
index dedeaad..b403a4c 100644 (file)
@@ -77,7 +77,7 @@ public class NetworkItem extends CategoryItem {
 
 
        public boolean isNATType() {
-               String connectType = getItemListComp().getPropertyValue().
+               String connectType = propertyValue.
                                getSubOptionValue(ItemName.NET_CONNECT_TYPE);
                if (connectType.equals(NetConnectTypeItem.TYPE_NAT)) {
                        return true;
index 126b862..67b6c5f 100644 (file)
@@ -43,7 +43,6 @@ import org.tizen.emulator.manager.ui.renewal.item.ItemName;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ComboItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.ModifyItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.widgets.ComboBox;
 import org.tizen.emulator.manager.vms.OCI;
 import org.tizen.emulator.manager.vms.OCIList;
@@ -135,7 +134,7 @@ public class OCIDeviceItem extends ComboItem {
        }
 
        @Override
-       public void setInitialValue(PropertyValue value) {
+       public void setInitialValue() {
                if (!EmulatorManager.isMac()) {
                        try {
                                scanOCIDevice();
@@ -150,9 +149,9 @@ public class OCIDeviceItem extends ComboItem {
                                                + StringResources.NEW_LINE + "Error: " + e.getMessage()); //$NON-NLS-1$
                        }
                }
-               newOCIDevice = value.getOCIDevice();
+               newOCIDevice = propertyValue.getOCIDevice();
 
-               String ociValue = value.getOCIOption();
+               String ociValue = propertyValue.getOCIOption();
 
                String device = null;
                if (ociValue != null && !ociValue.equals(VALUE_NONE) && !ociValue.equals(" ")) { //$NON-NLS-1$
@@ -170,9 +169,9 @@ public class OCIDeviceItem extends ComboItem {
        }
 
        @Override
-       public void setValue(PropertyValue value) {
-               value.setOCIDevice(newOCIDevice);
-               value.setOCIOption(ociOption);
+       public void setValue() {
+               propertyValue.setOCIDevice(newOCIDevice);
+               propertyValue.setOCIOption(ociOption);
        }
 
        @Override
index bdf28ae..ad74f77 100644 (file)
@@ -38,7 +38,6 @@ import org.tizen.emulator.manager.renewal.resources.ColorResources;
 import org.tizen.emulator.manager.ui.renewal.item.ItemName;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ComboItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubItemTitle;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubModifyItem;
 import org.tizen.emulator.manager.ui.renewal.widgets.ComboBox;
@@ -68,7 +67,7 @@ public class TunerCountryItem extends ComboItem {
 
        private void createDetailItem() {
                createDetailItem(tunerCountry);
-               String tunerSystem = getItemListComp().getPropertyValue().getSubOptionValue(
+               String tunerSystem = propertyValue.getSubOptionValue(
                                ItemName.TUNER, ItemName.TUNER_SYSTEM);
 
                setTitleEnable(SYSTEM_ATSC.equals(tunerSystem));
@@ -85,7 +84,7 @@ public class TunerCountryItem extends ComboItem {
 
                // init combo list
                initComboList();
-               resetCombo(getItemListComp().getPropertyValue().getSubOptionValue(
+               resetCombo(propertyValue.getSubOptionValue(
                                ItemName.TUNER, ItemName.TUNER_SYSTEM));
        }
 
@@ -155,13 +154,13 @@ public class TunerCountryItem extends ComboItem {
 
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               tunerCountry = value.getSubOptionValue(ItemName.TUNER, getName());
+       public void setInitialValue() {
+               tunerCountry = propertyValue.getSubOptionValue(ItemName.TUNER, getName());
        }
 
        @Override
-       public void setValue(PropertyValue value) {
-               value.setSubOptionValue(ItemName.TUNER, getName(), tunerCountry);
+       public void setValue() {
+               propertyValue.setSubOptionValue(ItemName.TUNER, getName(), tunerCountry);
        }
 
 
index 8ce35bf..3752738 100644 (file)
@@ -39,7 +39,6 @@ import org.tizen.emulator.manager.renewal.resources.ColorResources;
 import org.tizen.emulator.manager.ui.renewal.item.ItemName;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ComboItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubItemTitle;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubModifyItem;
 import org.tizen.emulator.manager.ui.renewal.widgets.ComboBox;
@@ -123,13 +122,13 @@ public class TunerSystemItem extends ComboItem {
        }
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               tunerSystem = value.getSubOptionValue(ItemName.TUNER, getName());
+       public void setInitialValue() {
+               tunerSystem = propertyValue.getSubOptionValue(ItemName.TUNER, getName());
        }
 
        @Override
-       public void setValue(PropertyValue value) {
-               value.setSubOptionValue(ItemName.TUNER, getName(), tunerSystem);
+       public void setValue() {
+               propertyValue.setSubOptionValue(ItemName.TUNER, getName(), tunerSystem);
        }
 
        @Override
index 155c8d0..4e5795e 100644 (file)
@@ -41,7 +41,6 @@ import org.tizen.emulator.manager.ui.renewal.MainDialog;
 import org.tizen.emulator.manager.ui.renewal.item.ItemName;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.FileDialogItem;
 import org.tizen.emulator.manager.ui.renewal.item.modify.common.ModifyDialogItem;
-import org.tizen.emulator.manager.ui.renewal.item.modify.comp.PropertyValue;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubItemTitle;
 import org.tizen.emulator.manager.ui.renewal.item.modify.comp.SubModifyItem;
 
@@ -97,9 +96,9 @@ public class TunerTableItem extends FileDialogItem {
        }
 
        @Override
-       public void setInitialValue(PropertyValue value) {
-               newTableFileName = value.getSubOptionValue(ItemName.TUNER, ItemName.TUNER_FILE_NAME);
-               newTableFilePath = value.getSubOptionValue(ItemName.TUNER, ItemName.TUNER_FILE_PATH);
+       public void setInitialValue() {
+               newTableFileName = propertyValue.getSubOptionValue(ItemName.TUNER, ItemName.TUNER_FILE_NAME);
+               newTableFilePath = propertyValue.getSubOptionValue(ItemName.TUNER, ItemName.TUNER_FILE_PATH);
 
                if (newTableFileName.isEmpty()) {
                        newTableFileName = TABLE_DEFAULT;
@@ -108,9 +107,9 @@ public class TunerTableItem extends FileDialogItem {
        }
 
        @Override
-       public void setValue(PropertyValue value) {
-               value.setSubOptionValue(ItemName.TUNER, ItemName.TUNER_FILE_NAME, newTableFileName);
-               value.setSubOptionValue(ItemName.TUNER, ItemName.TUNER_FILE_PATH, newTableFilePath);
+       public void setValue() {
+               propertyValue.setSubOptionValue(ItemName.TUNER, ItemName.TUNER_FILE_NAME, newTableFileName);
+               propertyValue.setSubOptionValue(ItemName.TUNER, ItemName.TUNER_FILE_PATH, newTableFilePath);
 
        }
 
index 3af7963..12415f3 100644 (file)
@@ -249,7 +249,7 @@ public class CreateVMTableViewer extends AbstractTableViewer {
 
                // change advanced item-list
                settingVMPropertyValue();
-               PropertyValue value = new PropertyValue(newValue.clone());
+               PropertyValue value = new PropertyValue(newValue);
                advancedViewer.changeItemList(baseImage, value);
 
                if (needRedrawingTable) {
@@ -385,7 +385,7 @@ public class CreateVMTableViewer extends AbstractTableViewer {
                newValue.setDeviceTemplate(template);
 
                // set advanced option value
-               advancedViewer.saveDataInto(newValue);
+               advancedViewer.saveDataInto();
 
                // TODO
                if (newValue.skin == null) {