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

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 1eefec03b80a7f8739fe5bcb375eb4eebcf068e9..230b9e8230399fc658ba7d412366a43e317e4483 100644 (file)
--- 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;\r
     private FpdFileContents ffc = null;\r
     private String moduleKey = null;\r
+    private ModuleIdentification moduleId = null;\r
     private int moduleSaNum = -1;\r
     private HashMap<LibraryClassDescriptor, ArrayList<String>> classInstanceMap = null;\r
     //\r
@@ -198,6 +199,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
         libClassTableModel.setRowCount(0);\r
         libInstanceTableModel.setRowCount(0);\r
         selectedInstancesTableModel.setRowCount(0);\r
+        moduleId = WorkspaceProfile.getModuleId(moduleKey);\r
         Vector<String> errorMsg = new Vector<String>();\r
         try {\r
             //\r
@@ -353,6 +355,9 @@ public class FpdModuleSA extends JDialog implements ActionListener {
         // Get the lib class consumed, produced by this module itself.\r
         //\r
         Vector<LibraryClassDescriptor> vClassConsumed = SurfaceAreaQuery.getLibraryClasses("ALWAYS_CONSUMED", mi);\r
+        for (int i = 0; i < vClassConsumed.size(); ++i) {\r
+            vClassConsumed.get(i).supModTypes = WorkspaceProfile.getModuleType(moduleId);\r
+        }\r
         filterClassConsumedByArch(vClassConsumed);\r
         if (this.classConsumed == null) {\r
             this.classConsumed = new HashMap<LibraryClassDescriptor, ArrayList<String>>();\r

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 8b0f4ccc1b3598f7c080e7f5c226c0ece49b0ebd..954cda112c5a6752772c881a0847db1371ea1d79 100644 (file)
--- 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;\r
     }\r
     \r
-    public static String getModuleBaseName (ModuleIdentification mi) {\r
+    public static String getModuleType (ModuleIdentification mi) {\r
         ModuleSurfaceAreaDocument.ModuleSurfaceArea msa = getModuleXmlObject(mi);\r
-        if (msa.getModuleDefinitions() == null || msa.getModuleDefinitions().getOutputFileBasename() == null) {\r
+        if (msa.getMsaHeader() == null || msa.getMsaHeader().getModuleType() == null) {\r
             return null;\r
         }\r
-        return msa.getModuleDefinitions().getOutputFileBasename();\r
+        return msa.getMsaHeader().getModuleType().toString();\r
     }\r
     \r
     public static boolean pcdInMsa (String cName, String tsGuid, String supArchList, ModuleIdentification mi) {\r