From 5d7a9b83e144ba855c14d50f4fd31317d7b5e0c5 Mon Sep 17 00:00:00 2001 From: jlin16 Date: Sat, 30 Sep 2006 02:50:14 +0000 Subject: [PATCH] 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 --- .../platform/ui/FpdBuildOptions.java | 16 ++++++++-------- .../platform/ui/FpdFileContents.java | 4 ++++ .../frameworkwizard/platform/ui/FpdModuleSA.java | 16 ++++++++-------- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java index 39f65c7ef2..03a4ed5f98 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java @@ -1760,14 +1760,14 @@ public class FpdBuildOptions extends IInternalFrame { optionsTableModel.addColumn("TagName"); optionsTableModel.addColumn("Arguments"); - javax.swing.table.TableColumn toolFamilyCol = jTableOptions.getColumnModel().getColumn(1); - JComboBox cb = new JComboBox(); - cb.addItem("MSFT"); - cb.addItem("GCC"); - cb.addItem("CYGWIN"); - cb.addItem("INTEL"); - cb.addItem("USER_DEFINED"); - toolFamilyCol.setCellEditor(new DefaultCellEditor(cb)); +// javax.swing.table.TableColumn toolFamilyCol = jTableOptions.getColumnModel().getColumn(1); +// JComboBox cb = new JComboBox(); +// cb.addItem("MSFT"); +// cb.addItem("GCC"); +// cb.addItem("CYGWIN"); +// cb.addItem("INTEL"); +// cb.addItem("USER_DEFINED"); +// toolFamilyCol.setCellEditor(new DefaultCellEditor(cb)); Vector vArch = new Vector(); vArch.add("IA32"); vArch.add("X64"); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java index 1e0a5cdc44..b15e5d28d8 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java @@ -1105,6 +1105,10 @@ public class FpdFileContents { cursor.toNextSibling(); } cursor.removeXml(); + if (getModuleSAOptionsCount(moduleKey) == 0) { + cursor.toParent(); + cursor.removeXml(); + } } cursor.dispose(); } diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java index 45e5893fb7..6ddf7ccd17 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java @@ -1240,14 +1240,14 @@ public class FpdModuleSA extends JDialog implements ActionListener { jTableModuleSaOptions = new JTable(optionsTableModel); jTableModuleSaOptions.setRowHeight(20); - javax.swing.table.TableColumn toolFamilyCol = jTableModuleSaOptions.getColumnModel().getColumn(1); - JComboBox cb = new JComboBox(); - cb.addItem("MSFT"); - cb.addItem("GCC"); - cb.addItem("CYGWIN"); - cb.addItem("INTEL"); - cb.addItem("USER_DEFINED"); - toolFamilyCol.setCellEditor(new DefaultCellEditor(cb)); +// javax.swing.table.TableColumn toolFamilyCol = jTableModuleSaOptions.getColumnModel().getColumn(1); +// JComboBox cb = new JComboBox(); +// cb.addItem("MSFT"); +// cb.addItem("GCC"); +// cb.addItem("CYGWIN"); +// cb.addItem("INTEL"); +// cb.addItem("USER_DEFINED"); +// toolFamilyCol.setCellEditor(new DefaultCellEditor(cb)); Vector vArch = new Vector(); vArch.add("IA32"); -- 2.39.2