Modify support module type filter for library instance selection.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2286 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 8 insertions, 3 deletions

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
index 1eefec03b8..230b9e8230 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
@@ -93,6 +93,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
     private DefaultTableModel optionsTableModel = null;

     private FpdFileContents ffc = null;

     private String moduleKey = null;

+    private ModuleIdentification moduleId = null;

     private int moduleSaNum = -1;

     private HashMap<LibraryClassDescriptor, ArrayList<String>> classInstanceMap = null;

     //

@@ -198,6 +199,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
         libClassTableModel.setRowCount(0);

         libInstanceTableModel.setRowCount(0);

         selectedInstancesTableModel.setRowCount(0);

+        moduleId = WorkspaceProfile.getModuleId(moduleKey);

         Vector<String> errorMsg = new Vector<String>();

         try {

             //

@@ -353,6 +355,9 @@ public class FpdModuleSA extends JDialog implements ActionListener {
         // Get the lib class consumed, produced by this module itself.

         //

         Vector<LibraryClassDescriptor> vClassConsumed = SurfaceAreaQuery.getLibraryClasses("ALWAYS_CONSUMED", mi);

+        for (int i = 0; i < vClassConsumed.size(); ++i) {

+            vClassConsumed.get(i).supModTypes = WorkspaceProfile.getModuleType(moduleId);

+        }

         filterClassConsumedByArch(vClassConsumed);

         if (this.classConsumed == null) {

             this.classConsumed = new HashMap<LibraryClassDescriptor, ArrayList<String>>();

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/WorkspaceProfile.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/WorkspaceProfile.java
index 8b0f4ccc1b..954cda112c 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/WorkspaceProfile.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/WorkspaceProfile.java
@@ -122,12 +122,12 @@ public class WorkspaceProfile {
         return vArchs;

     }

     

-    public static String getModuleBaseName (ModuleIdentification mi) {

+    public static String getModuleType (ModuleIdentification mi) {

         ModuleSurfaceAreaDocument.ModuleSurfaceArea msa = getModuleXmlObject(mi);

-        if (msa.getModuleDefinitions() == null || msa.getModuleDefinitions().getOutputFileBasename() == null) {

+        if (msa.getMsaHeader() == null || msa.getMsaHeader().getModuleType() == null) {

             return null;

         }

-        return msa.getModuleDefinitions().getOutputFileBasename();

+        return msa.getMsaHeader().getModuleType().toString();

     }

     

     public static boolean pcdInMsa (String cName, String tsGuid, String supArchList, ModuleIdentification mi) {