From dc50a031a785b1a9384d47d4e8ad2e6cda630beb Mon Sep 17 00:00:00 2001 From: jihye kim Date: Wed, 23 Oct 2013 20:11:44 +0900 Subject: [PATCH] fixed bug (print wrong message when select 'all' tab) Change-Id: Ie3567f9d0317526647c15171ba09ff7098e12591 Signed-off-by: jihye kim --- .../src/org/tizen/emulator/manager/ui/VMsMainView.java | 9 ++++++--- .../org/tizen/emulator/manager/ui/list/ExtendTreeListView.java | 2 +- .../src/org/tizen/emulator/manager/ui/list/TreeListView.java | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/common-project/src/org/tizen/emulator/manager/ui/VMsMainView.java b/common-project/src/org/tizen/emulator/manager/ui/VMsMainView.java index 48e2960..a357be7 100644 --- a/common-project/src/org/tizen/emulator/manager/ui/VMsMainView.java +++ b/common-project/src/org/tizen/emulator/manager/ui/VMsMainView.java @@ -39,6 +39,7 @@ import org.eclipse.swt.widgets.Composite; import org.tizen.emulator.manager.logging.EMLogger; import org.tizen.emulator.manager.platform.BaseImage; import org.tizen.emulator.manager.platform.Platform; +import org.tizen.emulator.manager.platform.TotalPlatform; import org.tizen.emulator.manager.resources.ColorResources; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.ui.dialog.MessageDialog; @@ -301,15 +302,17 @@ public class VMsMainView { if (currentImage.getVmsList().isEmpty()) { listView.cancelModify(-1); - drawEmptyVMList(); + if (currentPlatform == null || !(currentPlatform instanceof TotalPlatform)) { + drawEmptyVMList(); + } } else { if (currentProperty != null) { int i = currentImage.getVmsList().indexOf(currentProperty); listView.cancelModify(i); - detailView.drawDetailVM(currentProperty); + //detailView.drawDetailVM(currentProperty); } else { listView.cancelModify(-1); - detailView.drawEmptyDetailVM(); + //detailView.drawEmptyDetailVM(); } } } diff --git a/common-project/src/org/tizen/emulator/manager/ui/list/ExtendTreeListView.java b/common-project/src/org/tizen/emulator/manager/ui/list/ExtendTreeListView.java index 15dbb71..53e2777 100644 --- a/common-project/src/org/tizen/emulator/manager/ui/list/ExtendTreeListView.java +++ b/common-project/src/org/tizen/emulator/manager/ui/list/ExtendTreeListView.java @@ -185,7 +185,7 @@ public class ExtendTreeListView extends TreeListView { @Override public void cancelModify(int index) { if (currentItem != null && currentItem.getData() instanceof CreateMarker) { - currentItem = oldItem; + currentItem = currentItem.getParentItem(); isCancelCreateMode = true; } diff --git a/common-project/src/org/tizen/emulator/manager/ui/list/TreeListView.java b/common-project/src/org/tizen/emulator/manager/ui/list/TreeListView.java index eb31ab8..b766918 100644 --- a/common-project/src/org/tizen/emulator/manager/ui/list/TreeListView.java +++ b/common-project/src/org/tizen/emulator/manager/ui/list/TreeListView.java @@ -234,6 +234,7 @@ public class TreeListView extends AbstractListView { ((CreateMarker)data).getBaseImage(), false); //setSelectProperty(); vmsTree.setSelection(((CreateMarker) data).getItem()); + isSelection = false; } else if(data instanceof TreeMarker) { VMsMainView.getInstance().drawEmptyDetailVM(); VMsMainView.getInstance().setCurrentProperty(null); -- 2.7.4