From c082c8cffe418d9e4b3e89f322fe0ff0365cedfa Mon Sep 17 00:00:00 2001 From: jlin16 Date: Tue, 20 Jun 2006 08:43:00 +0000 Subject: [PATCH] Adpate to schema merge. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@572 6f19259b-4bc3-4df7-8a09-765794883524 --- .../packaging/module/ui/MsaHeader.java | 22 ++++------ .../packaging/module/ui/MsaLibHeader.java | 21 +++------ .../tianocore/packaging/SpdFileContents.java | 43 +++++-------------- 3 files changed, 25 insertions(+), 61 deletions(-) diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaHeader.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaHeader.java index e1682887c5..7edf49a3ff 100644 --- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaHeader.java +++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaHeader.java @@ -462,11 +462,10 @@ public class MsaHeader extends IInternalFrame { this.jTextAreaDescription.setText(this.msaHeader.getDescription()); } if (this.msaHeader.getSpecification() != null) { - this.jTextFieldSpecification.setText(this.msaHeader.getSpecification().getStringValue()); + this.jTextFieldSpecification.setText(this.msaHeader.getSpecification()); } if (this.msaHeader.getAbstract() != null) { - this.jTextFieldAbstract.setText(this.msaHeader.getAbstract().getStringValue()); - this.jTextFieldAbstractURL.setText(this.msaHeader.getAbstract().getURL()); + this.jTextFieldAbstract.setText(this.msaHeader.getAbstract()); } if (this.msaHeader.getModuleType() != null) { this.jComboBoxModuleType.setSelectedItem(this.msaHeader.getModuleType().toString()); @@ -703,22 +702,17 @@ public class MsaHeader extends IInternalFrame { this.msaHeader.setDescription(this.jTextAreaDescription.getText()); if (this.msaHeader.getSpecification() != null) { - this.msaHeader.getSpecification().setStringValue(this.jTextFieldSpecification.getText()); + this.msaHeader.setSpecification(this.jTextFieldSpecification.getText()); } else { - SpecificationDocument.Specification mSpecification = SpecificationDocument.Specification.Factory - .newInstance(); - mSpecification.setStringValue(this.jTextFieldSpecification.getText()); - this.msaHeader.setSpecification(mSpecification); + + this.msaHeader.setSpecification(this.jTextFieldSpecification.getText()); } if (this.msaHeader.getAbstract() != null) { - this.msaHeader.getAbstract().setStringValue(this.jTextFieldAbstract.getText()); - this.msaHeader.getAbstract().setURL(this.jTextFieldAbstractURL.getText()); + this.msaHeader.setAbstract(this.jTextFieldAbstract.getText()); } else { - AbstractDocument.Abstract mAbstract = AbstractDocument.Abstract.Factory.newInstance(); - mAbstract.setStringValue(this.jTextFieldAbstract.getText()); - mAbstract.setURL(this.jTextFieldAbstractURL.getText()); - this.msaHeader.setAbstract(mAbstract); + + this.msaHeader.setAbstract(this.jTextFieldAbstract.getText()); } this.msaHeader.setModuleType(ModuleTypeDef.Enum.forString(this.jComboBoxModuleType.getSelectedItem() .toString())); diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaLibHeader.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaLibHeader.java index c35c84f6d7..9940f75f47 100644 --- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaLibHeader.java +++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaLibHeader.java @@ -434,11 +434,10 @@ public class MsaLibHeader extends IInternalFrame { this.jTextAreaDescription.setText(this.msaLibHeader.getDescription()); } if (this.msaLibHeader.getSpecification() != null) { - this.jTextFieldSpecification.setText(this.msaLibHeader.getSpecification().getStringValue()); + this.jTextFieldSpecification.setText(this.msaLibHeader.getSpecification()); } if (this.msaLibHeader.getAbstract() != null) { - this.jTextFieldAbstract.setText(this.msaLibHeader.getAbstract().getStringValue()); - this.jTextFieldAbstractURL.setText(this.msaLibHeader.getAbstract().getURL()); + this.jTextFieldAbstract.setText(this.msaLibHeader.getAbstract()); } if (this.msaLibHeader.getModuleType() != null) { this.jComboBoxModuleType.setSelectedItem(this.msaLibHeader.getModuleType().toString()); @@ -704,22 +703,16 @@ public class MsaLibHeader extends IInternalFrame { this.msaLibHeader.setDescription(this.jTextAreaDescription.getText()); if (this.msaLibHeader.getSpecification() != null) { - this.msaLibHeader.getSpecification().setStringValue(this.jTextFieldSpecification.getText()); + this.msaLibHeader.setSpecification(this.jTextFieldSpecification.getText()); } else { - SpecificationDocument.Specification mSpecification = SpecificationDocument.Specification.Factory - .newInstance(); - mSpecification.setStringValue(this.jTextFieldSpecification.getText()); - this.msaLibHeader.setSpecification(mSpecification); + this.msaLibHeader.setSpecification(this.jTextFieldSpecification.getText()); } if (this.msaLibHeader.getAbstract() != null) { - this.msaLibHeader.getAbstract().setStringValue(this.jTextFieldAbstract.getText()); - this.msaLibHeader.getAbstract().setURL(this.jTextFieldAbstractURL.getText()); + this.msaLibHeader.setAbstract(this.jTextFieldAbstract.getText()); } else { - AbstractDocument.Abstract mAbstract = AbstractDocument.Abstract.Factory.newInstance(); - mAbstract.setStringValue(this.jTextFieldAbstract.getText()); - mAbstract.setURL(this.jTextFieldAbstractURL.getText()); - this.msaLibHeader.setAbstract(mAbstract); + + this.msaLibHeader.setAbstract(this.jTextFieldAbstract.getText()); } this.msaLibHeader.setModuleType(ModuleTypeDef.Enum.forString(this.jComboBoxModuleType.getSelectedItem() 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); + } /** -- 2.39.2