From 6762c259763ce8cf4a3b9855a0f7a877a368f830 Mon Sep 17 00:00:00 2001 From: "jihye424.kim" Date: Sat, 5 Dec 2015 18:27:39 +0900 Subject: [PATCH] device template: not make table item for template that already exist - create device template when profile button is off status - bug: profile button is changed on status -> exist two table item for same template - fix: does not make table item for template that already table item exist Change-Id: Ia8ef8b1bedea42f7960c5a9fa391e5ea42bd3dd0 Signed-off-by: jihye424.kim --- .../ui/renewal/tableviewer/BaseImageTableViewer.java | 8 ++++++-- .../tableviewer/DeviceTemplateTableViewer.java | 20 ++++++++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/BaseImageTableViewer.java b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/BaseImageTableViewer.java index 1138083..0062190 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/BaseImageTableViewer.java +++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/BaseImageTableViewer.java @@ -280,8 +280,12 @@ public class BaseImageTableViewer extends AbstractTableViewer { } private void makeTableItem(ProfileButton pButton) { + makeTableItem(pButton, false); + } + + private void makeTableItem(ProfileButton pButton, boolean needCheck) { for (BaseImage image : pButton.getProfile().getImageList()) { - if (!existBaseImageInTable(image)) { + if (!needCheck || !existBaseImageInTable(image)) { addTableItem(pButton, image); } } @@ -597,7 +601,7 @@ public class BaseImageTableViewer extends AbstractTableViewer { } if (!b.isSelection()) { - makeTableItem(pButton); + makeTableItem(pButton, true); } else { if (pButton.getProfile().getImageList().isEmpty()) { return; 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 327779f..b1d1dc5 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/tableviewer/DeviceTemplateTableViewer.java +++ b/src/org/tizen/emulator/manager/ui/renewal/tableviewer/DeviceTemplateTableViewer.java @@ -352,9 +352,25 @@ public class DeviceTemplateTableViewer extends AbstractTableViewer { } private void makeTableItem(ProfileButton pButton) { + makeTableItem(pButton, false); + } + + private void makeTableItem(ProfileButton pButton, boolean needCheck) { for (DeviceTemplate template : pButton.getProfile().getTemplateList()) { - addTableItem(pButton, template); + if (!needCheck || !existTemplateInTable(template)) { + addTableItem(pButton, template); + } + } + } + + private boolean existTemplateInTable(DeviceTemplate template) { + for (TableItem item : table.getItems()) { + DeviceTemplate t = (DeviceTemplate)item.getData(); + if (t.equals(template)) { + return true; + } } + return false; } private void addTableItem (ProfileButton pButton, DeviceTemplate template) { @@ -548,7 +564,7 @@ public class DeviceTemplateTableViewer extends AbstractTableViewer { } if (!b.isSelection()) { - makeTableItem(pButton); + makeTableItem(pButton, true); } else { if (pButton.getProfile().getTemplateList().isEmpty()) { return; -- 2.7.4