UI rearrangement for build options and moduleSa settings.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1372 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
index f5b963cdbb0ea47a5e8f4962f514a7b042878ae6..289dd148a5389136fb154315a6d219626625b140 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
@@ -366,7 +366,7 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
             jLabelDataType.setText("Data Type");\r
             jLabelDataType.setBounds(new java.awt.Rectangle(11,83,140,20));\r
             jLabelToken = new JLabel();\r
-            jLabelToken.setText("Token");\r
+            jLabelToken.setText("Token Number");\r
             jLabelToken.setBounds(new java.awt.Rectangle(11,33,140,20));\r
             jLabelItemType = new JLabel();\r
             jLabelItemType.setText("Help Text");\r

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 5e24dcd17d83f230e0ade1d7db942feaddbadc20..f292d38c1cdb6b6f34180c2447ac17bba1db8a80 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
@@ -56,6 +56,7 @@ import java.util.LinkedHashMap;
 import java.util.Set;\r
 import java.util.Vector;\r
 import java.awt.Dimension;\r
+import javax.swing.JSplitPane;\r
 \r
 public class FpdBuildOptions extends IInternalFrame {\r
 \r
@@ -89,14 +90,12 @@ public class FpdBuildOptions extends IInternalFrame {
     private JPanel jPanelFfsTabCenter = null;\r
     private JPanel jPanelFfsTabCenterN = null;\r
     private JPanel jPanelFfsTabCenterS = null;\r
-    private JPanel jPanelFfsTabCenterE = null;\r
     private JLabel jLabelFfsKey = null;\r
     private JTextField jTextFieldFfsKey = null;\r
     private JButton jButtonFfsAdd = null;\r
     private JButton jButtonFfsDel = null;\r
     private JScrollPane jScrollPaneFfsAttribs = null;\r
     private JTable jTableFfsAttribs = null;\r
-    private JPanel jPanelFfsTabCenterC = null;\r
     private JPanel jPanelOptionsTab = null;\r
     private JLabel jLabelOptionContents = null;\r
     private JTextField jTextFieldOptionContents = null;\r
@@ -148,6 +147,20 @@ public class FpdBuildOptions extends IInternalFrame {
     private JTable jTableFfsSections = null;\r
     private JButton jButtonAntTaskFileBrowse = null;\r
     private JTextField jTextFieldToolChainFamily = null;\r
+    private JSplitPane jSplitPaneFfsC = null;\r
+    private JPanel jPanelFfsCTop = null;\r
+    private JSplitPane jSplitPaneFfsCBottom = null;\r
+    private JPanel jPanelFfsCBottomTop = null;\r
+    private JPanel jPanelFfsCBottomBottom = null;\r
+    private JPanel jPanelSectionN = null;\r
+    private JPanel jPanelSectionC = null;\r
+    private JPanel jPanelSectionsN = null;\r
+    private JPanel jPanelSectionsC = null;\r
+    private JPanel jPanelSubSectionN = null;\r
+    private JPanel jPanelSubSectionC = null;\r
+    private JPanel jPanelOptionsContainer = null;\r
+    private JPanel jPanelUserDefCenterN = null;\r
+    private JPanel jPanelUserDefCenterC = null;\r
     /**\r
      * This method initializes jPanel  \r
      *         \r
@@ -239,7 +252,7 @@ public class FpdBuildOptions extends IInternalFrame {
             jLabelAntTaskFile.setText("ANT Task File");\r
             jLabelAntTaskFile.setPreferredSize(new java.awt.Dimension(80,20));\r
             FlowLayout flowLayout8 = new FlowLayout();\r
-            flowLayout8.setAlignment(java.awt.FlowLayout.LEFT);\r
+            flowLayout8.setAlignment(java.awt.FlowLayout.CENTER);\r
             jLabelAntTaskId = new JLabel();\r
             jLabelAntTaskId.setText("ID");\r
             jPanelUserDefNorth = new JPanel();\r
@@ -263,16 +276,11 @@ public class FpdBuildOptions extends IInternalFrame {
             jLabelAntCmdOpts = new JLabel();\r
             jLabelAntCmdOpts.setText("ANT Command Options");\r
             jLabelAntCmdOpts.setPreferredSize(new java.awt.Dimension(131,20));\r
-            FlowLayout flowLayout3 = new FlowLayout();\r
-            flowLayout3.setHgap(5);\r
-            flowLayout3.setAlignment(java.awt.FlowLayout.LEFT);\r
             jPanelUserDefCenter = new JPanel();\r
-            jPanelUserDefCenter.setLayout(flowLayout3);\r
-            jPanelUserDefCenter.add(jLabelAntCmdOpts, null);\r
-            jPanelUserDefCenter.add(getJTextField4(), null);\r
-            jPanelUserDefCenter.add(getJButtonAntTaskAdd(), null);\r
-            jPanelUserDefCenter.add(getJButtonAntTaskDel(), null);\r
-            jPanelUserDefCenter.add(getJScrollPaneAntTasks(), null);\r
+            jPanelUserDefCenter.setLayout(new BorderLayout());\r
+\r
+            jPanelUserDefCenter.add(getJPanelUserDefCenterN(), java.awt.BorderLayout.NORTH);\r
+            jPanelUserDefCenter.add(getJPanelUserDefCenterC(), java.awt.BorderLayout.CENTER);\r
         }\r
         return jPanelUserDefCenter;\r
     }\r
@@ -359,7 +367,7 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JTextField  \r
      */\r
-    private JTextField getJTextField4() {\r
+    private JTextField getJTextFieldAntCmdOpts() {\r
         if (jTextFieldAntCmdOpts == null) {\r
             jTextFieldAntCmdOpts = new JTextField();\r
             jTextFieldAntCmdOpts.setPreferredSize(new java.awt.Dimension(270,20));\r
@@ -376,7 +384,7 @@ public class FpdBuildOptions extends IInternalFrame {
     private JScrollPane getJScrollPaneAntTasks() {\r
         if (jScrollPaneAntTasks == null) {\r
             jScrollPaneAntTasks = new JScrollPane();\r
-            jScrollPaneAntTasks.setPreferredSize(new java.awt.Dimension(600,100));\r
+            jScrollPaneAntTasks.setPreferredSize(new java.awt.Dimension(600,400));\r
             jScrollPaneAntTasks.setViewportView(getJTableAntTasks());\r
         }\r
         return jScrollPaneAntTasks;\r
@@ -470,8 +478,7 @@ public class FpdBuildOptions extends IInternalFrame {
             jPanelFfsTabCenter.setLayout(new BorderLayout());\r
             jPanelFfsTabCenter.add(getJPanelFfsTabCenterN(), java.awt.BorderLayout.NORTH);\r
             jPanelFfsTabCenter.add(getJPanelFfsTabCenterS(), java.awt.BorderLayout.SOUTH);\r
-            jPanelFfsTabCenter.add(getJPanelFfsTabCenterE(), java.awt.BorderLayout.EAST);\r
-            jPanelFfsTabCenter.add(getJPanelFfsTabCenterC(), java.awt.BorderLayout.CENTER);\r
+            jPanelFfsTabCenter.add(getJSplitPaneFfsC(), java.awt.BorderLayout.CENTER);\r
         }\r
         return jPanelFfsTabCenter;\r
     }\r
@@ -524,18 +531,6 @@ public class FpdBuildOptions extends IInternalFrame {
         return jPanelFfsTabCenterS;\r
     }\r
 \r
-    /**\r
-     * This method initializes jPanel17        \r
-     *         \r
-     * @return javax.swing.JPanel      \r
-     */\r
-    private JPanel getJPanelFfsTabCenterE() {\r
-        if (jPanelFfsTabCenterE == null) {\r
-            jPanelFfsTabCenterE = new JPanel();\r
-        }\r
-        return jPanelFfsTabCenterE;\r
-    }\r
-\r
     /**\r
      * This method initializes jTextField6     \r
      *         \r
@@ -609,6 +604,7 @@ public class FpdBuildOptions extends IInternalFrame {
                     }\r
                     docConsole.setSaved(false);\r
                     ffc.removeBuildOptionsFfs(jTableFfs.getSelectedRow());\r
+                    ffsTableModel.removeRow(jTableFfs.getSelectedRow());\r
                 }\r
             });\r
         }\r
@@ -669,37 +665,6 @@ public class FpdBuildOptions extends IInternalFrame {
         return jTableFfsAttribs;\r
     }\r
 \r
-    /**\r
-     * This method initializes jPanel19        \r
-     *         \r
-     * @return javax.swing.JPanel      \r
-     */\r
-    private JPanel getJPanelFfsTabCenterC() {\r
-        if (jPanelFfsTabCenterC == null) {\r
-            jLabelFfsSections = new JLabel();\r
-            jLabelFfsSections.setText("Sections");\r
-            jLabelFfsSubSections = new JLabel();\r
-            jLabelFfsSubSections.setText("Sub-Sections");\r
-            jLabelFfsSection = new JLabel();\r
-            jLabelFfsSection.setText("Section");\r
-            jPanelFfsTabCenterC = new JPanel();\r
-            jPanelFfsTabCenterC.setLayout(new FlowLayout());\r
-            jPanelFfsTabCenterC.add(jLabelFfsSection, null);\r
-            jPanelFfsTabCenterC.add(getJButtonFfsSectionNew(), null);\r
-            jPanelFfsTabCenterC.add(getJButtonFfsSectionRemove(), null);\r
-            jPanelFfsTabCenterC.add(getJScrollPaneFfsSection(), null);\r
-            jPanelFfsTabCenterC.add(jLabelFfsSections, null);\r
-            jPanelFfsTabCenterC.add(getJButtonFfsSectionsNew(), null);\r
-            jPanelFfsTabCenterC.add(getJButtonFfsSectionsRemove(), null);\r
-            jPanelFfsTabCenterC.add(getJScrollPaneFfsSections(), null);\r
-            jPanelFfsTabCenterC.add(jLabelFfsSubSections, null);\r
-            jPanelFfsTabCenterC.add(getJButtonFfsSubSectionNew(), null);\r
-            jPanelFfsTabCenterC.add(getJButtonFfsSubSectionRemove(), null);\r
-            jPanelFfsTabCenterC.add(getJScrollPaneFfsSubSection(), null);\r
-        }\r
-        return jPanelFfsTabCenterC;\r
-    }\r
-\r
     /**\r
      * This method initializes jPanel20        \r
      *         \r
@@ -723,26 +688,9 @@ public class FpdBuildOptions extends IInternalFrame {
             jLabelOptionContents.setText("Option Contents");\r
             jPanelOptionsTab = new JPanel();\r
             jPanelOptionsTab.setLayout(flowLayout9);\r
-            jPanelOptionsTab.add(jLabelBuildTargets, null);\r
-            jPanelOptionsTab.add(getJTextFieldBuildTargets(), null);\r
-            jPanelOptionsTab.add(jLabelToolChainFamily, null);\r
-            jPanelOptionsTab.add(getJTextFieldToolChainFamily(), null);\r
-            jPanelOptionsTab.add(jLabelToolCmd, null);\r
-            jPanelOptionsTab.add(getJTextFieldToolCmd(), null);\r
-            jPanelOptionsTab.add(jLabelSupArch, null);\r
-            jPanelOptionsTab.add(getJCheckBoxIA32(), null);\r
-            jPanelOptionsTab.add(getJCheckBoxIpf(), null);\r
-            jPanelOptionsTab.add(getJCheckBoxX64(), null);\r
-            jPanelOptionsTab.add(getJCheckBoxEBC(), null);\r
-            jPanelOptionsTab.add(getJCheckBoxARM(), null);\r
-            jPanelOptionsTab.add(getJCheckBoxPPC(), null);\r
-            jPanelOptionsTab.add(jLabelTagName, null);\r
-            jPanelOptionsTab.add(getJTextFieldTagName(), null);\r
-            jPanelOptionsTab.add(jLabelOptionContents, null);\r
-            jPanelOptionsTab.add(getJTextFieldOptionContents(), null);\r
-            jPanelOptionsTab.add(getJButtonOptionsAdd(), null);\r
-            jPanelOptionsTab.add(getJButtonOptionsDel(), null);\r
+            jPanelOptionsTab.add(getJPanelOptionsContainer(), null);\r
             jPanelOptionsTab.add(getJScrollPaneOptions(), null);\r
+            \r
         }\r
         return jPanelOptionsTab;\r
     }\r
@@ -781,7 +729,7 @@ public class FpdBuildOptions extends IInternalFrame {
     private JScrollPane getJScrollPaneOptions() {\r
         if (jScrollPaneOptions == null) {\r
             jScrollPaneOptions = new JScrollPane();\r
-            jScrollPaneOptions.setPreferredSize(new java.awt.Dimension(630,200));\r
+            jScrollPaneOptions.setPreferredSize(new java.awt.Dimension(650,400));\r
             jScrollPaneOptions.setViewportView(getJTableOptions());\r
         }\r
         return jScrollPaneOptions;\r
@@ -1674,6 +1622,240 @@ public class FpdBuildOptions extends IInternalFrame {
         return jTextFieldToolChainFamily;\r
     }\r
 \r
+    /**\r
+     * This method initializes jSplitPaneFfsC  \r
+     *         \r
+     * @return javax.swing.JSplitPane  \r
+     */\r
+    private JSplitPane getJSplitPaneFfsC() {\r
+        if (jSplitPaneFfsC == null) {\r
+            jSplitPaneFfsC = new JSplitPane();\r
+            jSplitPaneFfsC.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT);\r
+            jSplitPaneFfsC.setDividerLocation(130);\r
+            jSplitPaneFfsC.setTopComponent(getJPanelFfsCTop());\r
+            jSplitPaneFfsC.setBottomComponent(getJSplitPaneFfsCBottom());\r
+            jSplitPaneFfsC.setDividerSize(5);\r
+        }\r
+        return jSplitPaneFfsC;\r
+    }\r
+\r
+    /**\r
+     * This method initializes jPanelFfsCTop   \r
+     *         \r
+     * @return javax.swing.JPanel      \r
+     */\r
+    private JPanel getJPanelFfsCTop() {\r
+        if (jPanelFfsCTop == null) {\r
+            jPanelFfsCTop = new JPanel();\r
+            jPanelFfsCTop.setLayout(new BorderLayout());\r
+            jPanelFfsCTop.add(getJPanelSectionN(), java.awt.BorderLayout.NORTH);\r
+            jPanelFfsCTop.add(getJPanelSectionC(), java.awt.BorderLayout.CENTER);\r
+        }\r
+        return jPanelFfsCTop;\r
+    }\r
+\r
+    /**\r
+     * This method initializes jSplitPaneFfsCBottom    \r
+     *         \r
+     * @return javax.swing.JSplitPane  \r
+     */\r
+    private JSplitPane getJSplitPaneFfsCBottom() {\r
+        if (jSplitPaneFfsCBottom == null) {\r
+            jSplitPaneFfsCBottom = new JSplitPane();\r
+            jSplitPaneFfsCBottom.setDividerSize(5);\r
+            jSplitPaneFfsCBottom.setDividerLocation(130);\r
+            jSplitPaneFfsCBottom.setTopComponent(getJPanelFfsCBottomTop());\r
+            jSplitPaneFfsCBottom.setBottomComponent(getJPanelFfsCBottomBottom());\r
+            jSplitPaneFfsCBottom.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT);\r
+        }\r
+        return jSplitPaneFfsCBottom;\r
+    }\r
+\r
+    /**\r
+     * This method initializes jPanelFfsCBottomTop     \r
+     *         \r
+     * @return javax.swing.JPanel      \r
+     */\r
+    private JPanel getJPanelFfsCBottomTop() {\r
+        if (jPanelFfsCBottomTop == null) {\r
+            jPanelFfsCBottomTop = new JPanel();\r
+            jPanelFfsCBottomTop.setLayout(new BorderLayout());\r
+            jPanelFfsCBottomTop.add(getJPanelSectionsN(), java.awt.BorderLayout.NORTH);\r
+            jPanelFfsCBottomTop.add(getJPanelSectionsC(), java.awt.BorderLayout.CENTER);\r
+        }\r
+        return jPanelFfsCBottomTop;\r
+    }\r
+\r
+    /**\r
+     * This method initializes jPanelFfsCBottomBottom  \r
+     *         \r
+     * @return javax.swing.JPanel      \r
+     */\r
+    private JPanel getJPanelFfsCBottomBottom() {\r
+        if (jPanelFfsCBottomBottom == null) {\r
+            jPanelFfsCBottomBottom = new JPanel();\r
+            jPanelFfsCBottomBottom.setLayout(new BorderLayout());\r
+            jPanelFfsCBottomBottom.add(getJPanelSubSectionN(), java.awt.BorderLayout.NORTH);\r
+            jPanelFfsCBottomBottom.add(getJPanelSubSectionC(), java.awt.BorderLayout.CENTER);\r
+        }\r
+        return jPanelFfsCBottomBottom;\r
+    }\r
+\r
+    /**\r
+     * This method initializes jPanelSectionN  \r
+     *         \r
+     * @return javax.swing.JPanel      \r
+     */\r
+    private JPanel getJPanelSectionN() {\r
+        if (jPanelSectionN == null) {\r
+            jPanelSectionN = new JPanel();\r
+            jLabelFfsSection = new JLabel();\r
+            jLabelFfsSection.setText("Section");\r
+            jPanelSectionN.add(jLabelFfsSection, null);\r
+            jPanelSectionN.add(getJButtonFfsSectionNew(), null);\r
+            jPanelSectionN.add(getJButtonFfsSectionRemove(), null);\r
+        }\r
+        return jPanelSectionN;\r
+    }\r
+\r
+    /**\r
+     * This method initializes jPanelSectionC  \r
+     *         \r
+     * @return javax.swing.JPanel      \r
+     */\r
+    private JPanel getJPanelSectionC() {\r
+        if (jPanelSectionC == null) {\r
+            jPanelSectionC = new JPanel();\r
+            jPanelSectionC.add(getJScrollPaneFfsSection(), null);\r
+        }\r
+        return jPanelSectionC;\r
+    }\r
+\r
+    /**\r
+     * This method initializes jPanelSectionsN \r
+     *         \r
+     * @return javax.swing.JPanel      \r
+     */\r
+    private JPanel getJPanelSectionsN() {\r
+        if (jPanelSectionsN == null) {\r
+            jPanelSectionsN = new JPanel();\r
+            jLabelFfsSections = new JLabel();\r
+            jLabelFfsSections.setText("Sections");\r
+            jPanelSectionsN.add(jLabelFfsSections, null);\r
+            jPanelSectionsN.add(getJButtonFfsSectionsNew(), null);\r
+            jPanelSectionsN.add(getJButtonFfsSectionsRemove(), null);\r
+        }\r
+        return jPanelSectionsN;\r
+    }\r
+\r
+    /**\r
+     * This method initializes jPanelSectionsC \r
+     *         \r
+     * @return javax.swing.JPanel      \r
+     */\r
+    private JPanel getJPanelSectionsC() {\r
+        if (jPanelSectionsC == null) {\r
+            jPanelSectionsC = new JPanel();\r
+            jPanelSectionsC.add(getJScrollPaneFfsSections(), null);\r
+        }\r
+        return jPanelSectionsC;\r
+    }\r
+\r
+    /**\r
+     * This method initializes jPanelSubSectionN       \r
+     *         \r
+     * @return javax.swing.JPanel      \r
+     */\r
+    private JPanel getJPanelSubSectionN() {\r
+        if (jPanelSubSectionN == null) {\r
+            jPanelSubSectionN = new JPanel();\r
+            jLabelFfsSubSections = new JLabel();\r
+            jLabelFfsSubSections.setText("Sub-Sections");\r
+            jPanelSubSectionN.add(jLabelFfsSubSections, null);\r
+            jPanelSubSectionN.add(getJButtonFfsSubSectionNew(), null);\r
+            jPanelSubSectionN.add(getJButtonFfsSubSectionRemove(), null);\r
+        }\r
+        return jPanelSubSectionN;\r
+    }\r
+\r
+    /**\r
+     * This method initializes jPanelSubSectionC       \r
+     *         \r
+     * @return javax.swing.JPanel      \r
+     */\r
+    private JPanel getJPanelSubSectionC() {\r
+        if (jPanelSubSectionC == null) {\r
+            jPanelSubSectionC = new JPanel();\r
+            jPanelSubSectionC.add(getJScrollPaneFfsSubSection(), null);\r
+        }\r
+        return jPanelSubSectionC;\r
+    }\r
+\r
+    /**\r
+     * This method initializes jPanelOptionsContainer  \r
+     *         \r
+     * @return javax.swing.JPanel      \r
+     */\r
+    private JPanel getJPanelOptionsContainer() {\r
+        if (jPanelOptionsContainer == null) {\r
+            FlowLayout flowLayout = new FlowLayout();\r
+            flowLayout.setAlignment(java.awt.FlowLayout.LEFT);\r
+            jPanelOptionsContainer = new JPanel();\r
+            jPanelOptionsContainer.setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.RAISED));\r
+            jPanelOptionsContainer.setLayout(flowLayout);\r
+            jPanelOptionsContainer.setPreferredSize(new java.awt.Dimension(650,100));\r
+            jPanelOptionsContainer.add(jLabelBuildTargets, null);\r
+            jPanelOptionsContainer.add(getJTextFieldBuildTargets(), null);\r
+            jPanelOptionsContainer.add(jLabelToolChainFamily, null);\r
+            jPanelOptionsContainer.add(getJTextFieldToolChainFamily(), null);\r
+            jPanelOptionsContainer.add(jLabelToolCmd, null);\r
+            jPanelOptionsContainer.add(getJTextFieldToolCmd(), null);\r
+            jPanelOptionsContainer.add(jLabelSupArch, null);\r
+            jPanelOptionsContainer.add(getJCheckBoxIA32(), null);\r
+            jPanelOptionsContainer.add(getJCheckBoxIpf(), null);\r
+            jPanelOptionsContainer.add(getJCheckBoxX64(), null);\r
+            jPanelOptionsContainer.add(getJCheckBoxEBC(), null);\r
+            jPanelOptionsContainer.add(getJCheckBoxARM(), null);\r
+            jPanelOptionsContainer.add(getJCheckBoxPPC(), null);\r
+            jPanelOptionsContainer.add(jLabelTagName, null);\r
+            jPanelOptionsContainer.add(getJTextFieldTagName(), null);\r
+            jPanelOptionsContainer.add(jLabelOptionContents, null);\r
+            jPanelOptionsContainer.add(getJTextFieldOptionContents(), null);\r
+            jPanelOptionsContainer.add(getJButtonOptionsAdd(), null);\r
+            jPanelOptionsContainer.add(getJButtonOptionsDel(), null);\r
+        }\r
+        return jPanelOptionsContainer;\r
+    }\r
+\r
+    /**\r
+     * This method initializes jPanelUserDefCenterN    \r
+     *         \r
+     * @return javax.swing.JPanel      \r
+     */\r
+    private JPanel getJPanelUserDefCenterN() {\r
+        if (jPanelUserDefCenterN == null) {\r
+            jPanelUserDefCenterN = new JPanel();\r
+            jPanelUserDefCenterN.add(jLabelAntCmdOpts, null);\r
+            jPanelUserDefCenterN.add(getJTextFieldAntCmdOpts(), null);\r
+            jPanelUserDefCenterN.add(getJButtonAntTaskAdd(), null);\r
+            jPanelUserDefCenterN.add(getJButtonAntTaskDel(), null);\r
+        }\r
+        return jPanelUserDefCenterN;\r
+    }\r
+\r
+    /**\r
+     * This method initializes jPanelUserDefCenterC    \r
+     *         \r
+     * @return javax.swing.JPanel      \r
+     */\r
+    private JPanel getJPanelUserDefCenterC() {\r
+        if (jPanelUserDefCenterC == null) {\r
+            jPanelUserDefCenterC = new JPanel();\r
+            jPanelUserDefCenterC.add(getJScrollPaneAntTasks(), null);\r
+        }\r
+        return jPanelUserDefCenterC;\r
+    }\r
+\r
     /**\r
      * @param args\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 ed3b6e20297bbcea4b09bf9c5d18b647dc0a7320..048616ca666a79e1f1ab294b27847cb1cc445f58 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
@@ -119,7 +119,9 @@ public class FpdModuleSA extends JDialog implements ActionListener {
     private JButton jButtonUpdatePcd = null;\r
     private JComboBox jComboBoxFeatureFlagValue = null;\r
     private OpeningPlatformType docConsole = null;\r
-    private JLabel jLabelPad = null;\r
+    private JPanel jPanelCustomToolChain = null;\r
+    private JPanel jPanelToolchainS = null;\r
+    private JPanel jPanelToolchainC = null;\r
     /**\r
      * This is the default constructor\r
      */\r
@@ -196,7 +198,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
         }\r
     }\r
     \r
-    public void initModuleSAOptions(String key) {\r
+    public void initFvInfo (String key) {\r
         //\r
         // display module SA options\r
         //\r
@@ -215,6 +217,9 @@ public class FpdModuleSA extends JDialog implements ActionListener {
         if (ffsKey != null) {\r
             jTextFieldFfsKey.setText(ffsKey);\r
         }\r
+    }\r
+    \r
+    public void initToolChainOptions(String key) {\r
         \r
         optionsTableModel.setRowCount(0);\r
         String[][] saa = new String[ffc.getModuleSAOptionsCount(key)][6];\r
@@ -449,8 +454,10 @@ public class FpdModuleSA extends JDialog implements ActionListener {
         if (jTabbedPane == null) {\r
             jTabbedPane = new JTabbedPane();\r
             jTabbedPane.addTab("PCD Build Definition", null, getJPanelPcd(), null);\r
-            jTabbedPane.addTab("Module SA Options", null, getJPanelModuleSaOpts(), null);\r
             jTabbedPane.addTab("Libraries", null, getJPanelLibrary(), null);\r
+            jTabbedPane.addTab("FV Info", null, getJPanelModuleSaOpts(), null);\r
+            jTabbedPane.addTab("Custom Toolchain", null, getJPanelCustomToolChain(), null);\r
+            \r
         }\r
         return jTabbedPane;\r
     }\r
@@ -1078,9 +1085,6 @@ public class FpdModuleSA extends JDialog implements ActionListener {
      */\r
     private JPanel getJPanelModuleSaOpts() {\r
         if (jPanelModuleSaOpts == null) {\r
-            jLabelPad = new JLabel();\r
-            jLabelPad.setText("");\r
-            jLabelPad.setPreferredSize(new java.awt.Dimension(250,16));\r
             FlowLayout flowLayout4 = new FlowLayout();\r
             flowLayout4.setAlignment(java.awt.FlowLayout.LEFT);\r
             jLabelFfsFormatKey = new JLabel();\r
@@ -1101,13 +1105,9 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             jPanelModuleSaOpts.add(getJTextFieldFileGuid(), null);\r
             jPanelModuleSaOpts.add(jLabelFfsFormatKey, null);\r
             jPanelModuleSaOpts.add(getJTextFieldFfsKey(), null);\r
-            jPanelModuleSaOpts.add(getJScrollPaneModuleSaOptions(), null);\r
-            jPanelModuleSaOpts.add(jLabelPad, null);\r
-            jPanelModuleSaOpts.add(getJButtonNew(), null);\r
-            jPanelModuleSaOpts.add(getJButtonDeleteOption(), null);\r
             jPanelModuleSaOpts.addComponentListener(new java.awt.event.ComponentAdapter() {\r
                 public void componentShown(java.awt.event.ComponentEvent e) {\r
-                    initModuleSAOptions(moduleKey);\r
+                    initFvInfo(moduleKey);\r
                 }\r
             });\r
         }\r
@@ -1213,7 +1213,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
     private JScrollPane getJScrollPaneModuleSaOptions() {\r
         if (jScrollPaneModuleSaOptions == null) {\r
             jScrollPaneModuleSaOptions = new JScrollPane();\r
-            jScrollPaneModuleSaOptions.setPreferredSize(new java.awt.Dimension(600,200));\r
+            jScrollPaneModuleSaOptions.setPreferredSize(new java.awt.Dimension(600,350));\r
             jScrollPaneModuleSaOptions.setViewportView(getJTableModuleSaOptions());\r
         }\r
         return jScrollPaneModuleSaOptions;\r
@@ -1563,6 +1563,50 @@ private JComboBox getJComboBoxFeatureFlagValue() {
     }\r
     return jComboBoxFeatureFlagValue;\r
 }\r
+/**\r
+ * This method initializes jPanelCustomToolChain       \r
+ *     \r
+ * @return javax.swing.JPanel  \r
+ */\r
+private JPanel getJPanelCustomToolChain() {\r
+    if (jPanelCustomToolChain == null) {\r
+        jPanelCustomToolChain = new JPanel();\r
+        jPanelCustomToolChain.setLayout(new BorderLayout());\r
+        jPanelCustomToolChain.add(getJPanelToolchainS(), java.awt.BorderLayout.SOUTH);\r
+        jPanelCustomToolChain.add(getJPanelToolchainC(), java.awt.BorderLayout.CENTER);\r
+        jPanelCustomToolChain.addComponentListener(new java.awt.event.ComponentAdapter() {\r
+            public void componentShown(java.awt.event.ComponentEvent e) {\r
+                initToolChainOptions(moduleKey);\r
+            }\r
+        });\r
+    }\r
+    return jPanelCustomToolChain;\r
+}\r
+/**\r
+ * This method initializes jPanelToolchainS    \r
+ *     \r
+ * @return javax.swing.JPanel  \r
+ */\r
+private JPanel getJPanelToolchainS() {\r
+    if (jPanelToolchainS == null) {\r
+        jPanelToolchainS = new JPanel();\r
+        jPanelToolchainS.add(getJButtonNew(), null);\r
+        jPanelToolchainS.add(getJButtonDeleteOption(), null);\r
+    }\r
+    return jPanelToolchainS;\r
+}\r
+/**\r
+ * This method initializes jPanelToolchainC    \r
+ *     \r
+ * @return javax.swing.JPanel  \r
+ */\r
+private JPanel getJPanelToolchainC() {\r
+    if (jPanelToolchainC == null) {\r
+        jPanelToolchainC = new JPanel();\r
+        jPanelToolchainC.add(getJScrollPaneModuleSaOptions(), null);\r
+    }\r
+    return jPanelToolchainC;\r
+}\r
 \r
 \r
 }  //  @jve:decl-index=0:visual-constraint="10,10"\r