tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1. Fix EDKT496 Framework Wizard should allow user to pick up a Protocol Guid to tag Guid HOB 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2151 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
hche10x 2006-12-29 07:23:14 +00:00
parent d6203412a9
commit 55683eab3a
10 changed files with 190 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IComboBox.java
View File

@ -192,4 +192,36 @@ public class IComboBox extends JComboBox implements KeyListener, MouseListener,
this.setEditable(false); this.setEditable(false);
this.getEditor().setItem(""); this.getEditor().setItem("");
} }
/**
Set the input item as selected
@param item the item which is needed to be set selected
**/
public void setSelectedItem(Object item) {
boolean isFind = false;
//
// If the input value is not in the default list, add it to the list
//
if (item != null) {
for (int index = 0; index < this.getItemCount(); index++) {
if (this.getItemAt(index).equals(item)) {
isFind = true;
break;
}
}
//
// Add this item to IComboBox if not found
//
if (!isFind && !item.toString().equals("")) {
super.addItem(item);
}
}
//
// Call super function to set the item selected.
//
super.setSelectedItem(item);
}
} }

35
Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java
View File

@ -31,6 +31,7 @@ import org.tianocore.frameworkwizard.common.EnumerationData;
import org.tianocore.frameworkwizard.common.Log; import org.tianocore.frameworkwizard.common.Log;
import org.tianocore.frameworkwizard.common.Tools; import org.tianocore.frameworkwizard.common.Tools;
import org.tianocore.frameworkwizard.common.ui.ArchCheckBox; import org.tianocore.frameworkwizard.common.ui.ArchCheckBox;
import org.tianocore.frameworkwizard.common.ui.IComboBox;
import org.tianocore.frameworkwizard.common.ui.IDialog; import org.tianocore.frameworkwizard.common.ui.IDialog;
import org.tianocore.frameworkwizard.common.ui.IFrame; import org.tianocore.frameworkwizard.common.ui.IFrame;
import org.tianocore.frameworkwizard.common.ui.StarLabel; import org.tianocore.frameworkwizard.common.ui.StarLabel;
@ -62,7 +63,7 @@ public class EventsDlg extends IDialog {
private JLabel jLabelC_Name = null; private JLabel jLabelC_Name = null;
private JComboBox jComboBoxGuidC_Name = null; private IComboBox iComboBoxGuidC_Name = null;
private JLabel jLabelUsage = null; private JLabel jLabelUsage = null;
@ -136,14 +137,14 @@ public class EventsDlg extends IDialog {
* @return javax.swing.JTextField jTextFieldC_Name * @return javax.swing.JTextField jTextFieldC_Name
* *
*/ */
private JComboBox getJComboBoxGuidC_Name() { private IComboBox getIComboBoxGuidC_Name() {
if (jComboBoxGuidC_Name == null) { if (iComboBoxGuidC_Name == null) {
jComboBoxGuidC_Name = new JComboBox(); iComboBoxGuidC_Name = new IComboBox();
jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(168, 37, 320, 20)); iComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(168, 37, 320, 20));
jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20)); iComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));
jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Event"); iComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Event");
} }
return jComboBoxGuidC_Name; return iComboBoxGuidC_Name;
} }
/** /**
@ -327,11 +328,11 @@ public class EventsDlg extends IDialog {
// Init guids drop down list // Init guids drop down list
// //
Tools Tools
.generateComboBoxByVector(jComboBoxGuidC_Name, .generateComboBoxByVector(iComboBoxGuidC_Name,
wt.getAllGuidDeclarationsFromPackages(vpid, EnumerationData.GUID_TYPE_EFI_EVENT)); wt.getAllGuidDeclarationsFromPackages(vpid, EnumerationData.GUID_TYPE_EFI_EVENT));
if (this.id != null) { if (this.id != null) {
this.jComboBoxGuidC_Name.setSelectedItem(id.getName()); this.iComboBoxGuidC_Name.setSelectedItem(id.getName());
this.jComboBoxEventsType.setSelectedItem(id.getType()); this.jComboBoxEventsType.setSelectedItem(id.getType());
this.jComboBoxUsage.setSelectedItem(id.getUsage()); this.jComboBoxUsage.setSelectedItem(id.getUsage());
this.jTextAreaHelpText.setText(id.getHelp()); this.jTextAreaHelpText.setText(id.getHelp());
@ -363,7 +364,7 @@ public class EventsDlg extends IDialog {
*/ */
public void setViewMode(boolean isView) { public void setViewMode(boolean isView) {
if (isView) { if (isView) {
this.jComboBoxGuidC_Name.setEnabled(!isView); this.iComboBoxGuidC_Name.setEnabled(!isView);
this.jComboBoxUsage.setEnabled(!isView); this.jComboBoxUsage.setEnabled(!isView);
} }
} }
@ -425,7 +426,7 @@ public class EventsDlg extends IDialog {
jContentPane.add(getJComboBoxEventsType(), null); jContentPane.add(getJComboBoxEventsType(), null);
jContentPane.add(jStarLabel2, null); jContentPane.add(jStarLabel2, null);
jContentPane.add(jLabelC_Name, null); jContentPane.add(jLabelC_Name, null);
jContentPane.add(getJComboBoxGuidC_Name(), null); jContentPane.add(getIComboBoxGuidC_Name(), null);
jContentPane.add(jStarLabel3, null); jContentPane.add(jStarLabel3, null);
jContentPane.add(jLabelGroup, null); jContentPane.add(jLabelGroup, null);
jContentPane.add(getJComboBoxEventGroup(), null); jContentPane.add(getJComboBoxEventGroup(), null);
@ -493,7 +494,7 @@ public class EventsDlg extends IDialog {
// //
// Check Name // Check Name
// //
if (this.jComboBoxGuidC_Name.getSelectedItem() == null) { if (this.iComboBoxGuidC_Name.getSelectedItem() == null) {
Log.wrn("Update Guids", "Please select one Event Name"); Log.wrn("Update Guids", "Please select one Event Name");
return false; return false;
} }
@ -501,13 +502,13 @@ public class EventsDlg extends IDialog {
// //
// Check Name // Check Name
// //
if (isEmpty(this.jComboBoxGuidC_Name.getSelectedItem().toString())) { if (isEmpty(this.iComboBoxGuidC_Name.getSelectedItem().toString())) {
Log.wrn("Update Events", "Event Name couldn't be empty"); Log.wrn("Update Events", "Event Name couldn't be empty");
return false; return false;
} }
if (!isEmpty(this.jComboBoxGuidC_Name.getSelectedItem().toString())) { if (!isEmpty(this.iComboBoxGuidC_Name.getSelectedItem().toString())) {
if (!DataValidation.isC_NameType(this.jComboBoxGuidC_Name.getSelectedItem().toString())) { if (!DataValidation.isC_NameType(this.iComboBoxGuidC_Name.getSelectedItem().toString())) {
Log.wrn("Update Events", "Incorrect data type for Event Name"); Log.wrn("Update Events", "Incorrect data type for Event Name");
return false; return false;
} }
@ -527,7 +528,7 @@ public class EventsDlg extends IDialog {
} }
private EventsIdentification getCurrentEvents() { private EventsIdentification getCurrentEvents() {
String arg0 = this.jComboBoxGuidC_Name.getSelectedItem().toString(); String arg0 = this.iComboBoxGuidC_Name.getSelectedItem().toString();
String arg1 = this.jComboBoxEventsType.getSelectedItem().toString(); String arg1 = this.jComboBoxEventsType.getSelectedItem().toString();
String arg2 = this.jComboBoxUsage.getSelectedItem().toString(); String arg2 = this.jComboBoxUsage.getSelectedItem().toString();

32
Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java
View File

@ -30,6 +30,7 @@ import org.tianocore.frameworkwizard.common.EnumerationData;
import org.tianocore.frameworkwizard.common.Log; import org.tianocore.frameworkwizard.common.Log;
import org.tianocore.frameworkwizard.common.Tools; import org.tianocore.frameworkwizard.common.Tools;
import org.tianocore.frameworkwizard.common.ui.ArchCheckBox; import org.tianocore.frameworkwizard.common.ui.ArchCheckBox;
import org.tianocore.frameworkwizard.common.ui.IComboBox;
import org.tianocore.frameworkwizard.common.ui.IDialog; import org.tianocore.frameworkwizard.common.ui.IDialog;
import org.tianocore.frameworkwizard.common.ui.IFrame; import org.tianocore.frameworkwizard.common.ui.IFrame;
import org.tianocore.frameworkwizard.common.ui.StarLabel; import org.tianocore.frameworkwizard.common.ui.StarLabel;
@ -58,7 +59,7 @@ public class GuidsDlg extends IDialog {
private JLabel jLabelC_Name = null; private JLabel jLabelC_Name = null;
private JComboBox jComboBoxCName = null; private IComboBox iComboBoxCName = null;
private JLabel jLabelUsage = null; private JLabel jLabelUsage = null;
@ -103,14 +104,14 @@ public class GuidsDlg extends IDialog {
* @return javax.swing.JTextField jTextFieldC_Name * @return javax.swing.JTextField jTextFieldC_Name
* *
*/ */
private JComboBox getJComboBoxCName() { private IComboBox getIComboBoxCName() {
if (jComboBoxCName == null) { if (iComboBoxCName == null) {
jComboBoxCName = new JComboBox(); iComboBoxCName = new IComboBox();
jComboBoxCName.setBounds(new java.awt.Rectangle(168, 12, 320, 20)); iComboBoxCName.setBounds(new java.awt.Rectangle(168, 12, 320, 20));
jComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20)); iComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20));
jComboBoxCName.setToolTipText("Select the C Name of the GUID"); iComboBoxCName.setToolTipText("Select the C Name of the GUID");
} }
return jComboBoxCName; return iComboBoxCName;
} }
/** /**
@ -274,12 +275,13 @@ public class GuidsDlg extends IDialog {
Log.wrn("Init Guid", "This module hasn't defined any package dependency, so there is no guid can be added"); Log.wrn("Init Guid", "This module hasn't defined any package dependency, so there is no guid can be added");
} }
Tools.generateComboBoxByVector(this.jComboBoxCName, Tools.generateComboBoxByVector(this.iComboBoxCName,
wt.getAllGuidDeclarationsFromPackages(wt.getPackageDependenciesOfModule(mid), wt.getAllGuidDeclarationsFromPackages(wt.getPackageDependenciesOfModule(mid),
EnumerationData.GUID_TYPE_GUID)); EnumerationData.GUID_TYPE_GUID));
if (this.id != null) { if (this.id != null) {
this.jComboBoxCName.setSelectedItem(id.getName()); this.iComboBoxCName.setSelectedItem(id.getName());
this.jComboBoxUsage.setSelectedItem(id.getUsage()); this.jComboBoxUsage.setSelectedItem(id.getUsage());
this.jTextAreaHelpText.setText(id.getHelp()); this.jTextAreaHelpText.setText(id.getHelp());
this.jTextFieldFeatureFlag.setText(id.getFeatureFlag()); this.jTextFieldFeatureFlag.setText(id.getFeatureFlag());
@ -354,7 +356,7 @@ public class GuidsDlg extends IDialog {
jContentPane.add(jStarLabel1, null); jContentPane.add(jStarLabel1, null);
jContentPane.add(jLabelC_Name, null); jContentPane.add(jLabelC_Name, null);
jContentPane.add(getJComboBoxCName(), null); jContentPane.add(getIComboBoxCName(), null);
jContentPane.add(jStarLabel2, null); jContentPane.add(jStarLabel2, null);
jContentPane.add(jLabelUsage, null); jContentPane.add(jLabelUsage, null);
jContentPane.add(getJComboBoxUsage(), null); jContentPane.add(getJComboBoxUsage(), null);
@ -416,13 +418,13 @@ public class GuidsDlg extends IDialog {
// //
// Check Name // Check Name
// //
if (this.jComboBoxCName.getSelectedItem() == null) { if (this.iComboBoxCName.getSelectedItem() == null) {
Log.wrn("Update Guids", "Please select one Guid Name"); Log.wrn("Update Guids", "Please select one Guid Name");
return false; return false;
} }
if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) { if (!isEmpty(this.iComboBoxCName.getSelectedItem().toString())) {
if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) { if (!DataValidation.isC_NameType(this.iComboBoxCName.getSelectedItem().toString())) {
Log.wrn("Update Guids", "Incorrect data type for Guid Name"); Log.wrn("Update Guids", "Incorrect data type for Guid Name");
return false; return false;
} }
@ -442,7 +444,7 @@ public class GuidsDlg extends IDialog {
} }
private GuidsIdentification getCurrentGuids() { private GuidsIdentification getCurrentGuids() {
String arg0 = this.jComboBoxCName.getSelectedItem().toString(); String arg0 = this.iComboBoxCName.getSelectedItem().toString();
String arg1 = this.jComboBoxUsage.getSelectedItem().toString(); String arg1 = this.jComboBoxUsage.getSelectedItem().toString();
String arg2 = this.jTextFieldFeatureFlag.getText(); String arg2 = this.jTextFieldFeatureFlag.getText();

35
Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java
View File

@ -31,6 +31,7 @@ import org.tianocore.frameworkwizard.common.EnumerationData;
import org.tianocore.frameworkwizard.common.Log; import org.tianocore.frameworkwizard.common.Log;
import org.tianocore.frameworkwizard.common.Tools; import org.tianocore.frameworkwizard.common.Tools;
import org.tianocore.frameworkwizard.common.ui.ArchCheckBox; import org.tianocore.frameworkwizard.common.ui.ArchCheckBox;
import org.tianocore.frameworkwizard.common.ui.IComboBox;
import org.tianocore.frameworkwizard.common.ui.IDialog; import org.tianocore.frameworkwizard.common.ui.IDialog;
import org.tianocore.frameworkwizard.common.ui.IFrame; import org.tianocore.frameworkwizard.common.ui.IFrame;
import org.tianocore.frameworkwizard.common.ui.StarLabel; import org.tianocore.frameworkwizard.common.ui.StarLabel;
@ -59,7 +60,7 @@ public class HobsDlg extends IDialog {
private JLabel jLabelC_Name = null; private JLabel jLabelC_Name = null;
private JComboBox jComboBoxGuidC_Name = null; private IComboBox iComboBoxGuidC_Name = null;
private JLabel jLabelUsage = null; private JLabel jLabelUsage = null;
@ -110,14 +111,14 @@ public class HobsDlg extends IDialog {
* @return javax.swing.JTextField jTextFieldC_Name * @return javax.swing.JTextField jTextFieldC_Name
* *
*/ */
private JComboBox getJComboBoxGuidC_Name() { private IComboBox getIComboBoxGuidC_Name() {
if (jComboBoxGuidC_Name == null) { if (iComboBoxGuidC_Name == null) {
jComboBoxGuidC_Name = new JComboBox(); iComboBoxGuidC_Name = new IComboBox();
jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(168, 12, 320, 20)); iComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(168, 12, 320, 20));
jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20)); iComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));
jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Hob"); iComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Hob");
} }
return jComboBoxGuidC_Name; return iComboBoxGuidC_Name;
} }
/** /**
@ -307,12 +308,12 @@ public class HobsDlg extends IDialog {
// Init guids drop down list // Init guids drop down list
// //
Tools Tools
.generateComboBoxByVector(jComboBoxGuidC_Name, .generateComboBoxByVector(iComboBoxGuidC_Name,
wt.getAllGuidDeclarationsFromPackages(vpid, EnumerationData.GUID_TYPE_HOB)); wt.getAllGuidDeclarationsFromPackages(vpid, EnumerationData.GUID_TYPE_HOB));
if (this.id != null) { if (this.id != null) {
this.jComboBoxGuidC_Name.setSelectedItem(id.getName()); this.iComboBoxGuidC_Name.setSelectedItem(id.getName());
this.jComboBoxHobType.setSelectedItem(id.getType()); this.jComboBoxHobType.setSelectedItem(id.getType());
this.jComboBoxUsage.setSelectedItem(id.getUsage()); this.jComboBoxUsage.setSelectedItem(id.getUsage());
this.jTextAreaHelpText.setText(id.getHelp()); this.jTextAreaHelpText.setText(id.getHelp());
@ -342,7 +343,7 @@ public class HobsDlg extends IDialog {
*/ */
public void setViewMode(boolean isView) { public void setViewMode(boolean isView) {
if (isView) { if (isView) {
this.jComboBoxGuidC_Name.setEnabled(!isView); this.iComboBoxGuidC_Name.setEnabled(!isView);
this.jComboBoxUsage.setEnabled(!isView); this.jComboBoxUsage.setEnabled(!isView);
this.jComboBoxHobType.setEnabled(!isView); this.jComboBoxHobType.setEnabled(!isView);
} }
@ -396,7 +397,7 @@ public class HobsDlg extends IDialog {
jContentPane.add(jStarLabel1, null); jContentPane.add(jStarLabel1, null);
jContentPane.add(jLabelC_Name, null); jContentPane.add(jLabelC_Name, null);
jContentPane.add(getJComboBoxGuidC_Name(), null); jContentPane.add(getIComboBoxGuidC_Name(), null);
jContentPane.add(jStarLabel2, null); jContentPane.add(jStarLabel2, null);
jContentPane.add(jLabelHobType, null); jContentPane.add(jLabelHobType, null);
jContentPane.add(getJComboBoxHobType(), null); jContentPane.add(getJComboBoxHobType(), null);
@ -462,20 +463,20 @@ public class HobsDlg extends IDialog {
// //
// Check Name // Check Name
// //
if (this.jComboBoxGuidC_Name.getSelectedItem() == null) { if (this.iComboBoxGuidC_Name.getSelectedItem() == null) {
Log.wrn("Update Guids", "Please select one Hob Name"); Log.wrn("Update Guids", "Please select one Hob Name");
return false; return false;
} }
// //
// Check Name // Check Name
// //
if (isEmpty(this.jComboBoxGuidC_Name.getSelectedItem().toString())) { if (isEmpty(this.iComboBoxGuidC_Name.getSelectedItem().toString())) {
Log.wrn("Update Hobs", "Hob Guid C Name must be entered!"); Log.wrn("Update Hobs", "Hob Guid C Name must be entered!");
return false; return false;
} }
if (!isEmpty(this.jComboBoxGuidC_Name.getSelectedItem().toString())) { if (!isEmpty(this.iComboBoxGuidC_Name.getSelectedItem().toString())) {
if (!DataValidation.isC_NameType(this.jComboBoxGuidC_Name.getSelectedItem().toString())) { if (!DataValidation.isC_NameType(this.iComboBoxGuidC_Name.getSelectedItem().toString())) {
Log.wrn("Update Hobs", "Incorrect data type for Hob Name"); Log.wrn("Update Hobs", "Incorrect data type for Hob Name");
return false; return false;
} }
@ -495,7 +496,7 @@ public class HobsDlg extends IDialog {
} }
private HobsIdentification getCurrentHobs() { private HobsIdentification getCurrentHobs() {
String arg0 = this.jComboBoxGuidC_Name.getSelectedItem().toString(); String arg0 = this.iComboBoxGuidC_Name.getSelectedItem().toString();
String arg1 = this.jComboBoxHobType.getSelectedItem().toString(); String arg1 = this.jComboBoxHobType.getSelectedItem().toString();
String arg2 = this.jComboBoxUsage.getSelectedItem().toString(); String arg2 = this.jComboBoxUsage.getSelectedItem().toString();

33
Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java
View File

@ -32,6 +32,7 @@ import org.tianocore.frameworkwizard.common.Log;
import org.tianocore.frameworkwizard.common.Tools; import org.tianocore.frameworkwizard.common.Tools;
import org.tianocore.frameworkwizard.common.find.Find; import org.tianocore.frameworkwizard.common.find.Find;
import org.tianocore.frameworkwizard.common.ui.ArchCheckBox; import org.tianocore.frameworkwizard.common.ui.ArchCheckBox;
import org.tianocore.frameworkwizard.common.ui.IComboBox;
import org.tianocore.frameworkwizard.common.ui.IDialog; import org.tianocore.frameworkwizard.common.ui.IDialog;
import org.tianocore.frameworkwizard.common.ui.IFrame; import org.tianocore.frameworkwizard.common.ui.IFrame;
import org.tianocore.frameworkwizard.common.ui.StarLabel; import org.tianocore.frameworkwizard.common.ui.StarLabel;
@ -60,7 +61,7 @@ public class LibraryClassDefsDlg extends IDialog {
// //
private JPanel jContentPane = null; private JPanel jContentPane = null;
private JComboBox jComboBoxLibraryClassName = null; private IComboBox iComboBoxLibraryClassName = null;
private JLabel jLabelUsage = null; private JLabel jLabelUsage = null;
@ -121,14 +122,14 @@ public class LibraryClassDefsDlg extends IDialog {
@return javax.swing.JComboBox jComboBoxSelect @return javax.swing.JComboBox jComboBoxSelect
**/ **/
private JComboBox getJComboBoxLibraryClassName() { private IComboBox getIComboBoxLibraryClassName() {
if (jComboBoxLibraryClassName == null) { if (iComboBoxLibraryClassName == null) {
jComboBoxLibraryClassName = new JComboBox(); iComboBoxLibraryClassName = new IComboBox();
jComboBoxLibraryClassName.setBounds(new java.awt.Rectangle(168, 12, 320, 20)); iComboBoxLibraryClassName.setBounds(new java.awt.Rectangle(168, 12, 320, 20));
jComboBoxLibraryClassName.setPreferredSize(new Dimension(320, 20)); iComboBoxLibraryClassName.setPreferredSize(new Dimension(320, 20));
jComboBoxLibraryClassName.setEnabled(true); iComboBoxLibraryClassName.setEnabled(true);
} }
return jComboBoxLibraryClassName; return iComboBoxLibraryClassName;
} }
/** /**
@ -349,13 +350,13 @@ public class LibraryClassDefsDlg extends IDialog {
Tools Tools
.generateComboBoxByVector( .generateComboBoxByVector(
this.jComboBoxLibraryClassName, this.iComboBoxLibraryClassName,
wt wt
.getAllLibraryClassDefinitionsFromPackages(wt .getAllLibraryClassDefinitionsFromPackages(wt
.getPackageDependenciesOfModule(mid))); .getPackageDependenciesOfModule(mid)));
if (lcid != null) { if (lcid != null) {
this.jComboBoxLibraryClassName.setSelectedItem(lcid.getLibraryClassName()); this.iComboBoxLibraryClassName.setSelectedItem(lcid.getLibraryClassName());
this.jComboBoxUsage.setSelectedItem(lcid.getUsage()); this.jComboBoxUsage.setSelectedItem(lcid.getUsage());
this.jTextFieldRecommendedInstanceVersion.setText(lcid.getRecommendedInstanceVersion()); this.jTextFieldRecommendedInstanceVersion.setText(lcid.getRecommendedInstanceVersion());
this.jTextFieldRecommendedInstanceGuid.setText(lcid.getRecommendedInstanceGuid()); this.jTextFieldRecommendedInstanceGuid.setText(lcid.getRecommendedInstanceGuid());
@ -375,7 +376,7 @@ public class LibraryClassDefsDlg extends IDialog {
**/ **/
public void setViewMode(boolean isView) { public void setViewMode(boolean isView) {
if (isView) { if (isView) {
this.jComboBoxLibraryClassName.setEnabled(!isView); this.iComboBoxLibraryClassName.setEnabled(!isView);
this.jComboBoxUsage.setEnabled(!isView); this.jComboBoxUsage.setEnabled(!isView);
} }
} }
@ -422,7 +423,7 @@ public class LibraryClassDefsDlg extends IDialog {
jContentPane.setLayout(null); jContentPane.setLayout(null);
jContentPane.setPreferredSize(new java.awt.Dimension(495, 255)); jContentPane.setPreferredSize(new java.awt.Dimension(495, 255));
jContentPane.add(getJComboBoxLibraryClassName(), null); jContentPane.add(getIComboBoxLibraryClassName(), null);
jContentPane.add(jLabelUsage, null); jContentPane.add(jLabelUsage, null);
jContentPane.add(getJComboBoxUsage(), null); jContentPane.add(getJComboBoxUsage(), null);
jContentPane.add(jLabelLibraryClassName, null); jContentPane.add(jLabelLibraryClassName, null);
@ -497,11 +498,11 @@ public class LibraryClassDefsDlg extends IDialog {
// //
// Check LibraryClass // Check LibraryClass
// //
if (this.jComboBoxLibraryClassName.getSelectedItem() == null) { if (this.iComboBoxLibraryClassName.getSelectedItem() == null) {
Log.wrn("Update Library Class Definitions", "Please select one Library Class"); Log.wrn("Update Library Class Definitions", "Please select one Library Class");
return false; return false;
} }
if (!DataValidation.isLibraryClass(this.jComboBoxLibraryClassName.getSelectedItem().toString())) { if (!DataValidation.isLibraryClass(this.iComboBoxLibraryClassName.getSelectedItem().toString())) {
Log.wrn("Update Library Class Definitions", "Incorrect data type for Library Class"); Log.wrn("Update Library Class Definitions", "Incorrect data type for Library Class");
return false; return false;
} }
@ -548,7 +549,7 @@ public class LibraryClassDefsDlg extends IDialog {
boolean isFind = false; boolean isFind = false;
for (int index = 0; index < v.size(); index++) { for (int index = 0; index < v.size(); index++) {
LibraryClassIdentification lid = v.getLibraryClass(index); LibraryClassIdentification lid = v.getLibraryClass(index);
if (lid.getLibraryClassName().equals(this.jComboBoxLibraryClassName.getSelectedItem().toString())) { if (lid.getLibraryClassName().equals(this.iComboBoxLibraryClassName.getSelectedItem().toString())) {
if (lid.getUsage().equals(DataType.USAGE_TYPE_ALWAYS_PRODUCED) if (lid.getUsage().equals(DataType.USAGE_TYPE_ALWAYS_PRODUCED)
|| lid.getUsage().equals(DataType.USAGE_TYPE_SOMETIMES_PRODUCED)) { || lid.getUsage().equals(DataType.USAGE_TYPE_SOMETIMES_PRODUCED)) {
isFind = true; isFind = true;
@ -566,7 +567,7 @@ public class LibraryClassDefsDlg extends IDialog {
} }
private LibraryClassIdentification getCurrentLibraryClass() { private LibraryClassIdentification getCurrentLibraryClass() {
String name = this.jComboBoxLibraryClassName.getSelectedItem().toString(); String name = this.iComboBoxLibraryClassName.getSelectedItem().toString();
String usage = this.jComboBoxUsage.getSelectedItem().toString(); String usage = this.jComboBoxUsage.getSelectedItem().toString();
String version = this.jTextFieldRecommendedInstanceVersion.getText(); String version = this.jTextFieldRecommendedInstanceVersion.getText();
String guid = this.jTextFieldRecommendedInstanceGuid.getText(); String guid = this.jTextFieldRecommendedInstanceGuid.getText();

31
Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java
View File

@ -33,6 +33,7 @@ import org.tianocore.frameworkwizard.common.EnumerationData;
import org.tianocore.frameworkwizard.common.Log; import org.tianocore.frameworkwizard.common.Log;
import org.tianocore.frameworkwizard.common.Tools; import org.tianocore.frameworkwizard.common.Tools;
import org.tianocore.frameworkwizard.common.ui.ArchCheckBox; import org.tianocore.frameworkwizard.common.ui.ArchCheckBox;
import org.tianocore.frameworkwizard.common.ui.IComboBox;
import org.tianocore.frameworkwizard.common.ui.IDialog; import org.tianocore.frameworkwizard.common.ui.IDialog;
import org.tianocore.frameworkwizard.common.ui.IFrame; import org.tianocore.frameworkwizard.common.ui.IFrame;
import org.tianocore.frameworkwizard.common.ui.StarLabel; import org.tianocore.frameworkwizard.common.ui.StarLabel;
@ -61,7 +62,7 @@ public class PpisDlg extends IDialog implements ItemListener {
private JLabel jLabelC_Name = null; private JLabel jLabelC_Name = null;
private JComboBox jComboBoxCName = null; private IComboBox iComboBoxCName = null;
private JTextField jTextFieldFeatureFlag = null; private JTextField jTextFieldFeatureFlag = null;
@ -129,14 +130,14 @@ public class PpisDlg extends IDialog implements ItemListener {
* @return javax.swing.JTextField jTextFieldC_Name * @return javax.swing.JTextField jTextFieldC_Name
* *
*/ */
private JComboBox getJComboBoxCName() { private IComboBox getIComboBoxCName() {
if (jComboBoxCName == null) { if (iComboBoxCName == null) {
jComboBoxCName = new JComboBox(); iComboBoxCName = new IComboBox();
jComboBoxCName.setBounds(new java.awt.Rectangle(168, 37, 320, 20)); iComboBoxCName.setBounds(new java.awt.Rectangle(168, 37, 320, 20));
jComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20)); iComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20));
jComboBoxCName.setToolTipText("Select Guid C Name of PPI"); iComboBoxCName.setToolTipText("Select Guid C Name of PPI");
} }
return jComboBoxCName; return iComboBoxCName;
} }
/** /**
@ -288,11 +289,11 @@ public class PpisDlg extends IDialog implements ItemListener {
Log.wrn("Init Ppi", "This module hasn't defined any package dependency, so there is no ppi can be added"); Log.wrn("Init Ppi", "This module hasn't defined any package dependency, so there is no ppi can be added");
} }
Tools.generateComboBoxByVector(this.jComboBoxCName, Tools.generateComboBoxByVector(this.iComboBoxCName,
wt.getAllPpiDeclarationsFromPackages(wt.getPackageDependenciesOfModule(mid))); wt.getAllPpiDeclarationsFromPackages(wt.getPackageDependenciesOfModule(mid)));
if (this.id != null) { if (this.id != null) {
this.jComboBoxCName.setSelectedItem(id.getName()); this.iComboBoxCName.setSelectedItem(id.getName());
this.jComboBoxPpiType.setSelectedItem(id.getType()); this.jComboBoxPpiType.setSelectedItem(id.getType());
this.jComboBoxUsage.setSelectedItem(id.getUsage()); this.jComboBoxUsage.setSelectedItem(id.getUsage());
this.jTextAreaHelpText.setText(id.getHelp()); this.jTextAreaHelpText.setText(id.getHelp());
@ -364,7 +365,7 @@ public class PpisDlg extends IDialog implements ItemListener {
jContentPane.add(getJComboBoxPpiType(), null); jContentPane.add(getJComboBoxPpiType(), null);
jContentPane.add(jStarLabel2, null); jContentPane.add(jStarLabel2, null);
jContentPane.add(jLabelC_Name, null); jContentPane.add(jLabelC_Name, null);
jContentPane.add(getJComboBoxCName(), null); jContentPane.add(getIComboBoxCName(), null);
jContentPane.add(jStarLabel3, null); jContentPane.add(jStarLabel3, null);
jContentPane.add(jLabelUsage, null); jContentPane.add(jLabelUsage, null);
jContentPane.add(getJComboBoxUsage(), null); jContentPane.add(getJComboBoxUsage(), null);
@ -427,13 +428,13 @@ public class PpisDlg extends IDialog implements ItemListener {
// //
// Check Name // Check Name
// //
if (this.jComboBoxCName.getSelectedItem() == null) { if (this.iComboBoxCName.getSelectedItem() == null) {
Log.wrn("Update Ppis", "Please select one Ppi/PpiNotify Name"); Log.wrn("Update Ppis", "Please select one Ppi/PpiNotify Name");
return false; return false;
} }
if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) { if (!isEmpty(this.iComboBoxCName.getSelectedItem().toString())) {
if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) { if (!DataValidation.isC_NameType(this.iComboBoxCName.getSelectedItem().toString())) {
Log.wrn("Update Ppis", "Incorrect data type for Ppi/PpiNotify Name"); Log.wrn("Update Ppis", "Incorrect data type for Ppi/PpiNotify Name");
return false; return false;
} }
@ -453,7 +454,7 @@ public class PpisDlg extends IDialog implements ItemListener {
} }
private PpisIdentification getCurrentPpis() { private PpisIdentification getCurrentPpis() {
String arg0 = this.jComboBoxCName.getSelectedItem().toString(); String arg0 = this.iComboBoxCName.getSelectedItem().toString();
String arg1 = this.jComboBoxPpiType.getSelectedItem().toString(); String arg1 = this.jComboBoxPpiType.getSelectedItem().toString();
String arg2 = this.jComboBoxUsage.getSelectedItem().toString(); String arg2 = this.jComboBoxUsage.getSelectedItem().toString();

33
Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java
View File

@ -34,6 +34,7 @@ import org.tianocore.frameworkwizard.common.EnumerationData;
import org.tianocore.frameworkwizard.common.Log; import org.tianocore.frameworkwizard.common.Log;
import org.tianocore.frameworkwizard.common.Tools; import org.tianocore.frameworkwizard.common.Tools;
import org.tianocore.frameworkwizard.common.ui.ArchCheckBox; import org.tianocore.frameworkwizard.common.ui.ArchCheckBox;
import org.tianocore.frameworkwizard.common.ui.IComboBox;
import org.tianocore.frameworkwizard.common.ui.IDialog; import org.tianocore.frameworkwizard.common.ui.IDialog;
import org.tianocore.frameworkwizard.common.ui.IFrame; import org.tianocore.frameworkwizard.common.ui.IFrame;
import org.tianocore.frameworkwizard.common.ui.StarLabel; import org.tianocore.frameworkwizard.common.ui.StarLabel;
@ -84,7 +85,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
private JComboBox jComboBoxProtocolType = null; private JComboBox jComboBoxProtocolType = null;
private JComboBox jComboBoxCName = null; private IComboBox iComboBoxCName = null;
private JLabel jLabelHelpText = null; private JLabel jLabelHelpText = null;
@ -180,19 +181,19 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
} }
/** /**
* This method initializes jComboBoxCName * This method initializes iComboBoxCName
* *
* @return javax.swing.JComboBox * @return javax.swing.JComboBox
*/ */
private JComboBox getJComboBoxCName() { private IComboBox getIComboBoxCName() {
if (jComboBoxCName == null) { if (iComboBoxCName == null) {
jComboBoxCName = new JComboBox(); iComboBoxCName = new IComboBox();
jComboBoxCName.setBounds(new java.awt.Rectangle(168, 37, 320, 20)); iComboBoxCName.setBounds(new java.awt.Rectangle(168, 37, 320, 20));
jComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20)); iComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20));
jComboBoxCName.setToolTipText("Select Guid C Name of the Protocol"); iComboBoxCName.setToolTipText("Select Guid C Name of the Protocol");
} }
return jComboBoxCName; return iComboBoxCName;
} }
/** /**
@ -303,11 +304,11 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
Log.wrn("Init Protocol", "This module hasn't defined any package dependency, so there is no protocol can be added"); Log.wrn("Init Protocol", "This module hasn't defined any package dependency, so there is no protocol can be added");
} }
Tools.generateComboBoxByVector(this.jComboBoxCName, Tools.generateComboBoxByVector(this.iComboBoxCName,
wt.getAllProtocolDeclarationsFromPackages(wt.getPackageDependenciesOfModule(mid))); wt.getAllProtocolDeclarationsFromPackages(wt.getPackageDependenciesOfModule(mid)));
if (this.id != null) { if (this.id != null) {
this.jComboBoxCName.setSelectedItem(id.getName()); this.iComboBoxCName.setSelectedItem(id.getName());
this.jComboBoxProtocolType.setSelectedItem(id.getType()); this.jComboBoxProtocolType.setSelectedItem(id.getType());
this.jComboBoxUsage.setSelectedItem(id.getUsage()); this.jComboBoxUsage.setSelectedItem(id.getUsage());
this.jTextAreaHelpText.setText(id.getHelp()); this.jTextAreaHelpText.setText(id.getHelp());
@ -393,7 +394,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
jContentPane.add(getJComboBoxProtocolType(), null); jContentPane.add(getJComboBoxProtocolType(), null);
jContentPane.add(jStarLabel2, null); jContentPane.add(jStarLabel2, null);
jContentPane.add(jLabelC_Name, null); jContentPane.add(jLabelC_Name, null);
jContentPane.add(getJComboBoxCName(), null); jContentPane.add(getIComboBoxCName(), null);
jContentPane.add(jStarLabel3, null); jContentPane.add(jStarLabel3, null);
jContentPane.add(jLabelUsage, null); jContentPane.add(jLabelUsage, null);
jContentPane.add(getJComboBoxProtocolUsage(), null); jContentPane.add(getJComboBoxProtocolUsage(), null);
@ -456,13 +457,13 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
// //
// Check Name // Check Name
// //
if (this.jComboBoxCName.getSelectedItem() == null) { if (this.iComboBoxCName.getSelectedItem() == null) {
Log.wrn("Update protocols", "Please select one Protocol/ProtocolNotify Name"); Log.wrn("Update protocols", "Please select one Protocol/ProtocolNotify Name");
return false; return false;
} }
if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) { if (!isEmpty(this.iComboBoxCName.getSelectedItem().toString())) {
if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) { if (!DataValidation.isC_NameType(this.iComboBoxCName.getSelectedItem().toString())) {
Log.wrn("Update Protocols", "Incorrect data type for Protocol/ProtocolNotify Name"); Log.wrn("Update Protocols", "Incorrect data type for Protocol/ProtocolNotify Name");
return false; return false;
} }
@ -482,7 +483,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
} }
private ProtocolsIdentification getCurrentProtocols() { private ProtocolsIdentification getCurrentProtocols() {
String arg0 = this.jComboBoxCName.getSelectedItem().toString(); String arg0 = this.iComboBoxCName.getSelectedItem().toString();
String arg1 = this.jComboBoxProtocolType.getSelectedItem().toString(); String arg1 = this.jComboBoxProtocolType.getSelectedItem().toString();
String arg2 = this.jComboBoxUsage.getSelectedItem().toString(); String arg2 = this.jComboBoxUsage.getSelectedItem().toString();

44
Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java
View File

@ -304,30 +304,30 @@ public class SourceFilesDlg extends IDialog {
this.jTextFieldFileName.setText(inSourceFilesIdentifications.getFilename()); this.jTextFieldFileName.setText(inSourceFilesIdentifications.getFilename());
this.jTextFieldTagName.setText(inSourceFilesIdentifications.getTagName()); this.jTextFieldTagName.setText(inSourceFilesIdentifications.getTagName());
// //
// // Generate Tool Code selection list
// //
// Vector<String> v = ed.getVToolCode();
// boolean isFind = false;
// String strToolCode = inSourceFilesIdentifications.getToolCode();
// //
// Generate Tool Code selection list // //
// // // If the input value is not in the default list, add it to the list
Vector<String> v = ed.getVToolCode(); // //
boolean isFind = false; // if (strToolCode != null) {
String strToolCode = inSourceFilesIdentifications.getToolCode(); // for (int index = 0; index < v.size(); index++) {
// if (v.elementAt(index).equals(strToolCode)) {
// isFind = true;
// break;
// }
// }
// if (!isFind && !isEmpty(strToolCode)) {
// v.addElement(strToolCode);
// }
// }
// Tools.generateComboBoxByVector(iComboBoxToolCode, ed.getVToolCode());
// If the input value is not in the default list, add it to the list this.iComboBoxToolCode.setSelectedItem(inSourceFilesIdentifications.getToolCode());
//
if (strToolCode != null) {
for (int index = 0; index < v.size(); index++) {
if (v.elementAt(index).equals(strToolCode)) {
isFind = true;
break;
}
}
if (!isFind && !isEmpty(strToolCode)) {
v.addElement(strToolCode);
}
}
Tools.generateComboBoxByVector(iComboBoxToolCode, v);
this.iComboBoxToolCode.setSelectedItem(strToolCode);
this.jTextFieldToolChainFamily.setText(inSourceFilesIdentifications.getToolChainFamily()); this.jTextFieldToolChainFamily.setText(inSourceFilesIdentifications.getToolChainFamily());
jTextFieldFeatureFlag.setText(inSourceFilesIdentifications.getFeatureFlag()); jTextFieldFeatureFlag.setText(inSourceFilesIdentifications.getFeatureFlag());

31
Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java
View File

@ -32,6 +32,7 @@ import org.tianocore.frameworkwizard.common.EnumerationData;
import org.tianocore.frameworkwizard.common.Log; import org.tianocore.frameworkwizard.common.Log;
import org.tianocore.frameworkwizard.common.Tools; import org.tianocore.frameworkwizard.common.Tools;
import org.tianocore.frameworkwizard.common.ui.ArchCheckBox; import org.tianocore.frameworkwizard.common.ui.ArchCheckBox;
import org.tianocore.frameworkwizard.common.ui.IComboBox;
import org.tianocore.frameworkwizard.common.ui.IDialog; import org.tianocore.frameworkwizard.common.ui.IDialog;
import org.tianocore.frameworkwizard.common.ui.IFrame; import org.tianocore.frameworkwizard.common.ui.IFrame;
import org.tianocore.frameworkwizard.common.ui.StarLabel; import org.tianocore.frameworkwizard.common.ui.StarLabel;
@ -68,7 +69,7 @@ public class SystemTablesDlg extends IDialog {
private StarLabel jStarLabel2 = null; private StarLabel jStarLabel2 = null;
private JComboBox jComboBoxGuidC_Name = null; private IComboBox iComboBoxGuidC_Name = null;
private JLabel jLabelFeatureFlag = null; private JLabel jLabelFeatureFlag = null;
@ -100,19 +101,19 @@ public class SystemTablesDlg extends IDialog {
private WorkspaceTools wt = new WorkspaceTools(); private WorkspaceTools wt = new WorkspaceTools();
/** /**
* This method initializes jComboBoxGuidC_Name * This method initializes iComboBoxGuidC_Name
* *
* @return javax.swing.JComboBox jComboBoxGuidC_Name * @return javax.swing.JComboBox iComboBoxGuidC_Name
* *
*/ */
private JComboBox getJComboBoxGuidC_Name() { private IComboBox getIComboBoxGuidC_Name() {
if (jComboBoxGuidC_Name == null) { if (iComboBoxGuidC_Name == null) {
jComboBoxGuidC_Name = new JComboBox(); iComboBoxGuidC_Name = new IComboBox();
jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(168, 12, 320, 20)); iComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(168, 12, 320, 20));
jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20)); iComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));
jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the System Table"); iComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the System Table");
} }
return jComboBoxGuidC_Name; return iComboBoxGuidC_Name;
} }
/** /**
@ -276,12 +277,12 @@ public class SystemTablesDlg extends IDialog {
// Init guids drop down list // Init guids drop down list
// //
Tools Tools
.generateComboBoxByVector(jComboBoxGuidC_Name, .generateComboBoxByVector(iComboBoxGuidC_Name,
wt.getAllGuidDeclarationsFromPackages(vpid, EnumerationData.GUID_TYPE_EFI_SYSTEM_CONFIGURATION_TABLE)); wt.getAllGuidDeclarationsFromPackages(vpid, EnumerationData.GUID_TYPE_EFI_SYSTEM_CONFIGURATION_TABLE));
if (this.id != null) { if (this.id != null) {
this.jComboBoxGuidC_Name.setSelectedItem(id.getName()); this.iComboBoxGuidC_Name.setSelectedItem(id.getName());
this.jComboBoxUsage.setSelectedItem(id.getUsage()); this.jComboBoxUsage.setSelectedItem(id.getUsage());
this.jTextAreaHelpText.setText(id.getHelp()); this.jTextAreaHelpText.setText(id.getHelp());
this.jTextFieldFeatureFlag.setText(id.getFeatureFlag()); this.jTextFieldFeatureFlag.setText(id.getFeatureFlag());
@ -354,7 +355,7 @@ public class SystemTablesDlg extends IDialog {
jContentPane.add(jLabelEntry, null); jContentPane.add(jLabelEntry, null);
jContentPane.add(jLabelFeatureFlag, null); jContentPane.add(jLabelFeatureFlag, null);
jContentPane.add(getJTextFieldFeatureFlag(), null); jContentPane.add(getJTextFieldFeatureFlag(), null);
jContentPane.add(getJComboBoxGuidC_Name(), null); jContentPane.add(getIComboBoxGuidC_Name(), null);
jContentPane.add(jLabelArch, null); jContentPane.add(jLabelArch, null);
jContentPane.add(jLabelUsage, null); jContentPane.add(jLabelUsage, null);
jContentPane.add(getJComboBoxUsage(), null); jContentPane.add(getJComboBoxUsage(), null);
@ -417,7 +418,7 @@ public class SystemTablesDlg extends IDialog {
// //
// Check Name // Check Name
// //
if (this.jComboBoxGuidC_Name.getSelectedItem() == null) { if (this.iComboBoxGuidC_Name.getSelectedItem() == null) {
Log.wrn("Update Guids", "Please select one System Table Name"); Log.wrn("Update Guids", "Please select one System Table Name");
return false; return false;
} }
@ -436,7 +437,7 @@ public class SystemTablesDlg extends IDialog {
} }
private SystemTablesIdentification getCurrentSystemTables() { private SystemTablesIdentification getCurrentSystemTables() {
String arg0 = this.jComboBoxGuidC_Name.getSelectedItem().toString(); String arg0 = this.iComboBoxGuidC_Name.getSelectedItem().toString();
String arg1 = this.jComboBoxUsage.getSelectedItem().toString(); String arg1 = this.jComboBoxUsage.getSelectedItem().toString();
String arg2 = this.jTextFieldFeatureFlag.getText(); String arg2 = this.jTextFieldFeatureFlag.getText();

31
Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java
View File

@ -32,6 +32,7 @@ import org.tianocore.frameworkwizard.common.EnumerationData;
import org.tianocore.frameworkwizard.common.Log; import org.tianocore.frameworkwizard.common.Log;
import org.tianocore.frameworkwizard.common.Tools; import org.tianocore.frameworkwizard.common.Tools;
import org.tianocore.frameworkwizard.common.ui.ArchCheckBox; import org.tianocore.frameworkwizard.common.ui.ArchCheckBox;
import org.tianocore.frameworkwizard.common.ui.IComboBox;
import org.tianocore.frameworkwizard.common.ui.IDialog; import org.tianocore.frameworkwizard.common.ui.IDialog;
import org.tianocore.frameworkwizard.common.ui.IFrame; import org.tianocore.frameworkwizard.common.ui.IFrame;
import org.tianocore.frameworkwizard.common.ui.StarLabel; import org.tianocore.frameworkwizard.common.ui.StarLabel;
@ -76,7 +77,7 @@ public class VariablesDlg extends IDialog {
private JLabel jLabelGuidCName = null; private JLabel jLabelGuidCName = null;
private JComboBox jComboBoxGuidC_Name = null; private IComboBox iComboBoxGuidC_Name = null;
private JTextField jTextFieldFeatureFlag = null; private JTextField jTextFieldFeatureFlag = null;
@ -203,19 +204,19 @@ public class VariablesDlg extends IDialog {
} }
/** /**
* This method initializes jComboBoxGuidC_Name * This method initializes iComboBoxGuidC_Name
* *
* @return javax.swing.JComboBox jComboBoxGuidC_Name * @return javax.swing.JComboBox iComboBoxGuidC_Name
* *
*/ */
private JComboBox getJComboBoxGuidC_Name() { private IComboBox getIComboBoxGuidC_Name() {
if (jComboBoxGuidC_Name == null) { if (iComboBoxGuidC_Name == null) {
jComboBoxGuidC_Name = new JComboBox(); iComboBoxGuidC_Name = new IComboBox();
jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(168, 37, 320, 20)); iComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(168, 37, 320, 20));
jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20)); iComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));
jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Variable."); iComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Variable.");
} }
return jComboBoxGuidC_Name; return iComboBoxGuidC_Name;
} }
/** /**
@ -296,12 +297,12 @@ public class VariablesDlg extends IDialog {
// Init guids drop down list // Init guids drop down list
// //
Tools Tools
.generateComboBoxByVector(jComboBoxGuidC_Name, .generateComboBoxByVector(iComboBoxGuidC_Name,
wt.getAllGuidDeclarationsFromPackages(vpid, EnumerationData.GUID_TYPE_EFI_VARIABLE)); wt.getAllGuidDeclarationsFromPackages(vpid, EnumerationData.GUID_TYPE_EFI_VARIABLE));
if (this.id != null) { if (this.id != null) {
this.jTextFieldVariableName.setText(id.getName()); this.jTextFieldVariableName.setText(id.getName());
this.jComboBoxGuidC_Name.setSelectedItem(id.getGuid()); this.iComboBoxGuidC_Name.setSelectedItem(id.getGuid());
this.jComboBoxUsage.setSelectedItem(id.getUsage()); this.jComboBoxUsage.setSelectedItem(id.getUsage());
this.jTextAreaHelpText.setText(id.getHelp()); this.jTextAreaHelpText.setText(id.getHelp());
this.jTextFieldFeatureFlag.setText(id.getFeatureFlag()); this.jTextFieldFeatureFlag.setText(id.getFeatureFlag());
@ -386,7 +387,7 @@ public class VariablesDlg extends IDialog {
jContentPane.add(getJTextFieldString(), null); jContentPane.add(getJTextFieldString(), null);
jContentPane.add(jStarLabel2, null); jContentPane.add(jStarLabel2, null);
jContentPane.add(jLabelGuidCName, null); jContentPane.add(jLabelGuidCName, null);
jContentPane.add(getJComboBoxGuidC_Name(), null); jContentPane.add(getIComboBoxGuidC_Name(), null);
jContentPane.add(jStarLabel3, null); jContentPane.add(jStarLabel3, null);
jContentPane.add(jLabelUsage, null); jContentPane.add(jLabelUsage, null);
jContentPane.add(getJComboBoxUsage(), null); jContentPane.add(getJComboBoxUsage(), null);
@ -456,7 +457,7 @@ public class VariablesDlg extends IDialog {
// //
// Check Guid Value // Check Guid Value
// //
if (this.jComboBoxGuidC_Name.getSelectedItem() == null) { if (this.iComboBoxGuidC_Name.getSelectedItem() == null) {
Log.wrn("Update Guids", "Please select one Varibale Guid value"); Log.wrn("Update Guids", "Please select one Varibale Guid value");
return false; return false;
} }
@ -476,7 +477,7 @@ public class VariablesDlg extends IDialog {
private VariablesIdentification getCurrentVariables() { private VariablesIdentification getCurrentVariables() {
String arg0 = this.jTextFieldVariableName.getText(); String arg0 = this.jTextFieldVariableName.getText();
String arg1 = this.jComboBoxGuidC_Name.getSelectedItem().toString(); String arg1 = this.iComboBoxGuidC_Name.getSelectedItem().toString();
String arg2 = this.jComboBoxUsage.getSelectedItem().toString(); String arg2 = this.jComboBoxUsage.getSelectedItem().toString();
String arg3 = this.jTextFieldFeatureFlag.getText(); String arg3 = this.jTextFieldFeatureFlag.getText();