X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2Fglobal%2FSpd.java;h=cfb5dc1f875e2dc7c18f89fb9b62ba29e8dc4bc8;hp=63568b38861ed8fefca4dc8526f530d877ca618e;hb=83fba802560b3446de68ac1c280773cf1a4271be;hpb=c74c7a43020713e9d9e11098e3118472d920c2ff

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/Spd.java b/Tools/Source/GenBuild/org/tianocore/build/global/Spd.java
index 63568b3886..cfb5dc1f87 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/global/Spd.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/Spd.java
@@ -106,24 +106,24 @@ public class Spd {
             // We can change Map to XmlObject
             Map<String, XmlObject> spdDocMap = new HashMap<String, XmlObject>();
             spdDocMap.put("PackageSurfaceArea", spdDoc);
-            SurfaceAreaQuery.setDoc(spdDocMap);
+            SurfaceAreaQuery saq = new SurfaceAreaQuery(spdDocMap);
             //
             //
             //
-            packageId = SurfaceAreaQuery.getSpdHeader();
+            packageId = saq.getSpdHeader();
             packageId.setSpdFile(packageFile);
             
             //
             // initialize Msa Files
             // MSA file is absolute file path
             //
-            String[] msaFilenames = SurfaceAreaQuery.getSpdMsaFile();
+            String[] msaFilenames = saq.getSpdMsaFile();
             for (int i = 0; i < msaFilenames.length; i++){
                 File msaFile = new File(packageId.getPackageDir() + File.separatorChar + msaFilenames[i]);
                 Map<String, XmlObject> msaDoc = GlobalData.getNativeMsa( msaFile );
-                SurfaceAreaQuery.push(msaDoc);
-                ModuleIdentification moduleId = SurfaceAreaQuery.getMsaHeader();
-                SurfaceAreaQuery.pop();
+                saq.push(msaDoc);
+                ModuleIdentification moduleId = saq.getMsaHeader();
+                saq.pop();
                 moduleId.setPackage(packageId);
                 moduleId.setMsaFile(msaFile);
                 if (msaInfo.containsKey(moduleId)) {
@@ -135,7 +135,7 @@ public class Spd {
             //
             // initialize Package header files
             //
-            Map<String, String> packageHeaders = SurfaceAreaQuery.getSpdPackageHeaderFiles();
+            Map<String, String> packageHeaders = saq.getSpdPackageHeaderFiles();
             Set keys = packageHeaders.keySet();
             Iterator iter = keys.iterator();
             while (iter.hasNext()){
@@ -153,7 +153,7 @@ public class Spd {
             //
             // initialize Guid Info
             //
-            guidInfo.putAll(SurfaceAreaQuery.getSpdGuid());
+            guidInfo.putAll(saq.getSpdGuid());
             
             //
             // For Pcd get TokenSpaceGuid
@@ -169,17 +169,17 @@ public class Spd {
             //
             // initialize PPI info
             //
-            ppiInfo.putAll(SurfaceAreaQuery.getSpdPpi());
+            ppiInfo.putAll(saq.getSpdPpi());
             
             //
             // initialize Protocol info
             //
-            protocolInfo.putAll(SurfaceAreaQuery.getSpdProtocol());
+            protocolInfo.putAll(saq.getSpdProtocol());
             
             //
             // initialize library class declaration
             //
-            Map<String, String[]> libraryClassHeaders = SurfaceAreaQuery.getSpdLibraryClasses();
+            Map<String, String[]> libraryClassHeaders = saq.getSpdLibraryClasses();
             keys = libraryClassHeaders.keySet();
             iter = keys.iterator();
             while (iter.hasNext()){