From 59c6e7fa08a57671531dfa37d238001865382181 Mon Sep 17 00:00:00 2001 From: jihye kim Date: Thu, 5 Sep 2013 13:24:38 +0900 Subject: [PATCH] fixed the bug : if plugin does not implement all extension point, em can not load that plugin Sgned-off-by: jihye kim Change-Id: Icf248ce69875fb4bc1822da1de364d9bc837af91 --- .../src/org/tizen/emulator/manager/plugin/EMPlugin.java | 8 +++++++- .../src/org/tizen/emulator/manager/ui/detail/PInfoViewPage.java | 3 +-- .../src/org/tizen/emulator/manager/ui/detail/PModifyViewPage.java | 3 +-- package/changelog | 5 +++++ package/pkginfo.manifest | 2 +- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/common-project/src/org/tizen/emulator/manager/plugin/EMPlugin.java b/common-project/src/org/tizen/emulator/manager/plugin/EMPlugin.java index e208c04..eaad87e 100644 --- a/common-project/src/org/tizen/emulator/manager/plugin/EMPlugin.java +++ b/common-project/src/org/tizen/emulator/manager/plugin/EMPlugin.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.jar.Attributes; +import org.tizen.emulator.manager.logging.EMLogger; import org.tizen.emulator.manager.platform.Platform; public class EMPlugin { @@ -24,7 +25,12 @@ public class EMPlugin { } for (String ex : EMPluginLoader.getExtensionList()) { - exItemList.add(new ExtensionItem(ex, attr, this)); + try { + exItemList.add(new ExtensionItem(ex, attr, this)); + } catch (IOException e) { + EMLogger.getLogger().warning("This plugin does not have " + ex + + " extension point."); + } } } diff --git a/common-project/src/org/tizen/emulator/manager/ui/detail/PInfoViewPage.java b/common-project/src/org/tizen/emulator/manager/ui/detail/PInfoViewPage.java index 0d9e5c6..f18110d 100644 --- a/common-project/src/org/tizen/emulator/manager/ui/detail/PInfoViewPage.java +++ b/common-project/src/org/tizen/emulator/manager/ui/detail/PInfoViewPage.java @@ -207,8 +207,7 @@ public class PInfoViewPage extends DetailViewPage { private void changeItemList(VMPropertyValue propertyValue) { topViewList = null; for (InfoViewItemList item : infoItemList) { - if (topViewList == null - || item.exItem.getPlugin() == propertyValue.baseImage.getPlatform().getPlugin()) { + if (item.exItem.getPlugin() == propertyValue.baseImage.getPlatform().getPlugin()) { topViewList = item; setStackTop(topViewList.comp); reset(); diff --git a/common-project/src/org/tizen/emulator/manager/ui/detail/PModifyViewPage.java b/common-project/src/org/tizen/emulator/manager/ui/detail/PModifyViewPage.java index 09adb19..dc27ec7 100644 --- a/common-project/src/org/tizen/emulator/manager/ui/detail/PModifyViewPage.java +++ b/common-project/src/org/tizen/emulator/manager/ui/detail/PModifyViewPage.java @@ -168,8 +168,7 @@ public class PModifyViewPage extends DetailViewPage private void changeItemList(VMPropertyValue propertyValue) { topViewList = null; for (ModifyViewItemList item : modifyItemList) { - if (topViewList == null - || topViewList.exItem.getPlugin() == propertyValue.baseImage.getPlatform().getPlugin()) { + if (item.exItem.getPlugin() == propertyValue.baseImage.getPlatform().getPlugin()) { topViewList = item; setStackTop(topViewList.comp); reset(); diff --git a/package/changelog b/package/changelog index f28fa18..bc3cddb 100644 --- a/package/changelog +++ b/package/changelog @@ -1,3 +1,8 @@ +* 2.4.5 +- fixed the bug +- if plugin does not implement all extension point, em can not load that plugin +== jihye kim 2013-09-05 + * 2.4.3 - add skins of 'skins' folder to platform skin list == jihye kim 2013-09-04 diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 15ff779..7c82574 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,5 +1,5 @@ Source: emulator-manager -Version: 2.4.3 +Version: 2.4.5 Maintainer: Yeong-Kyoon Lee Package: emulator-manager -- 2.7.4