X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FPackageEditor%2Fsrc%2Forg%2Ftianocore%2Fpackaging%2FSpdFileContents.java;h=d8b69e8d2fd46ac7a3f73083793bc4fa90a2d774;hp=9511eed3d56ba7df223aaa34b07e0a1c4067e338;hb=c082c8cffe418d9e4b3e89f322fe0ff0365cedfa;hpb=41eec21d72be98d383bf146644d7ccc17b2f88f7 diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/SpdFileContents.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/SpdFileContents.java index 9511eed3d5..d8b69e8d2f 100644 --- a/Tools/Source/PackageEditor/src/org/tianocore/packaging/SpdFileContents.java +++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/SpdFileContents.java @@ -67,12 +67,8 @@ public class SpdFileContents { private GuidDocument.Guid spdHdrGuid = null; - private AbstractDocument.Abstract spdHdrAbs = null; - private LicenseDocument.License spdHdrLicense = null; - private SpecificationDocument.Specification spdHdrSpec = null; - private OutputDirectoryDocument.OutputDirectory spdHdrOutDir = null; private LibraryClassDeclarationsDocument.LibraryClassDeclarations spdLibClassDeclarations = null; @@ -212,7 +208,7 @@ public class SpdFileContents { s[0] = getSpdHdrPkgName(); s[1] = getSpdHdrGuid().getStringValue(); s[2] = getSpdHdrVer(); - s[3] = getSpdHdrAbs().getStringValue(); + s[3] = getSpdHdrAbs(); s[4] = getSpdHdr().getDescription(); s[5] = getSpdHdr().getCopyright(); s[6] = getSpdHdrLicense().getStringValue(); @@ -1030,11 +1026,9 @@ public class SpdFileContents { @return AbstractDocument.Abstract **/ - public AbstractDocument.Abstract getSpdHdrAbs() { - if (spdHdrAbs == null) { - spdHdrAbs = getSpdHdr().getAbstract(); - } - return spdHdrAbs; + public String getSpdHdrAbs() { + + return getSpdHdr().getAbstract(); } /** @@ -1043,13 +1037,7 @@ public class SpdFileContents { @param abs The value set to Abstract element **/ public void setSpdHdrAbs(String abs) { - - if (getSpdHdrAbs() != null) { - getSpdHdrAbs().setStringValue(abs); - } else { - spdHdrAbs = getSpdHdr().addNewAbstract(); - spdHdrAbs.setStringValue(abs); - } + getSpdHdr().setAbstract(abs); } /** @@ -1128,7 +1116,7 @@ public class SpdFileContents { **/ public void setSpdHdrVer(String ver) { if (spdHdr != null) { - spdHdr.setVersion(new BigDecimal(ver.toCharArray())); + spdHdr.setVersion(ver); } } @@ -1211,15 +1199,7 @@ public class SpdFileContents { } } - /** - Reserved method - - @return SpecificationDocument.Specification - **/ - public SpecificationDocument.Specification getSpdHdrSpec() { - return spdHdrSpec; - } - + /** Reserved method @@ -1229,12 +1209,9 @@ public class SpdFileContents { if (spec == null) { return; } - if (getSpdHdrSpec() != null) { - getSpdHdrSpec().setStringValue(spec); - } else { - spdHdrSpec = getSpdHdr().addNewSpecification(); - spdHdrSpec.setStringValue(spec); - } + + getSpdHdr().setSpecification(spec); + } /**