Remove build warning.

[mirror_edk2.git] / Tools / Source / GenBuild / org / tianocore / build / global / SurfaceAreaQuery.java

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java b/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
index 39384c45ba1d58cd9212eeca6c0d797b9048f0b3..ba27de2f0ad7662298e04cfb7e74dec861f36208 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
@@ -23,7 +23,6 @@ import java.util.Stack;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
-import org.apache.xmlbeans.XmlCursor;\r
 import org.apache.xmlbeans.XmlObject;\r
 import org.apache.xmlbeans.XmlString;\r
 import org.tianocore.BuildOptionsDocument;\r
@@ -568,7 +567,11 @@ public class SurfaceAreaQuery {
         if (returns == null) {\r
             return new PackageIdentification[0];\r
         }\r
-        PackageIdentification[] packageIdList = new PackageIdentification[returns.length];\r
+\r
+        //\r
+        //  Get packageIdentification \r
+        // \r
+        List<PackageIdentification> packageIdList = new ArrayList<PackageIdentification>();\r
         for (int i = 0; i < returns.length; i++) {\r
             PackageDependenciesDocument.PackageDependencies.Package item = (PackageDependenciesDocument.PackageDependencies.Package) returns[i];\r
             @SuppressWarnings("unchecked")\r
@@ -576,11 +579,19 @@ public class SurfaceAreaQuery {
             if (arch == null || archList == null || archList.contains(arch)) {\r
                 packageGuid = item.getPackageGuid();\r
                 packageVersion = item.getPackageVersion();\r
-                packageIdList[i] = (new PackageIdentification(null, packageGuid,\r
+                packageIdList.add(new PackageIdentification(null, packageGuid,\r
                     packageVersion));\r
             }\r
         }\r
-        return packageIdList;\r
+\r
+        //\r
+        //  transfer packageIdentification list to array.\r
+        // \r
+        PackageIdentification[] packageIdArray = new PackageIdentification[packageIdList.size()];\r
+        for (int i = 0; i < packageIdList.size(); i++) {\r
+            packageIdArray[i] = new PackageIdentification(null, packageIdList.get(i).getGuid(),packageIdList.get(i).getVersion());\r
+        }\r
+        return packageIdArray;\r
     }\r
 \r
     /**\r
@@ -1379,10 +1390,10 @@ public class SurfaceAreaQuery {
     }\r
     \r
     public static Node getFpdUserExtension() {\r
-        String[] xPath = new String[] { "/UserExtensions" };\r
+        String[] xPath = new String[] { "/UserExtensions[@UserID='TianoCore']" }; \r
 \r
         Object[] queryResult = get("PlatformSurfaceArea", xPath);\r
-        if (queryResult == null && queryResult.length == 0) {\r
+        if (queryResult == null || queryResult.length == 0) {\r
             return null;\r
         }\r
         UserExtensionsDocument.UserExtensions a =  (UserExtensionsDocument.UserExtensions)queryResult[0];\r