From 6626c66fe3997c501c1131147e76a796025c27c1 Mon Sep 17 00:00:00 2001 From: "jihye424.kim" Date: Fri, 8 Jan 2016 19:15:33 +0900 Subject: [PATCH] create viewer: set default skin when selected base image - bug: if skin is not null, does not set default skin -- base image is chanaged to 2.3 base image from 2.4 base image -- skin is 2.4 skin (not changed to 2.3 skin) - fix: set default skin when selected base image Change-Id: Ieaf5eddf18bf392ab11541e26a2bc2eb939c3be3 Signed-off-by: jihye424.kim --- .../manager/devices/DeviceTemplateValue.java | 10 +-- .../item/modify/comp/AdvancedPropertyViewer.java | 12 +++- .../renewal/item/modify/vm/AdvancedSkinItem.java | 11 +++ .../ui/renewal/tableviewer/CreateVMTable.java | 14 ++-- .../renewal/tableviewer/CreateVMTableViewer.java | 80 +++++++++------------- .../renewal/tableviewer/CreateVMTopComposite.java | 2 - .../tableviewer/DeviceTemplateTableViewer.java | 2 +- 7 files changed, 69 insertions(+), 62 deletions(-) diff --git a/src/org/tizen/emulator/manager/devices/DeviceTemplateValue.java b/src/org/tizen/emulator/manager/devices/DeviceTemplateValue.java index 0d5540a..f583134 100644 --- a/src/org/tizen/emulator/manager/devices/DeviceTemplateValue.java +++ b/src/org/tizen/emulator/manager/devices/DeviceTemplateValue.java @@ -64,7 +64,8 @@ public class DeviceTemplateValue implements Cloneable { private String skinPath = ""; private SKIN_SHAPE skinShape = SKIN_SHAPE.SQUARE; private Skin skin; - private boolean settingSkinByManager = false; + // for create emulator + private Skin vmSkin; private String ramSizeUnit = "MB"; private int ramSize = 512; @@ -288,12 +289,11 @@ public class DeviceTemplateValue implements Cloneable { public void setSkinByManager(Skin skin) { // if manager set skin value, this skin will be not saved to configuration file // this value will be only used while running emulator manager. - settingSkinByManager = true; - this.skin = skin; + this.vmSkin = skin; } - public boolean isSettingSkinByManager() { - return settingSkinByManager; + public Skin getSkinByManager() { + return vmSkin; } public int getRamSize() { diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/AdvancedPropertyViewer.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/AdvancedPropertyViewer.java index 3e2fca3..f12d317 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/AdvancedPropertyViewer.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/comp/AdvancedPropertyViewer.java @@ -66,6 +66,7 @@ public class AdvancedPropertyViewer { private final Composite parentComp; private ItemListComp itemListComp; private String currentProfile; + private boolean isAdvancedOptionValid = true; private static Map> profileItemsMap; @@ -225,8 +226,7 @@ public class AdvancedPropertyViewer { @Override public void setValid(boolean isValid) { - // TODO button enable/disable - parentViewer.setAdvancedOptionValid(isValid); + setAdvancedOptionValid(isValid); parentViewer.checkValid(); } }; @@ -258,4 +258,12 @@ public class AdvancedPropertyViewer { } return null; } + + public void setAdvancedOptionValid(boolean isValid) { + isAdvancedOptionValid = isValid; + } + + public boolean isAdvancedOptionValid() { + return isAdvancedOptionValid; + } } diff --git a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/AdvancedSkinItem.java b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/AdvancedSkinItem.java index b93b9e9..a41180d 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/AdvancedSkinItem.java +++ b/src/org/tizen/emulator/manager/ui/renewal/item/modify/vm/AdvancedSkinItem.java @@ -188,6 +188,17 @@ public class AdvancedSkinItem extends ComboItem { return skin; } + public void addSkin(Skin skin) { + if (skin == null) { + return; + } + if (skinList == null) { + return; + } + + skinList.add(skin); + } + public boolean isModified() { return isModified; } diff --git a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTable.java b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTable.java index 23a2522..143a735 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTable.java +++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTable.java @@ -178,7 +178,10 @@ public class CreateVMTable { } DeviceTemplateValue value = template.getValue(); - //TODO: set default skin + // set default skin + // changed base image -> reset default skin + // template skin exist -> set default skin to template skin + // template skin not exist -> set default skin to image's skin Skin skin = value.getSkin(); if (skin == null) { List skins = image.getPlatform().findSkinList(value.getResolution(), value.getSkinShape()); @@ -186,6 +189,8 @@ public class CreateVMTable { skin = skins.get(0); value.setSkinByManager(skin); } + } else { + value.setSkinByManager(skin); } setItemProperty(item, template); @@ -201,7 +206,8 @@ public class CreateVMTable { public void setItemProperty(TableItem item, DeviceTemplate template) { DeviceTemplateValue value = template.getValue(); - Skin skin = value.getSkin(); + Skin skin = value.getSkinByManager(); + // set table item property item.setText(0, value.getName()); item.setText(1, value.getResolution().toString()); @@ -235,10 +241,10 @@ public class CreateVMTable { item.setToolTipText(2, displayInfo); } - if (value.getSkin() != null) { + if (skin != null) { item.setToolTipText(3, "Skin path" + StringResources.NEW_LINE - + value.getSkin().getPath()); + + skin.getPath()); } } diff --git a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTableViewer.java b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTableViewer.java index 20603c1..7e19ad9 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTableViewer.java +++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTableViewer.java @@ -30,8 +30,6 @@ package org.tizen.emulator.manager.ui.renewal.tableviewer; -import java.util.List; - import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; import org.eclipse.swt.graphics.Image; @@ -76,7 +74,7 @@ public class CreateVMTableViewer extends AbstractTableViewer { private CreateVMTopComposite topComp; private SashForm form; private CreateVMTable table; - private Composite advanceComp; + private Composite advancedComp; private AdvancedPropertyViewer advancedViewer; private Profile profile; @@ -95,20 +93,10 @@ public class CreateVMTableViewer extends AbstractTableViewer { private DeviceTemplate template; private VMPropertyValue newValue; - private boolean isAdvancedOptionValid = true; - public CreateVMTableViewer(Shell shell, String key) { super(shell, key); } - public void setAdvancedOptionValid(boolean isValid) { - isAdvancedOptionValid = isValid; - } - - public boolean isAdvancedOptionValid() { - return isAdvancedOptionValid; - } - @Override void setTitleImage() { setTtileBackgroundImage(ImageResources.CREATE_VIEW_TITLE_IMAGE.getImage()); @@ -146,21 +134,18 @@ public class CreateVMTableViewer extends AbstractTableViewer { form = new SashForm(comp, SWT.NONE); form.SASH_WIDTH = 0; - //form.setBackground(ColorResources.BLUE.getColor()); table = new CreateVMTable(this); table.makeTable(form); - // make advanced comp - advanceComp = new Composite(form, SWT.NONE); - advancedViewer = new AdvancedPropertyViewer(advanceComp, this); + // make advanced composite + advancedComp = new Composite(form, SWT.NONE); + advancedViewer = new AdvancedPropertyViewer(advancedComp, this); advancedViewer.create(); setLayout(); } - - @Override void showTableComposite() { if (getData() != null && getData() instanceof Profile) { @@ -173,26 +158,26 @@ public class CreateVMTableViewer extends AbstractTableViewer { profileLabel.setText(profile == null ? "" : (profile.getName().toUpperCase() + " ") - + "Devices"); + + "Templates"); // reset value resetVMProperties(); topComp.showComposite(); // select base image -> drawing table - table.showTable(); + if (baseImage == null) { + table.showTable(); + } } @Override void pauseTableComposite() { // TODO Auto-generated method stub - } @Override void destroyTableComposiste() { // TODO Auto-generated method stub - } private void resetVMProperties() { @@ -262,22 +247,23 @@ public class CreateVMTableViewer extends AbstractTableViewer { return template; } - public void setTemplate(DeviceTemplate template) { this.template = template; - if (this.template != null) { - if (newValue == null) { - settingVMPropertyValue(); - } - - // check camera - resetCameraOption(); + if (this.template == null) { + checkValid(); + return; + } - // check skin list - resetSkinList(); + if (newValue == null) { + settingVMPropertyValue(); } - checkValid(); + + // check skin list + resetSkinList(); + + // check camera + resetCameraOption(); } private void resetSkinList() { @@ -286,8 +272,12 @@ public class CreateVMTableViewer extends AbstractTableViewer { return; } + if (template.getValue().getSkin() != null) { + skinItem.addSkin(template.getValue().getSkin()); + } + skinItem.settingSkinList(template.getValue().getResolution(), - template.getValue().getSkin()); + template.getValue().getSkinByManager()); } private void checkSkin() { @@ -300,12 +290,15 @@ public class CreateVMTableViewer extends AbstractTableViewer { return; } - Skin tSkin = template.getValue().getSkin(); + skinItem.setModified(false); + + Skin tSkin = template.getValue().getSkinByManager(); Skin aSkin = skinItem.getSkin(); if (tSkin != null && aSkin != null && !tSkin.equals(aSkin)) { // change skin template.getValue().setSkinByManager(aSkin); + // redraw table item table.setItemProperty(template); } } @@ -335,7 +328,7 @@ public class CreateVMTableViewer extends AbstractTableViewer { } public Composite getAdvanceComposite() { - return advanceComp; + return advancedComp; } private void makeTopComposite() { @@ -382,7 +375,7 @@ public class CreateVMTableViewer extends AbstractTableViewer { checkSkin(); } - if (!isAdvancedOptionValid) { + if (!advancedViewer.isAdvancedOptionValid()) { confirmBtn.setEnabled(false); } } @@ -404,15 +397,6 @@ public class CreateVMTableViewer extends AbstractTableViewer { // set advanced option value advancedViewer.saveDataInto(); - // TODO - if (newValue.skin == null) { - List skins = baseImage.getPlatform().findSkinList(newValue.resolution, baseImage.getSkinShape()); - if (!skins.isEmpty()) { - newValue.skin = skins.get(0); - newValue.skinPath = newValue.skin.getPath(); - } - } - VMProperty prop = null; try { prop = Creator.create(newValue); @@ -424,9 +408,9 @@ public class CreateVMTableViewer extends AbstractTableViewer { + StringResources.NEW_LINE + e.getMessage(); EMLogger.getLogger().warning(msg); - // TODO } + // change to vm list viewer MainDialog mainDialog = EmulatorManager.getNewMainDialog(); AbstractTableViewer viewer = mainDialog.findViewer(MainDialog.VM_LIST); if (viewer != null) { diff --git a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTopComposite.java b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTopComposite.java index 0ad973d..dc97162 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTopComposite.java +++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/CreateVMTopComposite.java @@ -153,8 +153,6 @@ public class CreateVMTopComposite extends Composite { // setting default emulator name vmNameText.setText(getDefaultName()); - - } public void setProfile(Profile profile) { diff --git a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/DeviceTemplateTableViewer.java b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/DeviceTemplateTableViewer.java index 6455607..e91c90c 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/DeviceTemplateTableViewer.java +++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/DeviceTemplateTableViewer.java @@ -403,7 +403,7 @@ public class DeviceTemplateTableViewer extends AbstractTableViewer { DeviceTemplateValue value = template.getValue(); if (value.getSkinPath() != null && !value.getSkinPath().isEmpty()) { - if (value.getSkin() == null || value.isSettingSkinByManager()) { + if (value.getSkin() == null) { if (backupTableItemForeground == null) { backupTableItemForeground = item.getForeground(); } -- 2.7.4