Fix the problem of deleting ModuleSA custom tool chain option leads to FPD verificaiton fail.

Remove the drop-down list of toolchain family for schema not restrict it any more.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1649 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jlin16 2006-09-30 02:50:14 +00:00
parent a7aa21c958
commit 5d7a9b83e1
3 changed files with 20 additions and 16 deletions

View File

@ -1760,14 +1760,14 @@ public class FpdBuildOptions extends IInternalFrame {
optionsTableModel.addColumn("TagName"); optionsTableModel.addColumn("TagName");
optionsTableModel.addColumn("Arguments"); optionsTableModel.addColumn("Arguments");
javax.swing.table.TableColumn toolFamilyCol = jTableOptions.getColumnModel().getColumn(1); // javax.swing.table.TableColumn toolFamilyCol = jTableOptions.getColumnModel().getColumn(1);
JComboBox cb = new JComboBox(); // JComboBox cb = new JComboBox();
cb.addItem("MSFT"); // cb.addItem("MSFT");
cb.addItem("GCC"); // cb.addItem("GCC");
cb.addItem("CYGWIN"); // cb.addItem("CYGWIN");
cb.addItem("INTEL"); // cb.addItem("INTEL");
cb.addItem("USER_DEFINED"); // cb.addItem("USER_DEFINED");
toolFamilyCol.setCellEditor(new DefaultCellEditor(cb)); // toolFamilyCol.setCellEditor(new DefaultCellEditor(cb));
Vector<String> vArch = new Vector<String>(); Vector<String> vArch = new Vector<String>();
vArch.add("IA32"); vArch.add("IA32");
vArch.add("X64"); vArch.add("X64");

View File

@ -1105,6 +1105,10 @@ public class FpdFileContents {
cursor.toNextSibling(); cursor.toNextSibling();
} }
cursor.removeXml(); cursor.removeXml();
if (getModuleSAOptionsCount(moduleKey) == 0) {
cursor.toParent();
cursor.removeXml();
}
} }
cursor.dispose(); cursor.dispose();
} }

View File

@ -1240,14 +1240,14 @@ public class FpdModuleSA extends JDialog implements ActionListener {
jTableModuleSaOptions = new JTable(optionsTableModel); jTableModuleSaOptions = new JTable(optionsTableModel);
jTableModuleSaOptions.setRowHeight(20); jTableModuleSaOptions.setRowHeight(20);
javax.swing.table.TableColumn toolFamilyCol = jTableModuleSaOptions.getColumnModel().getColumn(1); // javax.swing.table.TableColumn toolFamilyCol = jTableModuleSaOptions.getColumnModel().getColumn(1);
JComboBox cb = new JComboBox(); // JComboBox cb = new JComboBox();
cb.addItem("MSFT"); // cb.addItem("MSFT");
cb.addItem("GCC"); // cb.addItem("GCC");
cb.addItem("CYGWIN"); // cb.addItem("CYGWIN");
cb.addItem("INTEL"); // cb.addItem("INTEL");
cb.addItem("USER_DEFINED"); // cb.addItem("USER_DEFINED");
toolFamilyCol.setCellEditor(new DefaultCellEditor(cb)); // toolFamilyCol.setCellEditor(new DefaultCellEditor(cb));
Vector<String> vArch = new Vector<String>(); Vector<String> vArch = new Vector<String>();
vArch.add("IA32"); vArch.add("IA32");