X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2Fglobal%2FSurfaceAreaQuery.java;h=0b16e30df3bbb2953c34c499728dcc12447792a2;hp=5f86217378e1fa021c0c4d09e7cd4b5834bad05b;hb=80785fd5be587d420174dc35d6af4ada06ed2f0f;hpb=25832ed3375c65b1b2763acbd7461710fde0543b

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java b/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
index 5f86217378..0b16e30df3 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
@@ -23,21 +23,48 @@ import java.util.Stack;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.xmlbeans.XmlNormalizedString;
+import org.apache.xmlbeans.XmlCursor;
 import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.XmlString;
-import org.tianocore.*;
+import org.tianocore.BuildOptionsDocument;
+import org.tianocore.CNameType;
+import org.tianocore.ExternsDocument;
+import org.tianocore.FileNameConvention;
+import org.tianocore.FvImagesDocument;
+import org.tianocore.GuidDeclarationsDocument;
+import org.tianocore.GuidsDocument;
+import org.tianocore.LibrariesDocument;
+import org.tianocore.LibraryClassDeclarationsDocument;
+import org.tianocore.LibraryClassDocument;
+import org.tianocore.ModuleDefinitionsDocument;
+import org.tianocore.ModuleSADocument;
+import org.tianocore.ModuleSaBuildOptionsDocument;
+import org.tianocore.ModuleTypeDef;
+import org.tianocore.MsaFilesDocument;
+import org.tianocore.MsaHeaderDocument;
+import org.tianocore.OptionDocument;
+import org.tianocore.PPIsDocument;
+import org.tianocore.PackageDependenciesDocument;
+import org.tianocore.PackageHeadersDocument;
+import org.tianocore.PcdCodedDocument;
+import org.tianocore.PlatformDefinitionsDocument;
+import org.tianocore.PlatformHeaderDocument;
+import org.tianocore.PpiDeclarationsDocument;
+import org.tianocore.ProtocolDeclarationsDocument;
+import org.tianocore.Sentence;
+import org.tianocore.SpdHeaderDocument;
+import org.tianocore.UserExtensionsDocument;
 import org.tianocore.FilenameDocument.Filename;
 import org.tianocore.MsaHeaderDocument.MsaHeader;
 import org.tianocore.ProtocolsDocument.Protocols.Protocol;
 import org.tianocore.ProtocolsDocument.Protocols.ProtocolNotify;
-import org.tianocore.SupportedArchitectures.Enum;
 import org.tianocore.build.id.FpdModuleIdentification;
 import org.tianocore.build.id.ModuleIdentification;
 import org.tianocore.build.id.PackageIdentification;
 import org.tianocore.build.id.PlatformIdentification;
 import org.tianocore.build.toolchain.ToolChainInfo;
 import org.tianocore.logger.EdkLog;
+import org.w3c.dom.Node;
 
 /**
  * SurfaceAreaQuery class is used to query Surface Area information from msa,
@@ -251,6 +278,7 @@ public class SurfaceAreaQuery {
         Filename[] sourceFileNames = (Filename[]) returns;
         List<String[]> outputList = new ArrayList<String[]>();
         for (int i = 0; i < sourceFileNames.length; i++) {
+            @SuppressWarnings("unchecked")
             List<String> archList = sourceFileNames[i].getSupArchList();
             if (arch == null || arch.equalsIgnoreCase("") || archList == null || archList.contains(arch)) {
                 outputList.add(new String[] {sourceFileNames[i].getToolCode(),sourceFileNames[i].getStringValue()});
@@ -416,6 +444,7 @@ public class SurfaceAreaQuery {
             }
 
             archList = new ArrayList<String>();
+            @SuppressWarnings("unchecked")
             List<String> archEnumList = option.getSupArchList();            
             if (archEnumList == null) {
                 archList.add(null);
@@ -542,6 +571,7 @@ public class SurfaceAreaQuery {
         PackageIdentification[] packageIdList = new PackageIdentification[returns.length];
         for (int i = 0; i < returns.length; i++) {
             PackageDependenciesDocument.PackageDependencies.Package item = (PackageDependenciesDocument.PackageDependencies.Package) returns[i];
+            @SuppressWarnings("unchecked")
             List<String> archList = item.getSupArchList();
             if (arch == null || archList == null || archList.contains(arch)) {
                 packageGuid = item.getPackageGuid();
@@ -677,6 +707,7 @@ public class SurfaceAreaQuery {
         List<String> protocolList = new ArrayList<String>();
         
         for (int i = 0; i < returns.length; i++) {
+            @SuppressWarnings("unchecked")
             List<String> archList = returnlList[i].getSupArchList();
             if (archList == null || archList.contains(arch)){
                 protocolList.add(returnlList[i].getProtocolCName());
@@ -715,6 +746,7 @@ public class SurfaceAreaQuery {
         List<String> protocolNotifyList = new ArrayList<String>();
         
         for (int i = 0; i < returns.length; i++) {
+            @SuppressWarnings("unchecked")
             List<String> archList = ((ProtocolNotify) returns[i]).getSupArchList();
             if (archList == null || archList.contains(arch)){
                 protocolNotifyList.add(((ProtocolNotify) returns[i]).getProtocolNotifyCName());
@@ -836,6 +868,7 @@ public class SurfaceAreaQuery {
         
         List<String> ppiNotifyList = new ArrayList<String>();
         for (int i = 0; i < returns.length; i++) {
+            @SuppressWarnings("unchecked")
             List<String> archList = ((PPIsDocument.PPIs.PpiNotify) returns[i]).getSupArchList();
             if (archList == null || archList.contains(arch)){
                 ppiNotifyList.add(((PPIsDocument.PPIs.PpiNotify) returns[i]).getPpiNotifyCName()); 
@@ -916,6 +949,7 @@ public class SurfaceAreaQuery {
 
         List<String> ppiList = new ArrayList<String>();
         for (int i = 0; i < returns.length; i++) {
+            @SuppressWarnings("unchecked")
             List<String> archList = ((PPIsDocument.PPIs.Ppi) returns[i]).getSupArchList();
             if (archList == null || archList.contains(arch)){
                 ppiList.add(((PPIsDocument.PPIs.Ppi) returns[i]).getPpiCName());    
@@ -995,6 +1029,7 @@ public class SurfaceAreaQuery {
 
         List<String> guidList = new ArrayList<String>();
         for (int i = 0; i < returns.length; i++) {
+            @SuppressWarnings("unchecked")
             List<String> archList = ((GuidsDocument.Guids.GuidCNames) returns[i]).getSupArchList();
             if (archList == null || archList.contains(arch)){
                 guidList.add(((GuidsDocument.Guids.GuidCNames) returns[i]).getGuidCName());    
@@ -1343,14 +1378,16 @@ public class SurfaceAreaQuery {
         return result;
     }
     
-    public static XmlObject getFpdUserExtension() {
-        String[] xPath = new String[] { "" };
+    public static Node getFpdUserExtension() {
+        String[] xPath = new String[] { "/UserExtensions" };
 
         Object[] queryResult = get("PlatformSurfaceArea", xPath);
-        if (queryResult == null) {
+        if (queryResult == null || queryResult.length == 0) {
             return null;
         }
-        return null;
+        UserExtensionsDocument.UserExtensions a =  (UserExtensionsDocument.UserExtensions)queryResult[0];
+        
+        return a.getDomNode();
     }
 
     /**