sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adpate to schema merge.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@572 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jlin16
2006-06-20 08:43:00 +00:00
parent 41eec21d72
commit c082c8cffe
3 changed files with 25 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaHeader.java
View File

@ -462,11 +462,10 @@ public class MsaHeader extends IInternalFrame {
this.jTextAreaDescription.setText(this.msaHeader.getDescription()); this.jTextAreaDescription.setText(this.msaHeader.getDescription());
} }
if (this.msaHeader.getSpecification() != null) { if (this.msaHeader.getSpecification() != null) {
this.jTextFieldSpecification.setText(this.msaHeader.getSpecification().getStringValue()); this.jTextFieldSpecification.setText(this.msaHeader.getSpecification());
} }
if (this.msaHeader.getAbstract() != null) { if (this.msaHeader.getAbstract() != null) {
this.jTextFieldAbstract.setText(this.msaHeader.getAbstract().getStringValue()); this.jTextFieldAbstract.setText(this.msaHeader.getAbstract());
this.jTextFieldAbstractURL.setText(this.msaHeader.getAbstract().getURL());
} }
if (this.msaHeader.getModuleType() != null) { if (this.msaHeader.getModuleType() != null) {
this.jComboBoxModuleType.setSelectedItem(this.msaHeader.getModuleType().toString()); this.jComboBoxModuleType.setSelectedItem(this.msaHeader.getModuleType().toString());
@ -703,22 +702,17 @@ public class MsaHeader extends IInternalFrame {
this.msaHeader.setDescription(this.jTextAreaDescription.getText()); this.msaHeader.setDescription(this.jTextAreaDescription.getText());
if (this.msaHeader.getSpecification() != null) { if (this.msaHeader.getSpecification() != null) {
this.msaHeader.getSpecification().setStringValue(this.jTextFieldSpecification.getText()); this.msaHeader.setSpecification(this.jTextFieldSpecification.getText());
} else { } else {
SpecificationDocument.Specification mSpecification = SpecificationDocument.Specification.Factory
.newInstance(); this.msaHeader.setSpecification(this.jTextFieldSpecification.getText());
mSpecification.setStringValue(this.jTextFieldSpecification.getText());
this.msaHeader.setSpecification(mSpecification);
} }
if (this.msaHeader.getAbstract() != null) { if (this.msaHeader.getAbstract() != null) {
this.msaHeader.getAbstract().setStringValue(this.jTextFieldAbstract.getText()); this.msaHeader.setAbstract(this.jTextFieldAbstract.getText());
this.msaHeader.getAbstract().setURL(this.jTextFieldAbstractURL.getText());
} else { } else {
AbstractDocument.Abstract mAbstract = AbstractDocument.Abstract.Factory.newInstance();
mAbstract.setStringValue(this.jTextFieldAbstract.getText()); this.msaHeader.setAbstract(this.jTextFieldAbstract.getText());
mAbstract.setURL(this.jTextFieldAbstractURL.getText());
this.msaHeader.setAbstract(mAbstract);
} }
this.msaHeader.setModuleType(ModuleTypeDef.Enum.forString(this.jComboBoxModuleType.getSelectedItem() this.msaHeader.setModuleType(ModuleTypeDef.Enum.forString(this.jComboBoxModuleType.getSelectedItem()
.toString())); .toString()));

21
Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaLibHeader.java
View File

@ -434,11 +434,10 @@ public class MsaLibHeader extends IInternalFrame {
this.jTextAreaDescription.setText(this.msaLibHeader.getDescription()); this.jTextAreaDescription.setText(this.msaLibHeader.getDescription());
} }
if (this.msaLibHeader.getSpecification() != null) { if (this.msaLibHeader.getSpecification() != null) {
this.jTextFieldSpecification.setText(this.msaLibHeader.getSpecification().getStringValue()); this.jTextFieldSpecification.setText(this.msaLibHeader.getSpecification());
} }
if (this.msaLibHeader.getAbstract() != null) { if (this.msaLibHeader.getAbstract() != null) {
this.jTextFieldAbstract.setText(this.msaLibHeader.getAbstract().getStringValue()); this.jTextFieldAbstract.setText(this.msaLibHeader.getAbstract());
this.jTextFieldAbstractURL.setText(this.msaLibHeader.getAbstract().getURL());
} }
if (this.msaLibHeader.getModuleType() != null) { if (this.msaLibHeader.getModuleType() != null) {
this.jComboBoxModuleType.setSelectedItem(this.msaLibHeader.getModuleType().toString()); this.jComboBoxModuleType.setSelectedItem(this.msaLibHeader.getModuleType().toString());
@ -704,22 +703,16 @@ public class MsaLibHeader extends IInternalFrame {
this.msaLibHeader.setDescription(this.jTextAreaDescription.getText()); this.msaLibHeader.setDescription(this.jTextAreaDescription.getText());
if (this.msaLibHeader.getSpecification() != null) { if (this.msaLibHeader.getSpecification() != null) {
this.msaLibHeader.getSpecification().setStringValue(this.jTextFieldSpecification.getText()); this.msaLibHeader.setSpecification(this.jTextFieldSpecification.getText());
} else { } else {
SpecificationDocument.Specification mSpecification = SpecificationDocument.Specification.Factory this.msaLibHeader.setSpecification(this.jTextFieldSpecification.getText());
.newInstance();
mSpecification.setStringValue(this.jTextFieldSpecification.getText());
this.msaLibHeader.setSpecification(mSpecification);
} }
if (this.msaLibHeader.getAbstract() != null) { if (this.msaLibHeader.getAbstract() != null) {
this.msaLibHeader.getAbstract().setStringValue(this.jTextFieldAbstract.getText()); this.msaLibHeader.setAbstract(this.jTextFieldAbstract.getText());
this.msaLibHeader.getAbstract().setURL(this.jTextFieldAbstractURL.getText());
} else { } else {
AbstractDocument.Abstract mAbstract = AbstractDocument.Abstract.Factory.newInstance();
mAbstract.setStringValue(this.jTextFieldAbstract.getText()); this.msaLibHeader.setAbstract(this.jTextFieldAbstract.getText());
mAbstract.setURL(this.jTextFieldAbstractURL.getText());
this.msaLibHeader.setAbstract(mAbstract);
} }
this.msaLibHeader.setModuleType(ModuleTypeDef.Enum.forString(this.jComboBoxModuleType.getSelectedItem() this.msaLibHeader.setModuleType(ModuleTypeDef.Enum.forString(this.jComboBoxModuleType.getSelectedItem()

43
Tools/Source/PackageEditor/src/org/tianocore/packaging/SpdFileContents.java
View File

@ -67,12 +67,8 @@ public class SpdFileContents {
private GuidDocument.Guid spdHdrGuid = null; private GuidDocument.Guid spdHdrGuid = null;
private AbstractDocument.Abstract spdHdrAbs = null;
private LicenseDocument.License spdHdrLicense = null; private LicenseDocument.License spdHdrLicense = null;
private SpecificationDocument.Specification spdHdrSpec = null;
private OutputDirectoryDocument.OutputDirectory spdHdrOutDir = null; private OutputDirectoryDocument.OutputDirectory spdHdrOutDir = null;
private LibraryClassDeclarationsDocument.LibraryClassDeclarations spdLibClassDeclarations = null; private LibraryClassDeclarationsDocument.LibraryClassDeclarations spdLibClassDeclarations = null;
@ -212,7 +208,7 @@ public class SpdFileContents {
s[0] = getSpdHdrPkgName(); s[0] = getSpdHdrPkgName();
s[1] = getSpdHdrGuid().getStringValue(); s[1] = getSpdHdrGuid().getStringValue();
s[2] = getSpdHdrVer(); s[2] = getSpdHdrVer();
s[3] = getSpdHdrAbs().getStringValue(); s[3] = getSpdHdrAbs();
s[4] = getSpdHdr().getDescription(); s[4] = getSpdHdr().getDescription();
s[5] = getSpdHdr().getCopyright(); s[5] = getSpdHdr().getCopyright();
s[6] = getSpdHdrLicense().getStringValue(); s[6] = getSpdHdrLicense().getStringValue();
@ -1030,11 +1026,9 @@ public class SpdFileContents {
@return AbstractDocument.Abstract @return AbstractDocument.Abstract
**/ **/
public AbstractDocument.Abstract getSpdHdrAbs() { public String getSpdHdrAbs() {
if (spdHdrAbs == null) {
spdHdrAbs = getSpdHdr().getAbstract(); return getSpdHdr().getAbstract();
}
return spdHdrAbs;
} }
/** /**
@ -1043,13 +1037,7 @@ public class SpdFileContents {
@param abs The value set to Abstract element @param abs The value set to Abstract element
**/ **/
public void setSpdHdrAbs(String abs) { public void setSpdHdrAbs(String abs) {
getSpdHdr().setAbstract(abs);
if (getSpdHdrAbs() != null) {
getSpdHdrAbs().setStringValue(abs);
} else {
spdHdrAbs = getSpdHdr().addNewAbstract();
spdHdrAbs.setStringValue(abs);
}
} }
/** /**
@ -1128,7 +1116,7 @@ public class SpdFileContents {
**/ **/
public void setSpdHdrVer(String ver) { public void setSpdHdrVer(String ver) {
if (spdHdr != null) { 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 Reserved method
@ -1229,12 +1209,9 @@ public class SpdFileContents {
if (spec == null) { if (spec == null) {
return; return;
} }
if (getSpdHdrSpec() != null) {
getSpdHdrSpec().setStringValue(spec); getSpdHdr().setSpecification(spec);
} else {
spdHdrSpec = getSpdHdr().addNewSpecification();
spdHdrSpec.setStringValue(spec);
}
} }
/** /**