X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FMerge%2Fsrc%2Forg%2Ftianocore%2FMerge%2FCombineMsa.java;h=ea86bef84f941ba8c9aa5b83be59f50921b2bc6f;hp=7383c599fb69b198f3ac31cea642ba618a21d08f;hb=ee29f78ab7bf3f63e4226ee1dd09633eaf46e545;hpb=5529d1f8aa1a1fa9e484447e2de3034f11e9de39 diff --git a/Tools/Source/Merge/src/org/tianocore/Merge/CombineMsa.java b/Tools/Source/Merge/src/org/tianocore/Merge/CombineMsa.java index 7383c599fb..ea86bef84f 100644 --- a/Tools/Source/Merge/src/org/tianocore/Merge/CombineMsa.java +++ b/Tools/Source/Merge/src/org/tianocore/Merge/CombineMsa.java @@ -53,7 +53,6 @@ import org.tianocore.ModuleBuildOptionsDocument.*; import org.tianocore.UserExtensionsDocument.*; import org.tianocore.PackageSurfaceAreaDocument.*; -import org.tianocore.MsaFilesDocument.*; public class CombineMsa { @@ -219,8 +218,6 @@ public class CombineMsa { private UserExtensions mergeUserExtensions = null; - private XmlCursor cursor = null; - private String mergeUsage = ""; private String leafUsage = ""; @@ -1754,7 +1751,6 @@ public class CombineMsa { PackageSurfaceAreaDocument spdDoc = PackageSurfaceAreaDocument.Factory.parse(spdFile); PackageSurfaceArea spd = spdDoc.getPackageSurfaceArea(); - // MsaFiles mergeMsaFilesForSpd = MsaFilesDocument.Factory.newInstance().addNewMsaFiles(); List msaFilenames = spd.getMsaFiles().getFilenameList(); msaFilenames.add(msaLine); XmlCursor cursor = XmlConfig.setupXmlCursor(spd.newCursor());