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

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

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 39f65c7ef207b6e6ecab91beefd3187d48893393..03a4ed5f98d59e1e5fc4bd801ac2ad7e7342dba6 100644 (file)
--- 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");\r
             optionsTableModel.addColumn("Arguments");\r
 \r
             optionsTableModel.addColumn("TagName");\r
             optionsTableModel.addColumn("Arguments");\r
 \r

-            javax.swing.table.TableColumn toolFamilyCol = jTableOptions.getColumnModel().getColumn(1);\r
-            JComboBox cb = new JComboBox();\r
-            cb.addItem("MSFT");\r
-            cb.addItem("GCC");\r
-            cb.addItem("CYGWIN");\r
-            cb.addItem("INTEL");\r
-            cb.addItem("USER_DEFINED");\r
-            toolFamilyCol.setCellEditor(new DefaultCellEditor(cb));\r
+//            javax.swing.table.TableColumn toolFamilyCol = jTableOptions.getColumnModel().getColumn(1);\r
+//            JComboBox cb = new JComboBox();\r
+//            cb.addItem("MSFT");\r
+//            cb.addItem("GCC");\r
+//            cb.addItem("CYGWIN");\r
+//            cb.addItem("INTEL");\r
+//            cb.addItem("USER_DEFINED");\r
+//            toolFamilyCol.setCellEditor(new DefaultCellEditor(cb));\r

             Vector<String> vArch = new Vector<String>();\r
             vArch.add("IA32");\r
             vArch.add("X64");\r
             Vector<String> vArch = new Vector<String>();\r
             vArch.add("IA32");\r
             vArch.add("X64");\r

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 1e0a5cdc44eac6d5a49b032f7ce381ff1567c916..b15e5d28d8ddebdba0920722c9d3cc5670fa5459 100644 (file)
--- 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();\r
             }\r
             cursor.removeXml();\r
                 cursor.toNextSibling();\r
             }\r
             cursor.removeXml();\r

+            if (getModuleSAOptionsCount(moduleKey) == 0) {\r
+                cursor.toParent();\r
+                cursor.removeXml();\r
+            }\r

         }\r
         cursor.dispose();\r
     }\r
         }\r
         cursor.dispose();\r
     }\r

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 45e5893fb77b16043ff710ed9679692defce1806..6ddf7ccd17d05d44b5d051fe9b19cb90025db721 100644 (file)
--- 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);\r
             jTableModuleSaOptions.setRowHeight(20);\r
             \r
             jTableModuleSaOptions = new JTable(optionsTableModel);\r
             jTableModuleSaOptions.setRowHeight(20);\r
             \r

-            javax.swing.table.TableColumn toolFamilyCol = jTableModuleSaOptions.getColumnModel().getColumn(1);\r
-            JComboBox cb = new JComboBox();\r
-            cb.addItem("MSFT");\r
-            cb.addItem("GCC");\r
-            cb.addItem("CYGWIN");\r
-            cb.addItem("INTEL");\r
-            cb.addItem("USER_DEFINED");\r
-            toolFamilyCol.setCellEditor(new DefaultCellEditor(cb));\r
+//            javax.swing.table.TableColumn toolFamilyCol = jTableModuleSaOptions.getColumnModel().getColumn(1);\r
+//            JComboBox cb = new JComboBox();\r
+//            cb.addItem("MSFT");\r
+//            cb.addItem("GCC");\r
+//            cb.addItem("CYGWIN");\r
+//            cb.addItem("INTEL");\r
+//            cb.addItem("USER_DEFINED");\r
+//            toolFamilyCol.setCellEditor(new DefaultCellEditor(cb));\r

             \r
             Vector<String> vArch = new Vector<String>();\r
             vArch.add("IA32");\r
             \r
             Vector<String> vArch = new Vector<String>();\r
             vArch.add("IA32");\r