Removed dead lines that had been commented out.
authorlhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>
Mon, 25 Sep 2006 23:10:05 +0000 (23:10 +0000)
committerlhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>
Mon, 25 Sep 2006 23:10:05 +0000 (23:10 +0000)
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1617 6f19259b-4bc3-4df7-8a09-765794883524

Tools/Source/Merge/src/org/tianocore/Merge/CombineMsa.java

index 7383c59..ea86bef 100644 (file)
@@ -53,7 +53,6 @@ import org.tianocore.ModuleBuildOptionsDocument.*;
 import org.tianocore.UserExtensionsDocument.*;\r
 \r
 import org.tianocore.PackageSurfaceAreaDocument.*;\r
 import org.tianocore.UserExtensionsDocument.*;\r
 \r
 import org.tianocore.PackageSurfaceAreaDocument.*;\r
-import org.tianocore.MsaFilesDocument.*;\r
 \r
 public class CombineMsa {\r
 \r
 \r
 public class CombineMsa {\r
 \r
@@ -219,8 +218,6 @@ public class CombineMsa {
 \r
     private UserExtensions mergeUserExtensions = null;\r
 \r
 \r
     private UserExtensions mergeUserExtensions = null;\r
 \r
-    private XmlCursor cursor = null;\r
-\r
     private String mergeUsage = "";\r
 \r
     private String leafUsage = "";\r
     private String mergeUsage = "";\r
 \r
     private String leafUsage = "";\r
@@ -1754,7 +1751,6 @@ public class CombineMsa {
                 PackageSurfaceAreaDocument spdDoc = PackageSurfaceAreaDocument.Factory.parse(spdFile);\r
                 PackageSurfaceArea spd = spdDoc.getPackageSurfaceArea();\r
 \r
                 PackageSurfaceAreaDocument spdDoc = PackageSurfaceAreaDocument.Factory.parse(spdFile);\r
                 PackageSurfaceArea spd = spdDoc.getPackageSurfaceArea();\r
 \r
-                // MsaFiles mergeMsaFilesForSpd = MsaFilesDocument.Factory.newInstance().addNewMsaFiles();\r
                 List<String> msaFilenames = spd.getMsaFiles().getFilenameList();\r
                 msaFilenames.add(msaLine);\r
                 XmlCursor cursor = XmlConfig.setupXmlCursor(spd.newCursor());\r
                 List<String> msaFilenames = spd.getMsaFiles().getFilenameList();\r
                 msaFilenames.add(msaLine);\r
                 XmlCursor cursor = XmlConfig.setupXmlCursor(spd.newCursor());\r