From: jihye424.kim Date: Sat, 13 Feb 2016 02:32:22 +0000 (+0900) Subject: vm list table: change to 'Platform' class from 'BaseImage' X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3960abbe75ba4ce7c248d8b3a019790c1893b1cf;p=sdk%2Femulator%2Femulator-manager.git vm list table: change to 'Platform' class from 'BaseImage' Change-Id: I3f85024a1c4779e3fb8cd5ea114d5a932f7d22e4 Signed-off-by: jihye424.kim --- 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 298431b..12a4a1f 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/DeviceTemplateTableViewer.java +++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/DeviceTemplateTableViewer.java @@ -54,6 +54,7 @@ import org.tizen.emulator.manager.devices.DeviceTemplateType; import org.tizen.emulator.manager.devices.DeviceTemplateValue; import org.tizen.emulator.manager.devices.DeviceWorkerException; import org.tizen.emulator.manager.logging.EMLogger; +import org.tizen.emulator.manager.platform.Platform; import org.tizen.emulator.manager.platform.backup.Profile; import org.tizen.emulator.manager.platform.backup.ProfileList; import org.tizen.emulator.manager.renewal.resources.ColorKind; @@ -175,10 +176,10 @@ public class DeviceTemplateTableViewer extends AbstractTableViewer { profileButtonList.add(ProfileButtonMaker.getProfileButton("tv", comp)); profileButtonList.add(ProfileButtonMaker.getProfileButton("wearable", comp)); - for (Profile profile : ProfileList.getProfileList()) { - for (ProfileButton pButton : profileButtonList) { - if (pButton.getProfileName().equals(profile.getName())) { - pButton.setProfile(profile); + for (ProfileButton pButton : profileButtonList) { + for (Platform platform : Platform.getPlatformList()) { + if (pButton.getProfileName().equals(platform.getProfile().getName())) { + //pButton.setProfile(platform.getProfile()); pButton.getButton().setEnabled(true); pButton.getButton().addSelectionListener(profileButtonSelectionListener); break; diff --git a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/MenuHandling.java b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/MenuHandling.java index 959fbee..24d472d 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/MenuHandling.java +++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/MenuHandling.java @@ -312,10 +312,10 @@ public class MenuHandling { return true; } - public static boolean createBaseImage(VMProperty property) throws VMWorkerException { + public static boolean createPlatformImage(VMProperty property) throws VMWorkerException { VMPropertyValue value = property.getPropertyValue(); FileDialog fd = new FileDialog(shell, SWT.SAVE); - fd.setText("Export 'Base Image' as"); + fd.setText("Export 'Platform Image' as"); String[] filter = {"*."+ value.getImageArch().toString()}; String[] filterName = {"Image Files(*." + value.getImageArch().toString() + ")"}; fd.setFilterExtensions(filter); diff --git a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/PlatformImageTableViewer.java b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/PlatformImageTableViewer.java index 73f47a5..2f0caa1 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/PlatformImageTableViewer.java +++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/PlatformImageTableViewer.java @@ -515,12 +515,9 @@ public class PlatformImageTableViewer extends AbstractTableViewer { profileButtonList.add(ProfileButtonMaker.getProfileButton("tv", comp)); profileButtonList.add(ProfileButtonMaker.getProfileButton("wearable", comp)); - for (Platform platform : Platform.getPlatformList()) { - for (ProfileButton pButton : profileButtonList) { + for (ProfileButton pButton : profileButtonList) { + for (Platform platform : Platform.getPlatformList()) { if (pButton.getProfileName().equals(platform.getProfile().getName())) { - if (pButton.getButton().isEnabled()) { - break; - } //pButton.setProfile(platform.getProfile()); pButton.getButton().setEnabled(true); pButton.getButton().addSelectionListener(profileButtonSelectionListener); diff --git a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTable.java b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTable.java index 7fb7ac8..c402388 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTable.java +++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTable.java @@ -48,7 +48,7 @@ import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.MenuItem; import org.tizen.emulator.manager.EmulatorManager; import org.tizen.emulator.manager.devices.DeviceTemplateValue; -import org.tizen.emulator.manager.platform.backup.Profile; +import org.tizen.emulator.manager.platform.Platform; import org.tizen.emulator.manager.renewal.resources.ColorKind; import org.tizen.emulator.manager.renewal.resources.Colors; import org.tizen.emulator.manager.renewal.resources.ImageKind; @@ -60,7 +60,6 @@ import org.tizen.emulator.manager.ui.table.TableColumn; import org.tizen.emulator.manager.ui.table.TableItem; import org.tizen.emulator.manager.ui.widgets.ImageButton; import org.tizen.emulator.manager.vms.ListChangeListener; -import org.tizen.emulator.manager.vms.SKIN_SHAPE; import org.tizen.emulator.manager.vms.StateChangeListener; import org.tizen.emulator.manager.vms.VMKeeper; import org.tizen.emulator.manager.vms.VMProperty; @@ -156,7 +155,7 @@ public class VMListTable { }); } - private final String[] titles = {"", "Type", "Name", "Device", "Platform Image", "Resolution", "File Sharing"}; + private final String[] titles = {"", "Type", "Name", "Device", "Platform", "Resolution", "File Sharing"}; private void makeTable() { table = new Table(viewer.getTableComp(), SWT.MULTI | SWT.CHECK | SWT.BORDER); @@ -223,7 +222,7 @@ public class VMListTable { item = new TableItem(table, SWT.NULL); } - setTableItemProperty(pButton, item, property); + setTableItemProperty(item, property); // select added table item pack(index); @@ -271,10 +270,6 @@ public class VMListTable { } private void setTableItemProperty(TableItem item, VMProperty property) { - setTableItemProperty(null, item, property); - } - - private void setTableItemProperty(ProfileButton pButton, TableItem item, VMProperty property) { VMPropertyValue value = property.getPropertyValue(); if (property.isRunning()) { item.setImage(0, Images.get(ImageKind.ICON_RUNNING)); @@ -282,20 +277,10 @@ public class VMListTable { item.setImage(0, Images.get(ImageKind.ICON_NOT_RUNNING)); } - if (pButton != null) { - if(value.isStandardImage()) { - item.setImage(1, pButton.getIcon()); - } else { - item.setImage(1, pButton.getCustomIcon()); - } + PlatformDisplayData data = PlatformDisplayData.getData(value.getPlatform()); + item.setImage(1, data.getIcon()); + item.setSelectedImage(1, data.getSelectedIcon()); - item.setSelectedImage(1, pButton.getSelectedIcon()); - if (pButton.getProfileName().equals("wearable")) { - if (value.getBaseImage().getSkinShape().equals(SKIN_SHAPE.CIRCLE)) { - item.setSelectedImage(1, Images.get(ImageKind.ICON_SELECTED_WEARABLE_ROUND)); - } - } - } item.setText(2, value.vmsName); @@ -303,7 +288,7 @@ public class VMListTable { settingDeviceTemplate(item, value); // item 4 is base image - settingBaseImage(item, value); + settingPlatform(item, value); item.setText(4, value.getImageName()); item.setText(5, value.resolution.getStrTypeValue()); @@ -363,9 +348,7 @@ public class VMListTable { } else { // normal status DeviceTemplateValue deviceValue = value.device.getValue(); - deviceTip = "Device: " + deviceValue.getName() - + StringResources.NEW_LINE - + "Type: " + deviceValue.getType() + deviceTip = "Type: " + deviceValue.getType() + StringResources.NEW_LINE + "Version: " + deviceValue.getVersion() + (deviceValue.getManufacturer() != null @@ -389,8 +372,8 @@ public class VMListTable { item.setToolTipText(3, deviceTip); } - private void settingBaseImage(TableItem item, VMPropertyValue value) { - String imageTip = ""; + private void settingPlatform(TableItem item, VMPropertyValue value) { + String platformTip = ""; if (value.template.getHealth() == Health.NOT_AVAILABLE) { if (backupTableItemForeground == null) { backupTableItemForeground = item.getForeground(); @@ -402,31 +385,29 @@ public class VMListTable { item.setForeground(Colors.get(ColorKind.ERROR_TABLE_ITEM_FONT)); item.setSelectedForeground(Colors.get(ColorKind.ERROR_SELECTED_TABLE_ITEM_FONT)); item.setImage(4, Images.get(ImageKind.ICON_STATE_ERROR)); - imageTip = ""; - if (!value.getBaseImage().isFilePathExist()) { - imageTip = "Platform image had been deleted"; + platformTip = ""; + if (!value.getPlatform().isImageExist()) { + platformTip = "Platform image had been deleted"; } else { - imageTip = "Child image had been deleted"; + platformTip = "Child image had been deleted"; } - imageTip += StringResources.NEW_LINE + platformTip += StringResources.NEW_LINE + "Need to delete this emulator because of this emulator can not launched"; } else { item.setForeground(backupTableItemForeground); item.setSelectedForeground(backupTableItemSelectedForeground); item.setImage(4, null); // normal status - imageTip = "Platform: " + value.getPlatformName() + platformTip = "Type: " + + PlatformDisplayData.getData(value.getPlatform()).getType() + StringResources.NEW_LINE - + "Type: " - + (value.isStandardImage() - ? "standard" - : "custom") + + "CPU: " + value.getImageArch() + StringResources.NEW_LINE - + "CPU: " + value.getImageArch(); + + "Binary Version: " + value.getImageBinaryVersion(); } - item.setText(4, value.getImageName()); - item.setToolTipText(4, imageTip); + item.setText(4, value.getPlatformName()); + item.setToolTipText(4, platformTip); } private void settingToolTip(TableItem item, VMProperty property) { @@ -435,9 +416,7 @@ public class VMListTable { // 1 - type, 2 - name String baseTip; try { - baseTip = "Platform: " + value.getPlatformName() - + StringResources.NEW_LINE - + "Last modified: " + baseTip = "Last modified: " + format.format(Files.getLastModifiedTime(property.getPropertyFile()).toMillis()) + StringResources.NEW_LINE + "Last launched: " @@ -568,9 +547,9 @@ public class VMListTable { int dir = table.getSortDirection(); IntegerTypeItemPair[] pairs = new IntegerTypeItemPair[table.getItemCount()]; for (int i = 0; i < table.getItemCount(); i++) { - Profile profile = ((VMProperty)table.getItem(i).getData()) - .getPropertyValue().getBaseImage().getPlatform().getProfileClass(); - pairs[i] = new IntegerTypeItemPair(table.getItem(i), 1, dir, profile.getPriority()); + Platform platform = (Platform)table.getItem(i).getData(); + int priority = PlatformDisplayData.getData(platform).getPriority(); + pairs[i] = new IntegerTypeItemPair(table.getItem(i), 1, dir, priority); } column.setTableItemPairs(pairs); // sort table item diff --git a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTableViewer.java b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTableViewer.java index 08ffe90..9af5715 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTableViewer.java +++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/VMListTableViewer.java @@ -44,8 +44,7 @@ import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; import org.tizen.emulator.manager.EmulatorManager; import org.tizen.emulator.manager.logging.EMLogger; -import org.tizen.emulator.manager.platform.backup.Profile; -import org.tizen.emulator.manager.platform.backup.ProfileList; +import org.tizen.emulator.manager.platform.Platform; import org.tizen.emulator.manager.renewal.resources.ImageKind; import org.tizen.emulator.manager.renewal.resources.Images; import org.tizen.emulator.manager.resources.StringResources; @@ -263,10 +262,10 @@ public class VMListTableViewer extends AbstractTableViewer { profileButtonList.add(ProfileButtonMaker.getProfileButton("tv", comp)); profileButtonList.add(ProfileButtonMaker.getProfileButton("wearable", comp)); - for (Profile profile : ProfileList.getProfileList()) { - for (ProfileButton pButton : profileButtonList) { - if (pButton.getProfileName().equals(profile.getName())) { - pButton.setProfile(profile); + for (ProfileButton pButton : profileButtonList) { + for (Platform platform : Platform.getPlatformList()) { + if (pButton.getProfileName().equals(platform.getProfile().getName())) { + //pButton.setProfile(platform.getProfile()); pButton.getButton().setEnabled(true); pButton.getButton().addSelectionListener(profileButtonSelectionListener); break; @@ -422,7 +421,7 @@ public class VMListTableViewer extends AbstractTableViewer { VMProperty property = properties[0]; try { - MenuHandling.createBaseImage(property); + MenuHandling.createPlatformImage(property); } catch (VMWorkerException e) { MessageBox.openMessageBox("Failed to create new custom base image." + StringResources.NEW_LINE