mirror of https://github.com/acidanthera/audk.git
Fix one conflict with the latest schema
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@453 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
2bf4e0a163
commit
3099b289e6
|
@ -2126,7 +2126,7 @@ public class ModuleMain extends IFrame implements MouseListener, TreeSelectionLi
|
||||||
for (int indexI = 0; indexI < xmlst.getSystemTableList().size(); indexI++) {
|
for (int indexI = 0; indexI < xmlst.getSystemTableList().size(); indexI++) {
|
||||||
dmtnSystemTables
|
dmtnSystemTables
|
||||||
.add(new IDefaultMutableTreeNode(
|
.add(new IDefaultMutableTreeNode(
|
||||||
xmlst.getSystemTableArray(indexI).getEntry(),
|
xmlst.getSystemTableArray(indexI).getEntryList().get(0),
|
||||||
IDefaultMutableTreeNode.SYSTEMTABLES_SYSTEMTABLE_ITEM,
|
IDefaultMutableTreeNode.SYSTEMTABLES_SYSTEMTABLE_ITEM,
|
||||||
IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE,
|
IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE,
|
||||||
indexI));
|
indexI));
|
||||||
|
|
|
@ -208,8 +208,8 @@ public class ModuleSystemTables extends IInternalFrame {
|
||||||
init(inSystemTables);
|
init(inSystemTables);
|
||||||
this.location = index;
|
this.location = index;
|
||||||
if (this.systemTables.getSystemTableList().size() > 0) {
|
if (this.systemTables.getSystemTableList().size() > 0) {
|
||||||
if (this.systemTables.getSystemTableArray(index).getEntry() != null) {
|
if (this.systemTables.getSystemTableArray(index).getEntryList() != null) {
|
||||||
this.jTextFieldEntry.setText(this.systemTables.getSystemTableArray(index).getEntry());
|
this.jTextFieldEntry.setText(this.systemTables.getSystemTableArray(index).getEntryList().get(0));
|
||||||
}
|
}
|
||||||
if (this.systemTables.getSystemTableArray(index).getUsage() != null) {
|
if (this.systemTables.getSystemTableArray(index).getUsage() != null) {
|
||||||
this.jComboBoxUsage.setSelectedItem(this.systemTables.getSystemTableArray(index).getUsage().toString());
|
this.jComboBoxUsage.setSelectedItem(this.systemTables.getSystemTableArray(index).getUsage().toString());
|
||||||
|
@ -374,7 +374,7 @@ public class ModuleSystemTables extends IInternalFrame {
|
||||||
}
|
}
|
||||||
SystemTablesDocument.SystemTables.SystemTable systemTable = SystemTablesDocument.SystemTables.SystemTable.Factory
|
SystemTablesDocument.SystemTables.SystemTable systemTable = SystemTablesDocument.SystemTables.SystemTable.Factory
|
||||||
.newInstance();
|
.newInstance();
|
||||||
systemTable.setEntry(this.jTextFieldEntry.getText());
|
//systemTable.setEntry(this.jTextFieldEntry.getText());
|
||||||
|
|
||||||
systemTable.setUsage(SystemTableUsage.Enum.forString(jComboBoxUsage.getSelectedItem().toString()));
|
systemTable.setUsage(SystemTableUsage.Enum.forString(jComboBoxUsage.getSelectedItem().toString()));
|
||||||
if (!isEmpty(this.jTextFieldOverrideID.getText())) {
|
if (!isEmpty(this.jTextFieldOverrideID.getText())) {
|
||||||
|
|
Loading…
Reference in New Issue