a. Add support arch. filter for library instance selection in FPD file.

[mirror_edk2.git] / Tools / Java / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / platform / ui / global / SurfaceAreaQuery.java

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/SurfaceAreaQuery.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/SurfaceAreaQuery.java
index 85b406621c47f8f3cf2dd3250d9387d0034c86c0..ad0e82ca3ff0d88e0da8832ffce10f80dddd3965 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/SurfaceAreaQuery.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/SurfaceAreaQuery.java
@@ -317,7 +317,7 @@ public class SurfaceAreaQuery {
         * @returns null if nothing is there\r
         */\r
 \r
-       public static PackageIdentification[] getDependencePkg(String arch, ModuleIdentification mi) throws Exception{\r
+       public static PackageIdentification[] getDependencePkg(String arch, ModuleIdentification mi){\r
                \r
                String packageGuid = null;\r
                String packageVersion = null;\r
@@ -375,11 +375,11 @@ public class SurfaceAreaQuery {
         *          xpath\r
         * @returns null if nothing is there\r
         */\r
-       public static Vector<String> getLibraryClasses(String usage, ModuleIdentification mi) throws Exception{\r
+       public static Vector<LibraryClassDescriptor> getLibraryClasses(String usage, ModuleIdentification mi){\r
         ModuleSurfaceAreaDocument.ModuleSurfaceArea msa = (ModuleSurfaceAreaDocument.ModuleSurfaceArea)WorkspaceProfile.getModuleXmlObject(mi);\r
-        Vector<String> libraryClassName = new Vector<String>();\r
+        Vector<LibraryClassDescriptor> libraryClassInfo = new Vector<LibraryClassDescriptor>();\r
         if (msa.getLibraryClassDefinitions() == null) {\r
-            return libraryClassName;\r
+            return libraryClassInfo;\r
         }\r
         \r
         int size = msa.getLibraryClassDefinitions().getLibraryClassList().size();\r
@@ -387,11 +387,12 @@ public class SurfaceAreaQuery {
                for (int i = 0; i < size; i++) {\r
             LibraryClassDocument.LibraryClass libClass = msa.getLibraryClassDefinitions().getLibraryClassList().get(i);\r
             if (usage.equals(libClass.getUsage().toString())) {\r
-                libraryClassName.add(libClass.getKeyword());\r
+\r
+                libraryClassInfo.add(new LibraryClassDescriptor(libClass.getKeyword(), libClass.getSupArchList()+"", libClass.getSupModuleList()+""));\r
             }\r
                }\r
         \r
-               return libraryClassName;\r
+               return libraryClassInfo;\r
        }\r
 \r
     public static XmlObject[] getSpdPcdDeclarations(PackageIdentification pi) {\r
@@ -408,4 +409,5 @@ public class SurfaceAreaQuery {
         return returns;\r
     }\r
 \r
-}      
\ No newline at end of file
+}\r
+\r