Fix the problem of deleting ModuleSA custom tool chain option leads to FPD verificait...
authorjlin16 <jlin16@6f19259b-4bc3-4df7-8a09-765794883524>
Sat, 30 Sep 2006 02:50:14 +0000 (02:50 +0000)
committerjlin16 <jlin16@6f19259b-4bc3-4df7-8a09-765794883524>
Sat, 30 Sep 2006 02:50:14 +0000 (02:50 +0000)
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

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java

index 39f65c7..03a4ed5 100644 (file)
@@ -1760,14 +1760,14 @@ public class FpdBuildOptions extends IInternalFrame {
             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
index 1e0a5cd..b15e5d2 100644 (file)
@@ -1105,6 +1105,10 @@ public class FpdFileContents {
                 cursor.toNextSibling();\r
             }\r
             cursor.removeXml();\r
+            if (getModuleSAOptionsCount(moduleKey) == 0) {\r
+                cursor.toParent();\r
+                cursor.removeXml();\r
+            }\r
         }\r
         cursor.dispose();\r
     }\r
index 45e5893..6ddf7cc 100644 (file)
@@ -1240,14 +1240,14 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             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