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

1. Fix EDKT319 "Can't save when changing value of "PCD Is Driver" on MsaHeader page"

Browse Source 
2. Fix EDKT322 "Remove "Default" from usage to sync with the latest schema"
3. Fix EDKT286 "A rare display mistake in error message dialog box"

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1592 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
hche10x
2006-09-22 02:12:53 +00:00
parent 755585c263
commit d933fc5f1c
4 changed files with 18 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java
View File

@ -353,7 +353,6 @@ public class EnumerationData {
vLibraryUsage.addElement("SOMETIMES_CONSUMED"); vLibraryUsage.addElement("SOMETIMES_CONSUMED");
vLibraryUsage.addElement("ALWAYS_PRODUCED"); vLibraryUsage.addElement("ALWAYS_PRODUCED");
vLibraryUsage.addElement("SOMETIMES_PRODUCED"); vLibraryUsage.addElement("SOMETIMES_PRODUCED");
vLibraryUsage.addElement("DEFAULT");
vLibraryUsage.addElement("PRIVATE"); vLibraryUsage.addElement("PRIVATE");
} }
@ -516,7 +515,6 @@ public class EnumerationData {
vPackageUsage.removeAllElements(); vPackageUsage.removeAllElements();
vPackageUsage.addElement("ALWAYS_CONSUMED"); vPackageUsage.addElement("ALWAYS_CONSUMED");
vPackageUsage.addElement("ALWAYS_PRODUCED"); vPackageUsage.addElement("ALWAYS_PRODUCED");
vPackageUsage.addElement("DEFAULT");
} }
private void initProtocolUsage() { private void initProtocolUsage() {
@ -618,7 +616,6 @@ public class EnumerationData {
vBootModeNames.addElement("MINIMAL"); vBootModeNames.addElement("MINIMAL");
vBootModeNames.addElement("NO_CHANGE"); vBootModeNames.addElement("NO_CHANGE");
vBootModeNames.addElement("DIAGNOSTICS"); vBootModeNames.addElement("DIAGNOSTICS");
vBootModeNames.addElement("DEFAULT");
vBootModeNames.addElement("S2_RESUME"); vBootModeNames.addElement("S2_RESUME");
vBootModeNames.addElement("S3_RESUME"); vBootModeNames.addElement("S3_RESUME");
vBootModeNames.addElement("S4_RESUME"); vBootModeNames.addElement("S4_RESUME");
@ -666,7 +663,6 @@ public class EnumerationData {
vGuidUsage.addElement("SOMETIMES_CONSUMED"); vGuidUsage.addElement("SOMETIMES_CONSUMED");
vGuidUsage.addElement("ALWAYS_PRODUCED"); vGuidUsage.addElement("ALWAYS_PRODUCED");
vGuidUsage.addElement("SOMETIMES_PRODUCED"); vGuidUsage.addElement("SOMETIMES_PRODUCED");
vGuidUsage.addElement("DEFAULT");
vGuidUsage.addElement("PRIVATE"); vGuidUsage.addElement("PRIVATE");
} }
@ -678,24 +674,6 @@ public class EnumerationData {
vExternTypes.addElement(EnumerationData.EXTERNS_DRIVER); vExternTypes.addElement(EnumerationData.EXTERNS_DRIVER);
vExternTypes.addElement(EnumerationData.EXTERNS_LIBRARY); vExternTypes.addElement(EnumerationData.EXTERNS_LIBRARY);
vExternTypes.addElement(EnumerationData.EXTERNS_CALL_BACK); vExternTypes.addElement(EnumerationData.EXTERNS_CALL_BACK);
// vExternTypes.addElement(EnumerationData.EXTERNS_PCD_IS_DRIVER);
//
// vExternTypes.addElement(EnumerationData.EXTERNS_SPECIFICATION);
//
// vExternTypes.addElement(EnumerationData.EXTERNS_MODULE_ENTRY_POINT);
// vExternTypes.addElement(EnumerationData.EXTERNS_MODULE_UNLOAD_IMAGE);
//
// vExternTypes.addElement(EnumerationData.EXTERNS_CONSTRUCTOR);
// vExternTypes.addElement(EnumerationData.EXTERNS_DESTRUCTOR);
// vExternTypes.addElement(EnumerationData.EXTERNS_DRIVER_BINDING);
// vExternTypes.addElement(EnumerationData.EXTERNS_COMPONENT_NAME);
// vExternTypes.addElement(EnumerationData.EXTERNS_DRIVER_CONFIG);
// vExternTypes.addElement(EnumerationData.EXTERNS_DRIVER_DIAG);
//
// vExternTypes.addElement(EnumerationData.EXTERNS_SET_VIRTUAL_ADDRESS_MAP_CALL_BACK);
// vExternTypes.addElement(EnumerationData.EXTERNS_EXIT_BOOT_SERVICES_CALL_BACK);
} }
private void initPcdDriverTypes() { private void initPcdDriverTypes() {
@ -719,7 +697,6 @@ public class EnumerationData {
vPcdUsage.addElement("SOMETIMES_CONSUMED"); vPcdUsage.addElement("SOMETIMES_CONSUMED");
vPcdUsage.addElement("ALWAYS_PRODUCED"); vPcdUsage.addElement("ALWAYS_PRODUCED");
vPcdUsage.addElement("SOMETIMES_PRODUCED"); vPcdUsage.addElement("SOMETIMES_PRODUCED");
vPcdUsage.addElement("DEFAULT");
} }
public Vector<String> getvCompontentType() { public Vector<String> getvCompontentType() {

9
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Log.java
View File

@ -68,11 +68,9 @@ public class Log {
try { try {
//Log.log("Test", "test"); //Log.log("Test", "test");
//Log.err("Test1", "test1"); //Log.err("Test1", "test1");
Log.wrn("1");
Log Log
.wrn( .wrn("aaa bbbbbb cccccccccccc ddddddddddd eeeeeeeeee fffffffffff gggggggggggggggggg hhhhhhhhhhhhhhhhhhhhhhhhhhhhh iiiii jjjj kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk lll mmm nn poooooooooooooooooooooooooooooooooooooooooooop");
"aaa bbbbbb cccccccccccc ddddddddddd eeeeeeeeee fffffffffff gggggggggggggggggg hhhhhhhhhhhhhhhhhhhhhhhhhhhhh", Log.wrn("Incorrect data type for ModuleEntryPoint");
"iiiiii jjjj kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk lll mmm nn poooooooooooooooooooooooooooooooooooooooooooop");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -176,7 +174,8 @@ public class Log {
**/ **/
private static void showWrnMessage(String strErr) { private static void showWrnMessage(String strErr) {
String strReturn = Tools.wrapStringByWord(strErr); String strReturn = Tools.wrapStringByWord(strErr);
JOptionPane.showConfirmDialog(null, strReturn, "Warning", JOptionPane.DEFAULT_OPTION, JOptionPane.ERROR_MESSAGE); JOptionPane
.showConfirmDialog(null, strReturn, "Warning", JOptionPane.DEFAULT_OPTION, JOptionPane.ERROR_MESSAGE);
} }
/** /**

10
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java
View File

@ -354,7 +354,7 @@ public class Tools {
// Finish previous line // Finish previous line
// //
if (!isCopied) { if (!isCopied) {
strReturn = strReturn + strTemp + DataType.UNIX_LINE_SEPARATOR; strReturn = strReturn + strTemp + DataType.LINE_SEPARATOR;
strTemp = ""; strTemp = "";
} }
// //
@ -376,8 +376,12 @@ public class Tools {
strTemp = strTemp + " " + ss; strTemp = strTemp + " " + ss;
continue; continue;
} else { } else {
strReturn = strReturn + strTemp + DataType.UNIX_LINE_SEPARATOR; strReturn = strReturn + strTemp + DataType.LINE_SEPARATOR;
strTemp = ss + " "; if ((index == s.length - 1) && (!ss.equals(""))) {
strReturn = strReturn + ss;
} else {
strTemp = ss + " ";
}
isCopied = true; isCopied = true;
} }
} }

23
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java
View File

@ -640,6 +640,7 @@ public class MsaHeader extends IInternalFrame {
jComboBoxPcdIsDriver.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxPcdIsDriver.setPreferredSize(new java.awt.Dimension(320, 20));
jComboBoxPcdIsDriver.setBounds(new java.awt.Rectangle(160, 530, 320, 20)); jComboBoxPcdIsDriver.setBounds(new java.awt.Rectangle(160, 530, 320, 20));
jComboBoxPcdIsDriver.addItemListener(this); jComboBoxPcdIsDriver.addItemListener(this);
jComboBoxPcdIsDriver.addFocusListener(this);
jComboBoxPcdIsDriver.setEnabled(false); jComboBoxPcdIsDriver.setEnabled(false);
Tools.generateComboBoxByVector(jComboBoxPcdIsDriver, ed.getVPcdDriverTypes()); Tools.generateComboBoxByVector(jComboBoxPcdIsDriver, ed.getVPcdDriverTypes());
} }
@ -889,7 +890,6 @@ public class MsaHeader extends IInternalFrame {
jContentPane.add(jLabelLicense, null); jContentPane.add(jLabelLicense, null);
jContentPane.add(jLabelCopyright, null); jContentPane.add(jLabelCopyright, null);
jContentPane.add(jLabelDescription, null); jContentPane.add(jLabelDescription, null);
// jContentPane.add(jLabelSpecification, null);
jContentPane.add(getJTextFieldSpecification(), null); jContentPane.add(getJTextFieldSpecification(), null);
jContentPane.add(getJButtonOk(), null); jContentPane.add(getJButtonOk(), null);
jContentPane.add(getJButtonCancel(), null); jContentPane.add(getJButtonCancel(), null);
@ -929,8 +929,6 @@ public class MsaHeader extends IInternalFrame {
jStarLabel13.setLocation(new java.awt.Point(0, 480)); jStarLabel13.setLocation(new java.awt.Point(0, 480));
jStarLabel14 = new StarLabel(); jStarLabel14 = new StarLabel();
jStarLabel14.setLocation(new java.awt.Point(0, 505)); jStarLabel14.setLocation(new java.awt.Point(0, 505));
// jStarLabel15 = new StarLabel();
// jStarLabel15.setLocation(new java.awt.Point(0, 530));
jContentPane.add(jStarLabel1, null); jContentPane.add(jStarLabel1, null);
jContentPane.add(jStarLabel2, null); jContentPane.add(jStarLabel2, null);
@ -943,7 +941,6 @@ public class MsaHeader extends IInternalFrame {
jContentPane.add(jStarLabel12, null); jContentPane.add(jStarLabel12, null);
jContentPane.add(jStarLabel13, null); jContentPane.add(jStarLabel13, null);
jContentPane.add(jStarLabel14, null); jContentPane.add(jStarLabel14, null);
// jContentPane.add(jStarLabel15, null);
jContentPane.add(getJScrollPaneCopyright(), null); jContentPane.add(getJScrollPaneCopyright(), null);
jContentPane.add(getJCheckBoxIa32(), null); jContentPane.add(getJCheckBoxIa32(), null);
@ -1411,21 +1408,17 @@ public class MsaHeader extends IInternalFrame {
// //
// Check Pcd is Driver // Check Pcd is Driver
// //
if (arg0.getSource() == this.jCheckBoxPcd) { if (arg0.getSource() == this.jCheckBoxPcd || arg0.getSource() == this.jComboBoxPcdIsDriver) {
if ((this.ex == null) && this.jCheckBoxPcd.isSelected()) { if ((this.ex == null) && this.jCheckBoxPcd.isSelected()) {
this.ex = ExternsDocument.Externs.Factory.newInstance(); this.ex = ExternsDocument.Externs.Factory.newInstance();
this.ex.setPcdIsDriver(PcdDriverTypes.Enum.forString(this.jComboBoxPcdIsDriver.getSelectedItem() this.ex.setPcdIsDriver(PcdDriverTypes.Enum.forString(this.jComboBoxPcdIsDriver.getSelectedItem()
.toString())); .toString()));
this.msa.setExterns(this.ex); this.msa.setExterns(this.ex);
} } else if ((this.ex != null) && (this.ex.getPcdIsDriver() == null) && this.jCheckBoxPcd.isSelected()) {
if ((this.ex != null) && (this.ex.getPcdIsDriver() == null) && this.jCheckBoxPcd.isSelected()) {
this.ex.setPcdIsDriver(PcdDriverTypes.Enum.forString(this.jComboBoxPcdIsDriver.getSelectedItem() this.ex.setPcdIsDriver(PcdDriverTypes.Enum.forString(this.jComboBoxPcdIsDriver.getSelectedItem()
.toString())); .toString()));
this.msa.setExterns(this.ex); this.msa.setExterns(this.ex);
} } else if ((this.ex != null) && (this.ex.getPcdIsDriver() != null)) {
if ((this.ex != null) && (this.ex.getPcdIsDriver() != null)) {
if (this.jCheckBoxPcd.isSelected() if (this.jCheckBoxPcd.isSelected()
&& !this.jComboBoxPcdIsDriver.getSelectedItem().toString().equals( && !this.jComboBoxPcdIsDriver.getSelectedItem().toString().equals(
this.ex.getPcdIsDriver() this.ex.getPcdIsDriver()
@ -1465,14 +1458,10 @@ public class MsaHeader extends IInternalFrame {
this.ex = ExternsDocument.Externs.Factory.newInstance(); this.ex = ExternsDocument.Externs.Factory.newInstance();
this.ex.setTianoR8FlashMapH(this.jCheckBoxFlashMap.isSelected()); this.ex.setTianoR8FlashMapH(this.jCheckBoxFlashMap.isSelected());
this.msa.setExterns(this.ex); this.msa.setExterns(this.ex);
} } else if ((this.ex != null) && this.jCheckBoxFlashMap.isSelected()) {
if ((this.ex != null) && this.jCheckBoxFlashMap.isSelected()) {
this.ex.setTianoR8FlashMapH(this.jCheckBoxFlashMap.isSelected()); this.ex.setTianoR8FlashMapH(this.jCheckBoxFlashMap.isSelected());
this.msa.setExterns(this.ex); this.msa.setExterns(this.ex);
} } else if ((this.ex != null) && !this.jCheckBoxFlashMap.isSelected()) {
if ((this.ex != null) && !this.jCheckBoxFlashMap.isSelected()) {
ExternsDocument.Externs newEx = ExternsDocument.Externs.Factory.newInstance(); ExternsDocument.Externs newEx = ExternsDocument.Externs.Factory.newInstance();
if (this.ex.getExternList() != null) { if (this.ex.getExternList() != null) {
for (int index = 0; index < this.ex.getExternList().size(); index++) { for (int index = 0; index < this.ex.getExternList().size(); index++) {