Remove static from SurfaceAreaQuery.java for preparing parallel build.(1)

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

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