changed the way to fetch file name list in spd file, per the schema changes

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@567 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java b/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
index bc2e359b0745a5d570c953674c2dbd28f0bc3107..97096f6b4f32b156907f70fa359e50c169bd416a 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
@@ -295,25 +295,24 @@ public class GlobalData {
         File packageFile = new File(packageFilename);\r
         try {\r
             PackageSurfaceAreaDocument spd = (PackageSurfaceAreaDocument) XmlObject.Factory.parse(packageFile);\r
         File packageFile = new File(packageFilename);\r
         try {\r
             PackageSurfaceAreaDocument spd = (PackageSurfaceAreaDocument) XmlObject.Factory.parse(packageFile);\r

-            List<FilenameDocument.Filename> msaFilenameList;\r
+            List<String> msaFilenameList;\r

 \r
             List<MsaFilesDocument.MsaFiles.MsaFile> msasList = spd.getPackageSurfaceArea().getMsaFiles()\r
                                                                   .getMsaFileList();\r
             if (msasList.size() == 0) {\r
                 msaFilenameList = spd.getPackageSurfaceArea().getMsaFiles().getFilenameList();\r
             } else {\r
 \r
             List<MsaFilesDocument.MsaFiles.MsaFile> msasList = spd.getPackageSurfaceArea().getMsaFiles()\r
                                                                   .getMsaFileList();\r
             if (msasList.size() == 0) {\r
                 msaFilenameList = spd.getPackageSurfaceArea().getMsaFiles().getFilenameList();\r
             } else {\r

-                msaFilenameList = new ArrayList<FilenameDocument.Filename>(msasList.size());\r
+                msaFilenameList = new ArrayList<String>(msasList.size());\r

                 Iterator msasIter = msasList.iterator();\r
                 while (msasIter.hasNext()) {\r
                     MsaFilesDocument.MsaFiles.MsaFile msaFile = (MsaFilesDocument.MsaFiles.MsaFile)msasIter.next();\r
                 Iterator msasIter = msasList.iterator();\r
                 while (msasIter.hasNext()) {\r
                     MsaFilesDocument.MsaFiles.MsaFile msaFile = (MsaFilesDocument.MsaFiles.MsaFile)msasIter.next();\r

-                    msaFilenameList.add(msaFile.getFilename());\r
+                    msaFilenameList.add(msaFile.getFilename().getStringValue());\r

                 }\r
             }\r
 \r
             Iterator msaFilenameIter = msaFilenameList.iterator();\r
             while (msaFilenameIter.hasNext()) {\r
                 }\r
             }\r
 \r
             Iterator msaFilenameIter = msaFilenameList.iterator();\r
             while (msaFilenameIter.hasNext()) {\r

-                FilenameDocument.Filename msaFilename = (FilenameDocument.Filename)msaFilenameIter.next();\r
-                String filename = msaFilename.getStringValue();\r
+                String filename = (String)msaFilenameIter.next();\r

                 File msaFile = new File(workspaceDir + File.separatorChar + GlobalData.getPackagePath(packageName)\r
                                         + File.separatorChar + filename);\r
                 SurfaceAreaParser surfaceAreaParser = new SurfaceAreaParser();\r
                 File msaFile = new File(workspaceDir + File.separatorChar + GlobalData.getPackagePath(packageName)\r
                                         + File.separatorChar + filename);\r
                 SurfaceAreaParser surfaceAreaParser = new SurfaceAreaParser();\r