]> git.proxmox.com Git - mirror_edk2.git/blobdiff - Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java
Fix EDKT337,Double click on modules in "Framework Modules" of Platforms should be...
[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / platform / ui / FpdBuildOptions.java
index 6abccfe38e39603a3fddd95ce0b07d89dcd00c24..7f06730fe40939ddd5e8e5867927574a52b98e6f 100644 (file)
 package org.tianocore.frameworkwizard.platform.ui;\r
 \r
 import java.awt.BorderLayout;\r
-import java.awt.Dimension;\r
 \r
 import javax.swing.JPanel;\r
-import javax.swing.JDialog;\r
 import javax.swing.JTabbedPane;\r
 import javax.swing.JCheckBox;\r
 import javax.swing.JLabel;\r
@@ -26,173 +24,331 @@ import java.awt.FlowLayout;
 import javax.swing.AbstractAction;\r
 import java.awt.event.ActionEvent;\r
 import java.awt.event.ActionListener;\r
-import java.awt.event.ItemEvent;\r
-import java.awt.event.ItemListener;\r
 \r
-import javax.swing.ButtonGroup;\r
 import javax.swing.DefaultCellEditor;\r
-import javax.swing.DefaultListModel;\r
+import javax.swing.JFileChooser;\r
+import javax.swing.JFrame;\r
+import javax.swing.JOptionPane;\r
 import javax.swing.JTextField;\r
 import javax.swing.JButton;\r
 import javax.swing.JScrollPane;\r
 import javax.swing.JTable;\r
 import javax.swing.JComboBox;\r
-import javax.swing.JRadioButton;\r
 import javax.swing.ListSelectionModel;\r
+import javax.swing.event.InternalFrameAdapter;\r
+import javax.swing.event.InternalFrameEvent;\r
 import javax.swing.event.ListSelectionEvent;\r
 import javax.swing.event.ListSelectionListener;\r
 import javax.swing.event.TableModelEvent;\r
 import javax.swing.event.TableModelListener;\r
 import javax.swing.table.DefaultTableModel;\r
-import javax.swing.table.TableColumn;\r
 import javax.swing.table.TableModel;\r
-import javax.swing.JList;\r
 \r
 import org.tianocore.PlatformSurfaceAreaDocument;\r
+import org.tianocore.frameworkwizard.common.DataValidation;\r
+import org.tianocore.frameworkwizard.common.Identifications.OpeningPlatformType;\r
 import org.tianocore.frameworkwizard.common.ui.IInternalFrame;\r
-import java.awt.CardLayout;\r
-import javax.swing.JTree;\r
+\r
+import java.io.File;\r
+import java.util.ArrayList;\r
+import java.util.Iterator;\r
+import java.util.LinkedHashMap;\r
+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
+    private final int oneRowHeight = 20;\r
+\r
+    private final int twoRowHeight = 40;\r
+\r
+    private final int sepHeight = 6;\r
+\r
+    private final int sepWidth = 10;\r
+\r
+    private final int buttonWidth = 90;\r
+\r
+    private final int rowOne = 12;\r
+\r
+    private final int dialogWidth = 600;\r
+\r
+    private final int rowTwo = rowOne + oneRowHeight + sepHeight;\r
+\r
+    private final int rowThree = rowTwo + oneRowHeight + sepHeight;\r
+\r
+    private final int rowFour = rowThree + oneRowHeight + sepHeight;\r
+\r
+    private final int rowFive = rowFour + oneRowHeight + sepHeight;\r
+\r
+    private final int rowSix = rowFive + oneRowHeight + sepHeight;\r
+\r
+    private final int rowSeven = rowSix + oneRowHeight + sepHeight;\r
+\r
+    private final int buttonRow = rowSeven + oneRowHeight + sepHeight + sepHeight;\r
+\r
+    private final int dialogHeight = buttonRow + twoRowHeight + twoRowHeight;\r
+\r
+    private final int lastButtonXLoc = dialogWidth - buttonWidth - sepWidth;\r
+\r
+    private final int next2LastButtonLoc = lastButtonXLoc - buttonWidth - sepWidth;\r
+\r
+    private final int firstButtonLoc = next2LastButtonLoc - buttonWidth - sepWidth;\r
+\r
+    private final int labelColumn = 12;\r
+\r
+    private final int fieldColumn = 168;\r
+\r
+    private final int labelWidth = 155;\r
+\r
+    private final int fieldWidth = 320;\r
+\r
     private static final long serialVersionUID = 1L;\r
+\r
+    static JFrame frame;\r
+\r
     private JPanel jContentPane = null;\r
-    private JPanel jPanel = null;\r
-    private JPanel jPanel1 = null;\r
-    private JPanel jPanel2 = null;\r
-    private JPanel jPanel3 = null;\r
+\r
+    //    private JPanel jPanelContentSouth = null;\r
+\r
+    //    private JPanel jPanelContentNorth = null;\r
+\r
+    //    private JPanel jPanelContentWest = null;\r
+\r
+    //    private JPanel jPanelContentEast = null;\r
+\r
     private JTabbedPane jTabbedPane = null;\r
-    private JPanel jPanel8 = null;\r
-    private JPanel jPanel9 = null;\r
-    private JPanel jPanel10 = null;\r
-    private JPanel jPanel11 = null;\r
-    private JTextField jTextField2 = null;\r
-    private JLabel jLabel3 = null;\r
-    private JTextField jTextField3 = null;\r
-    private JButton jButton4 = null;\r
-    private JButton jButton5 = null;\r
-    private JTextField jTextField4 = null;\r
-    private JScrollPane jScrollPane2 = null;\r
-    private JTable jTable2 = null;\r
-    private DefaultTableModel fileNameTableModel = null;\r
-    private DefaultTableModel imageEntryPointTableModel = null;\r
-    private DefaultTableModel outputDirectoryTableModel = null;\r
+\r
+    private JPanel jPanelUserDef = null;\r
+\r
+    private JPanel jPanelUserDefNorth = null;\r
+\r
+    private JPanel jPanelUserDefCenter = null;\r
+\r
+    private JTextField jTextFieldAntTaskFile = null;\r
+\r
+    private JLabel jLabelAntTaskId = null;\r
+\r
+    private JTextField jTextFieldAntTaskId = null;\r
+\r
+    private JButton jButtonAntTaskAdd = null;\r
+\r
+    private JButton jButtonAntTaskDel = null;\r
+\r
+    private JTextField jTextFieldAntCmdOpts = null;\r
+\r
+    private JScrollPane jScrollPaneAntTasks = null;\r
+\r
+    private JTable jTableAntTasks = null;\r
+\r
+    private DefaultTableModel ffsTableModel = null;\r
+\r
+    private DefaultTableModel sectionsTableModel = null;\r
+\r
+    private DefaultTableModel sectionTableModel = null;\r
+\r
+    private DefaultTableModel subsectionsTableModel = null;\r
+\r
     private DefaultTableModel antTaskTableModel = null;\r
+\r
     private DefaultTableModel ffsAttributesTableModel = null;\r
+\r
     private DefaultTableModel optionsTableModel = null;\r
-    private JPanel jPanel13 = null;\r
-    private JPanel jPanel14 = null;\r
-    private JPanel jPanel18 = null;\r
-    private JScrollPane jScrollPane4 = null;\r
-    private JLabel jLabel6 = null;\r
-    private JList jList = null;\r
-    private JPanel jPanel15 = null;\r
-    private JPanel jPanel16 = null;\r
-    private JPanel jPanel17 = null;\r
-    private JLabel jLabel7 = null;\r
-    private JTextField jTextField6 = null;\r
-    private JButton jButton8 = null;\r
-    private JButton jButton9 = null;\r
-    private JCheckBox jCheckBox5 = null;\r
-    private JScrollPane jScrollPane5 = null;\r
-    private JTable jTable4 = null;\r
-    private JPanel jPanel19 = null;\r
-    private JPanel jPanel20 = null;\r
-    private JLabel jLabel9 = null;\r
-    private JTextField jTextField7 = null;\r
-    private JLabel jLabel10 = null;\r
-    private JComboBox jComboBox2 = null;\r
-    private JLabel jLabel11 = null;\r
-    private JLabel jLabel12 = null;\r
-    private JTextField jTextField8 = null;\r
-    private JScrollPane jScrollPane6 = null;\r
-    private JTable jTable5 = null;\r
-    private JButton jButton10 = null;\r
-    private JButton jButton11 = null;\r
-    private JPanel jPanel21 = null;\r
-    private JButton jButton12 = null;\r
-    private JButton jButton13 = null;\r
-    private JLabel jLabel8 = null;\r
-    private JTextField jTextField9 = null;\r
-    private JLabel jLabel13 = null;\r
-    private JTextField jTextField10 = null;\r
-    private JPanel jPanel22 = null;\r
-    private JCheckBox jCheckBox6 = null;\r
-    private JComboBox jComboBox4 = null;\r
-    private JCheckBox jCheckBox7 = null;\r
-    private JComboBox jComboBox5 = null;\r
-    private JCheckBox jCheckBox8 = null;\r
-    private JTextField jTextField11 = null;\r
-    private JButton jButton14 = null;\r
-    private JButton jButton15 = null;\r
-    private JButton jButton16 = null;\r
-    private DefaultListModel listModel = new DefaultListModel();\r
-    private JScrollPane jScrollPane7 = null;\r
-    private JTree jTree = null;\r
-    private JButton jButton17 = null;\r
-    private JButton jButton18 = null;\r
+\r
+    private JPanel jPanelFfsTab = null;\r
+\r
+    private JPanel jPanelFfsTabCenter = null;\r
+\r
+    private JPanel jPanelFfsTabCenterN = null;\r
+\r
+    private JPanel jPanelFfsTabCenterS = null;\r
+\r
+    private JLabel jLabelFfsKey = null;\r
+\r
+    private JTextField jTextFieldFfsKey = null;\r
+\r
+    private JButton jButtonFfsAdd = null;\r
+\r
+    private JButton jButtonFfsDel = null;\r
+\r
+    private JScrollPane jScrollPaneFfsAttribs = null;\r
+\r
+    private JTable jTableFfsAttribs = null;\r
+\r
+    private JPanel jPanelOptionsTab = null;\r
+\r
+    private JLabel jLabelOptionContents = null;\r
+\r
+    private JTextField jTextFieldOptionContents = null;\r
+\r
+    private JLabel jLabelToolChainFamily = null;\r
+\r
+    private JLabel jLabelSupArch = null;\r
+\r
+    private JLabel jLabelToolCmd = null;\r
+\r
+    private JTextField jTextFieldToolCmd = null;\r
+\r
+    private JScrollPane jScrollPaneOptions = null;\r
+\r
+    private JTable jTableOptions = null;\r
+    \r
+    private JLabel jTitle = null;\r
+\r
+    private JButton jButtonOptionsAdd = null;\r
+\r
+    private JButton jButtonOptionsDel = null;\r
+\r
+    private JButton jButtonFfsAttribNew = null;\r
+\r
+    private JButton jButtonFfsAttribRemove = null;\r
+\r
     private FpdFileContents ffc = null;\r
-    private JButton jButton19 = null;\r
-    private JCheckBox jCheckBox9 = null;\r
-    private JCheckBox jCheckBox10 = null;\r
-    private JCheckBox jCheckBox11 = null;\r
-    private JCheckBox jCheckBox12 = null;\r
-    private JCheckBox jCheckBox13 = null;\r
-    private JCheckBox jCheckBox14 = null;\r
-    private JLabel jLabel14 = null;\r
-    private JTextField jTextField12 = null;\r
-    private JTextField jTextField13 = null;\r
-    private JLabel jLabel15 = null;\r
+\r
+    private OpeningPlatformType docConsole = null;\r
+\r
+    private JPanel jArchitectureSelections = null;\r
+\r
+    private JCheckBox jCheckBoxIA32 = null;\r
+\r
+    private JCheckBox jCheckBoxIpf = null;\r
+\r
+    private JCheckBox jCheckBoxX64 = null;\r
+\r
+    private JCheckBox jCheckBoxEBC = null;\r
+\r
+    private JCheckBox jCheckBoxARM = null;\r
+\r
+    private JCheckBox jCheckBoxPPC = null;\r
+\r
+    private JLabel jLabelBuildTargets = null;\r
+\r
+    private JTextField jTextFieldBuildTargets = null;\r
+\r
+    private JTextField jTextFieldTagName = null;\r
+\r
+    private JLabel jLabelTagName = null;\r
+\r
     private int selectedRow = -1;\r
-    private JLabel jLabel = null;\r
-    private JLabel jLabel1 = null;\r
+\r
+    private JLabel jLabelAntTaskFile = null;\r
+\r
+    private JLabel jLabelAntCmdOpts = null;\r
+\r
+    private JScrollPane jScrollPaneFfs = null;\r
+\r
+    private JTable jTableFfs = null;\r
+\r
+    private JLabel jLabelFfsSection = null;\r
+\r
+    private JScrollPane jScrollPaneFfsSection = null;\r
+\r
+    private JTable jTableFfsSection = null;\r
+\r
+    private JLabel jLabelFfsSubSections = null;\r
+\r
+    private JScrollPane jScrollPaneFfsSubSection = null;\r
+\r
+    private JTable jTableFfsSubSection = null;\r
+\r
+    private JLabel jLabelEncapType = null;\r
+\r
+    private JTextField jTextFieldEncapType = null;\r
+\r
+    private JPanel jPanelFfsAttribButtonGroup = null;\r
+\r
+    private JLabel jLabelFfsAttribs = null;\r
+\r
+    private JButton jButtonFfsSectionNew = null;\r
+\r
+    private JButton jButtonFfsSectionRemove = null;\r
+\r
+    private JButton jButtonFfsSubSectionNew = null;\r
+\r
+    private JButton jButtonFfsSubSectionRemove = null;\r
+\r
+    private JLabel jLabelFfsSections = null;\r
+\r
+    private JButton jButtonFfsSectionsNew = null;\r
+\r
+    private JButton jButtonFfsSectionsRemove = null;\r
+\r
+    private JScrollPane jScrollPaneFfsSections = null;\r
+\r
+    private JTable jTableFfsSections = null;\r
+\r
+    private JButton jButtonAntTaskFileBrowse = null;\r
+\r
+    private JTextField jTextFieldToolChainFamily = null;\r
+\r
+    private JSplitPane jSplitPaneFfsC = null;\r
+\r
+    private JPanel jPanelFfsCTop = null;\r
+\r
+    private JSplitPane jSplitPaneFfsCBottom = null;\r
+\r
+    private JPanel jPanelFfsCBottomTop = null;\r
+\r
+    private JPanel jPanelFfsCBottomBottom = null;\r
+\r
+    private JPanel jPanelSectionN = null;\r
+\r
+    private JPanel jPanelSectionsN = null;\r
+\r
+    private JPanel jPanelSubSectionN = null;\r
+\r
+    private JPanel jPanelOptionsContainer = null;\r
+\r
+    private JPanel jPanelUserDefCenterN = null;\r
+\r
     /**\r
      * This method initializes jPanel  \r
      *         \r
      * @return javax.swing.JPanel      \r
+     private JPanel getJPanelContentSouth() {\r
+     if (jPanelContentSouth == null) {\r
+     jPanelContentSouth = new JPanel();\r
+     }\r
+     return jPanelContentSouth;\r
+     }\r
      */\r
-    private JPanel getJPanel() {\r
-        if (jPanel == null) {\r
-            jPanel = new JPanel();\r
-        }\r
-        return jPanel;\r
-    }\r
 \r
     /**\r
      * This method initializes jPanel1 \r
      *         \r
      * @return javax.swing.JPanel      \r
+     private JPanel getJPanelContentNorth() {\r
+     if (jPanelContentNorth == null) {\r
+     jPanelContentNorth = new JPanel();\r
+     }\r
+     return jPanelContentNorth;\r
+     }\r
      */\r
-    private JPanel getJPanel1() {\r
-        if (jPanel1 == null) {\r
-            jPanel1 = new JPanel();\r
-        }\r
-        return jPanel1;\r
-    }\r
 \r
     /**\r
      * This method initializes jPanel2 \r
      *         \r
      * @return javax.swing.JPanel      \r
+     private JPanel getJPanelContentWest() {\r
+     if (jPanelContentWest == null) {\r
+     jPanelContentWest = new JPanel();\r
+     }\r
+     return jPanelContentWest;\r
+     }\r
      */\r
-    private JPanel getJPanel2() {\r
-        if (jPanel2 == null) {\r
-            jPanel2 = new JPanel();\r
-        }\r
-        return jPanel2;\r
-    }\r
 \r
     /**\r
      * This method initializes jPanel3 \r
      *         \r
      * @return javax.swing.JPanel      \r
+     private JPanel getJPanelContentEast() {\r
+     if (jPanelContentEast == null) {\r
+     jPanelContentEast = new JPanel();\r
+     }\r
+     return jPanelContentEast;\r
+     }\r
      */\r
-    private JPanel getJPanel3() {\r
-        if (jPanel3 == null) {\r
-            jPanel3 = new JPanel();\r
-        }\r
-        return jPanel3;\r
-    }\r
 \r
     /**\r
      * This method initializes jTabbedPane     \r
@@ -202,1223 +358,1804 @@ public class FpdBuildOptions extends IInternalFrame {
     private JTabbedPane getJTabbedPane() {\r
         if (jTabbedPane == null) {\r
             jTabbedPane = new JTabbedPane();\r
-            jTabbedPane.addTab("FFS", null, getJPanel13(), null);\r
-            jTabbedPane.addTab("Options", null, getJPanel20(), null);\r
-            jTabbedPane.addTab("User Defined ANT Tasks", null, getJPanel8(), null);\r
+            jTabbedPane.addTab("Flash Filesystem Options", null, getJPanelFfsTab(), null);\r
+            jTabbedPane.addTab("Tool Arguments", null, getJPanelOptionsTab(), null);\r
+            jTabbedPane.addTab("User Defined ANT Tasks", null, getJPanelUserDef(), null);\r
         }\r
         return jTabbedPane;\r
     }\r
 \r
-    \r
     /**\r
-     * This method initializes jPanel8 \r
-     *         \r
-     * @return javax.swing.JPanel      \r
+     * This method initializes this\r
+     * \r
+     * @return void\r
      */\r
-    private JPanel getJPanel8() {\r
-        if (jPanel8 == null) {\r
-            jPanel8 = new JPanel();\r
-            jPanel8.setLayout(new BorderLayout());\r
-            jPanel8.add(getJPanel9(), java.awt.BorderLayout.NORTH);\r
-            jPanel8.add(getJPanel10(), java.awt.BorderLayout.SOUTH);\r
-            jPanel8.add(getJPanel11(), java.awt.BorderLayout.CENTER);\r
+    private void initialize() {\r
+        this.setSize(722, 577);\r
+        this.setTitle("Platform Build Options");\r
+        this.setContentPane(getJContentPane());\r
+    }\r
 \r
+    /**\r
+     * This method initializes jContentPane\r
+     * \r
+     * @return javax.swing.JPanel\r
+     */\r
+    private JPanel getJContentPane() {\r
+        if (jContentPane == null) {\r
+            jContentPane = new JPanel();\r
+            jContentPane.setLayout(new BorderLayout());\r
+            //            jContentPane.add(getJPanelContentSouth(), java.awt.BorderLayout.SOUTH);\r
+            //            jContentPane.add(getJPanelContentNorth(), java.awt.BorderLayout.NORTH);\r
+            //            jContentPane.add(getJPanelContentWest(), java.awt.BorderLayout.WEST);\r
+            //            jContentPane.add(getJPanelContentEast(), java.awt.BorderLayout.EAST);\r
+            jContentPane.add(getJTabbedPane(), java.awt.BorderLayout.CENTER);\r
         }\r
-        return jPanel8;\r
+        return jContentPane;\r
     }\r
 \r
     /**\r
-     * This method initializes jPanel9 \r
-     *         \r
-     * @return javax.swing.JPanel      \r
+     * @param args\r
      */\r
-    private JPanel getJPanel9() {\r
-        if (jPanel9 == null) {\r
-            jLabel = new JLabel();\r
-            jLabel.setText("ANT Task File");\r
-            jLabel.setPreferredSize(new java.awt.Dimension(80,20));\r
-            FlowLayout flowLayout8 = new FlowLayout();\r
-            flowLayout8.setAlignment(java.awt.FlowLayout.LEFT);\r
-            jLabel3 = new JLabel();\r
-            jLabel3.setText("ID");\r
-            jPanel9 = new JPanel();\r
-            jPanel9.setLayout(flowLayout8);\r
-            jPanel9.add(jLabel, null);\r
-            jPanel9.add(getJTextField2(), null);\r
-            jPanel9.add(jLabel3, null);\r
-            jPanel9.add(getJTextField3(), null);\r
-        }\r
-        return jPanel9;\r
+    public static void main(String[] args) {\r
+        // TODO Auto-generated method stub\r
+        new FpdBuildOptions().setVisible(true);\r
     }\r
 \r
     /**\r
-     * This method initializes jPanel10        \r
+     * This is the default constructor\r
+     */\r
+    public FpdBuildOptions() {\r
+        super();\r
+        initialize();\r
+        this.setVisible(true);\r
+    }\r
+\r
+    public FpdBuildOptions(PlatformSurfaceAreaDocument.PlatformSurfaceArea fpd) {\r
+        this();\r
+        ffc = new FpdFileContents(fpd);\r
+        init(ffc);\r
+    }\r
+\r
+    public FpdBuildOptions(OpeningPlatformType opt) {\r
+        this(opt.getXmlFpd());\r
+        docConsole = opt;\r
+    }\r
+\r
+    private void init(FpdFileContents ffc) {\r
+        initOptionTable();\r
+        initAntTaskTable();\r
+        initFfsTable();\r
+        this.addInternalFrameListener(new InternalFrameAdapter() {\r
+            public void internalFrameDeactivated(InternalFrameEvent e) {\r
+                if (jTableFfs.isEditing()) {\r
+                    jTableFfs.getCellEditor().stopCellEditing();\r
+                }\r
+                if (jTableFfsSection.isEditing()) {\r
+                    jTableFfsSection.getCellEditor().stopCellEditing();\r
+                }\r
+                if (jTableAntTasks.isEditing()) {\r
+                    jTableAntTasks.getCellEditor().stopCellEditing();\r
+                }\r
+                if (jTableFfsSubSection.isEditing()) {\r
+                    jTableFfsSubSection.getCellEditor().stopCellEditing();\r
+                }\r
+                if (jTableFfsAttribs.isEditing()) {\r
+                    jTableFfsAttribs.getCellEditor().stopCellEditing();\r
+                }\r
+                if (jTableOptions.isEditing()) {\r
+                    jTableOptions.getCellEditor().stopCellEditing();\r
+                }\r
+            }\r
+        });\r
+    }\r
+\r
+    /**\r
+     * This method initializes jPanel13        \r
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel10() {\r
-        if (jPanel10 == null) {\r
-            jPanel10 = new JPanel();\r
+    private JPanel getJPanelFfsTab() {\r
+        if (jPanelFfsTab == null) {\r
+            jPanelFfsTab = new JPanel();\r
+            jPanelFfsTab.setLayout(new BorderLayout());\r
+            jPanelFfsTab.add(getJPanelFfsTabCenter(), java.awt.BorderLayout.CENTER);\r
+            jPanelFfsTab.add(getJScrollPaneFfs(), java.awt.BorderLayout.WEST);\r
         }\r
-        return jPanel10;\r
+        return jPanelFfsTab;\r
     }\r
 \r
     /**\r
-     * This method initializes jPanel11        \r
+     * This method initializes jPanel18        \r
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel11() {\r
-        if (jPanel11 == null) {\r
-            jLabel1 = new JLabel();\r
-            jLabel1.setText("ANT Command Options");\r
-            jLabel1.setPreferredSize(new java.awt.Dimension(131,20));\r
-            FlowLayout flowLayout3 = new FlowLayout();\r
-            flowLayout3.setHgap(5);\r
-            flowLayout3.setAlignment(java.awt.FlowLayout.LEFT);\r
-            jPanel11 = new JPanel();\r
-            jPanel11.setLayout(flowLayout3);\r
-            jPanel11.add(jLabel1, null);\r
-            jPanel11.add(getJTextField4(), null);\r
-            jPanel11.add(getJButton4(), null);\r
-            jPanel11.add(getJButton5(), null);\r
-            jPanel11.add(getJScrollPane2(), null);\r
+    private JPanel getJPanelFfsTabCenter() {\r
+        if (jPanelFfsTabCenter == null) {\r
+            jPanelFfsTabCenter = new JPanel();\r
+            jPanelFfsTabCenter.setLayout(new BorderLayout());\r
+            jPanelFfsTabCenter.add(getJPanelFfsTabCenterN(), java.awt.BorderLayout.NORTH);\r
+            jPanelFfsTabCenter.add(getJPanelFfsTabCenterS(), java.awt.BorderLayout.SOUTH);\r
+            jPanelFfsTabCenter.add(getJSplitPaneFfsC(), java.awt.BorderLayout.CENTER);\r
         }\r
-        return jPanel11;\r
+        return jPanelFfsTabCenter;\r
     }\r
 \r
     /**\r
-     * This method initializes jTextField2     \r
+     * This method initializes jPanel15        \r
      *         \r
-     * @return javax.swing.JTextField  \r
+     * @return javax.swing.JPanel      \r
      */\r
-    private JTextField getJTextField2() {\r
-        if (jTextField2 == null) {\r
-            jTextField2 = new JTextField();\r
-            jTextField2.setPreferredSize(new java.awt.Dimension(200,20));\r
+    private JPanel getJPanelFfsTabCenterN() {\r
+        if (jPanelFfsTabCenterN == null) {\r
+            jLabelEncapType = new JLabel();\r
+            jLabelEncapType.setText("Encapsulation Type");\r
+            FlowLayout flowLayout5 = new FlowLayout();\r
+            flowLayout5.setAlignment(java.awt.FlowLayout.RIGHT);\r
+            jLabelFfsKey = new JLabel();\r
+            jLabelFfsKey.setText("FFS Key");\r
+            jPanelFfsTabCenterN = new JPanel();\r
+            jPanelFfsTabCenterN.setLayout(flowLayout5);\r
+            jPanelFfsTabCenterN.add(jLabelFfsKey, null);\r
+            jPanelFfsTabCenterN.add(getJTextFieldFfsKey(), null);\r
+            jPanelFfsTabCenterN.add(jLabelEncapType, null);\r
+            jPanelFfsTabCenterN.add(getJTextFieldEncapType(), null);\r
+            jPanelFfsTabCenterN.add(getJButtonFfsAdd(), null);\r
+            jPanelFfsTabCenterN.add(getJButtonFfsDel(), null);\r
         }\r
-        return jTextField2;\r
+        return jPanelFfsTabCenterN;\r
     }\r
 \r
     /**\r
-     * This method initializes jTextField3     \r
+     * This method initializes jPanel16        \r
      *         \r
-     * @return javax.swing.JTextField  \r
+     * @return javax.swing.JPanel      \r
      */\r
-    private JTextField getJTextField3() {\r
-        if (jTextField3 == null) {\r
-            jTextField3 = new JTextField();\r
-            jTextField3.setPreferredSize(new java.awt.Dimension(100,20));\r
+    private JPanel getJPanelFfsTabCenterS() {\r
+        if (jPanelFfsTabCenterS == null) {\r
+            jLabelFfsAttribs = new JLabel();\r
+            jLabelFfsAttribs.setText("Attributes");\r
+            FlowLayout flowLayout6 = new FlowLayout();\r
+            flowLayout6.setHgap(5);\r
+            flowLayout6.setVgap(20);\r
+            flowLayout6.setAlignment(java.awt.FlowLayout.CENTER);\r
+            jPanelFfsTabCenterS = new JPanel();\r
+            jPanelFfsTabCenterS.setPreferredSize(new java.awt.Dimension(491, 130));\r
+            jPanelFfsTabCenterS.setLayout(flowLayout6);\r
+            jPanelFfsTabCenterS.add(jLabelFfsAttribs, null);\r
+            jPanelFfsTabCenterS.add(getJScrollPaneFfsAttribs(), null);\r
+            jPanelFfsTabCenterS.add(getJPanelFfsAttribButtonGroup(), null);\r
         }\r
-        return jTextField3;\r
+        return jPanelFfsTabCenterS;\r
     }\r
 \r
     /**\r
-     * This method initializes jButton4        \r
+     * This method initializes jTextField6     \r
      *         \r
-     * @return javax.swing.JButton     \r
+     * @return javax.swing.JTextField  \r
      */\r
-    private JButton getJButton4() {\r
-        if (jButton4 == null) {\r
-            jButton4 = new JButton();\r
-            jButton4.setPreferredSize(new java.awt.Dimension(90,20));\r
-            jButton4.setText("Add");\r
-            jButton4.addActionListener(new ActionListener() {\r
-                public void actionPerformed(ActionEvent e) {\r
-                    Object[] o = {jTextField3.getText(), null, null};\r
-                        o[1] = jTextField2.getText();\r
-                        o[2] = jTextField4.getText();\r
-                        ffc.genBuildOptionsUserDefAntTask(o[0]+"", null, o[2]+"");\r
-                    antTaskTableModel.addRow(o);\r
-                    \r
+    private JTextField getJTextFieldFfsKey() {\r
+        if (jTextFieldFfsKey == null) {\r
+            jTextFieldFfsKey = new JTextField();\r
+            jTextFieldFfsKey.setPreferredSize(new java.awt.Dimension(100, 20));\r
+            jTextFieldFfsKey.setEditable(true);\r
+            jTextFieldFfsKey.addFocusListener(new java.awt.event.FocusAdapter() {\r
+                public void focusLost(java.awt.event.FocusEvent e) {\r
+                    if (jTableFfs.getSelectedRow() < 0) {\r
+                        return;\r
+                    }\r
+                    //                    ffc.updateBuildOptionsFfsKey(jTable.getSelectedRow(), jTextField6.getText());\r
                 }\r
             });\r
         }\r
-        return jButton4;\r
+        return jTextFieldFfsKey;\r
     }\r
 \r
     /**\r
-     * This method initializes jButton5        \r
+     * This method initializes jButton8        \r
      *         \r
      * @return javax.swing.JButton     \r
      */\r
-    private JButton getJButton5() {\r
-        if (jButton5 == null) {\r
-            jButton5 = new JButton();\r
-            jButton5.setPreferredSize(new java.awt.Dimension(90,20));\r
-            jButton5.setText("Delete");\r
-            jButton5.addActionListener(new ActionListener() {\r
-                public void actionPerformed(ActionEvent e) {\r
-                    if (selectedRow >= 0) {\r
-                        antTaskTableModel.removeRow(selectedRow);\r
-                        ffc.removeBuildOptionsUserDefAntTask(selectedRow);\r
+    private JButton getJButtonFfsAdd() {\r
+        if (jButtonFfsAdd == null) {\r
+            jButtonFfsAdd = new JButton();\r
+            jButtonFfsAdd.setPreferredSize(new java.awt.Dimension(70, 20));\r
+            jButtonFfsAdd.setText("Add");\r
+            jButtonFfsAdd.addActionListener(new AbstractAction() {\r
+                /**\r
+                 * \r
+                 */\r
+                private static final long serialVersionUID = -2923720717273384221L;\r
+\r
+                public void actionPerformed(java.awt.event.ActionEvent e) {\r
+                    if (jTextFieldFfsKey.getText().length() > 0) {\r
+                        String[] row = { jTextFieldFfsKey.getText() };\r
+                        ffsTableModel.addRow(row);\r
+                        docConsole.setSaved(false);\r
+                        ffc.genBuildOptionsFfs(jTextFieldFfsKey.getText(), jTextFieldEncapType.getText());\r
                     }\r
                 }\r
             });\r
         }\r
-        return jButton5;\r
+        return jButtonFfsAdd;\r
     }\r
 \r
     /**\r
-     * This method initializes jTextField4     \r
+     * This method initializes jButton9        \r
      *         \r
-     * @return javax.swing.JTextField  \r
+     * @return javax.swing.JButton     \r
      */\r
-    private JTextField getJTextField4() {\r
-        if (jTextField4 == null) {\r
-            jTextField4 = new JTextField();\r
-            jTextField4.setPreferredSize(new java.awt.Dimension(270,20));\r
-            jTextField4.setEnabled(true);\r
+    private JButton getJButtonFfsDel() {\r
+        if (jButtonFfsDel == null) {\r
+            jButtonFfsDel = new JButton();\r
+            jButtonFfsDel.setPreferredSize(new java.awt.Dimension(70, 20));\r
+            jButtonFfsDel.setText("Delete");\r
+            jButtonFfsDel.addActionListener(new AbstractAction() {\r
+                /**\r
+                 * \r
+                 */\r
+                private static final long serialVersionUID = -4002678939178194476L;\r
+\r
+                public void actionPerformed(ActionEvent arg0) {\r
+                    if (jTableFfs.getSelectedRow() < 0) {\r
+                        return;\r
+                    }\r
+                    docConsole.setSaved(false);\r
+                    ffc.removeBuildOptionsFfs(jTableFfs.getSelectedRow());\r
+                    ffsTableModel.removeRow(jTableFfs.getSelectedRow());\r
+                }\r
+            });\r
         }\r
-        return jTextField4;\r
+        return jButtonFfsDel;\r
     }\r
 \r
     /**\r
-     * This method initializes jScrollPane2    \r
+     * This method initializes jScrollPane5    \r
      *         \r
      * @return javax.swing.JScrollPane \r
      */\r
-    private JScrollPane getJScrollPane2() {\r
-        if (jScrollPane2 == null) {\r
-            jScrollPane2 = new JScrollPane();\r
-            jScrollPane2.setPreferredSize(new java.awt.Dimension(600,100));\r
-            jScrollPane2.setViewportView(getJTable2());\r
+    private JScrollPane getJScrollPaneFfsAttribs() {\r
+        if (jScrollPaneFfsAttribs == null) {\r
+            jScrollPaneFfsAttribs = new JScrollPane();\r
+            jScrollPaneFfsAttribs.setPreferredSize(new java.awt.Dimension(350, 100));\r
+            jScrollPaneFfsAttribs.setViewportView(getJTableFfsAttribs());\r
         }\r
-        return jScrollPane2;\r
+        return jScrollPaneFfsAttribs;\r
     }\r
 \r
     /**\r
-     * This method initializes jTable2 \r
+     * This method initializes jTable4 \r
      *         \r
      * @return javax.swing.JTable      \r
      */\r
-    private JTable getJTable2() {\r
-        if (jTable2 == null) {\r
-            antTaskTableModel = new DefaultTableModel();\r
-            jTable2 = new JTable(antTaskTableModel);\r
-            antTaskTableModel.addColumn("ID");\r
-            antTaskTableModel.addColumn("Filename");\r
-            antTaskTableModel.addColumn("ANT Command Options");\r
-            \r
-            jTable2.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
-            jTable2.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
-                public void valueChanged(ListSelectionEvent e) {\r
-                    selectedRow = -1;\r
-                    if (e.getValueIsAdjusting()){\r
-                        return;\r
-                    }\r
-                    ListSelectionModel lsm = (ListSelectionModel)e.getSource();\r
-                    if (lsm.isSelectionEmpty()) {\r
-                        return;\r
-                    }\r
-                    else{\r
-                        selectedRow = lsm.getMinSelectionIndex();\r
-                    }\r
-                }\r
-            });\r
-            \r
-            jTable2.getModel().addTableModelListener(new TableModelListener() {\r
+    private JTable getJTableFfsAttribs() {\r
+        if (jTableFfsAttribs == null) {\r
+            ffsAttributesTableModel = new DefaultTableModel();\r
+            jTableFfsAttribs = new JTable(ffsAttributesTableModel);\r
+            jTableFfsAttribs.setPreferredSize(new java.awt.Dimension(400, 80));\r
+            jTableFfsAttribs.setRowHeight(20);\r
+            ffsAttributesTableModel.addColumn("Name");\r
+            ffsAttributesTableModel.addColumn("Value");\r
+\r
+            jTableFfsAttribs.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
+            jTableFfsAttribs.getModel().addTableModelListener(new TableModelListener() {\r
                 public void tableChanged(TableModelEvent arg0) {\r
                     // TODO Auto-generated method stub\r
                     int row = arg0.getFirstRow();\r
-                    TableModel m = (TableModel)arg0.getSource();\r
-                    if (arg0.getType() == TableModelEvent.UPDATE){\r
+                    TableModel m = (TableModel) arg0.getSource();\r
+                    if (arg0.getType() == TableModelEvent.UPDATE) {\r
                         //ToDo Data Validition check.\r
-                        String id = m.getValueAt(row, 0) + "";\r
-                        String file = m.getValueAt(row, 1) + "";\r
-                        String execOrder = m.getValueAt(row, 2) + "";\r
-                        if (id.length() == 0) {\r
+                        String name = m.getValueAt(row, 0) + "";\r
+                        String value = m.getValueAt(row, 1) + "";\r
+\r
+                        if (name.length() == 0) {\r
                             return;\r
                         }\r
-                        if (file.length() == 0 && execOrder.length() == 0){\r
+                        if (value.length() == 0) {\r
                             return;\r
                         }\r
-                        if (file.length() == 0) {\r
-                            file = null;\r
-                        }\r
-                        if (execOrder.length() == 0) {\r
-                            execOrder = null;\r
-                        }\r
-                        ffc.updateBuildOptionsUserDefAntTask(row, id, file, execOrder);\r
-                        \r
+                        docConsole.setSaved(false);\r
+                        ffc.updateBuildOptionsFfsAttribute(jTableFfs.getSelectedRow(), row, name, value);\r
                     }\r
                 }\r
             });\r
         }\r
-        return jTable2;\r
+        return jTableFfsAttribs;\r
     }\r
 \r
-    /**\r
-     * This method initializes jPanel13        \r
-     *         \r
-     * @return javax.swing.JPanel      \r
-     */\r
-    private JPanel getJPanel13() {\r
-        if (jPanel13 == null) {\r
-            jPanel13 = new JPanel();\r
-            jPanel13.setLayout(new BorderLayout());\r
-            jPanel13.add(getJPanel14(), java.awt.BorderLayout.WEST);\r
-            jPanel13.add(getJPanel18(), java.awt.BorderLayout.CENTER);\r
+    private void initFfsTable() {\r
+        int ffsCount = ffc.getBuildOptionsFfsCount();\r
+        if (ffsCount < 0) {\r
+            return;\r
         }\r
-        return jPanel13;\r
-    }\r
-\r
-    /**\r
-     * This method initializes jPanel14        \r
-     *         \r
-     * @return javax.swing.JPanel      \r
-     */\r
-    private JPanel getJPanel14() {\r
-        if (jPanel14 == null) {\r
-            jLabel6 = new JLabel();\r
-            jLabel6.setText("FFS Types");\r
-            jPanel14 = new JPanel();\r
-            jPanel14.setPreferredSize(new java.awt.Dimension(120,300));\r
-            jPanel14.add(jLabel6, null);\r
-            jPanel14.add(getJScrollPane4(), null);\r
+        String[][] saa = new String[ffsCount][1];\r
+        ffc.getBuildOptionsFfsKey(saa);\r
+        for (int i = 0; i < saa.length; ++i) {\r
+            ffsTableModel.addRow(saa[i]);\r
         }\r
-        return jPanel14;\r
     }\r
 \r
     /**\r
-     * This method initializes jPanel18        \r
-     *         \r
-     * @return javax.swing.JPanel      \r
+     * This method initializes jButton17    \r
+     *  \r
+     * @return javax.swing.JButton  \r
      */\r
-    private JPanel getJPanel18() {\r
-        if (jPanel18 == null) {\r
-            jPanel18 = new JPanel();\r
-            jPanel18.setLayout(new BorderLayout());\r
-            jPanel18.add(getJPanel15(), java.awt.BorderLayout.NORTH);\r
-            jPanel18.add(getJPanel16(), java.awt.BorderLayout.SOUTH);\r
-            jPanel18.add(getJPanel17(), java.awt.BorderLayout.EAST);\r
-            jPanel18.add(getJPanel19(), java.awt.BorderLayout.CENTER);\r
+    private JButton getJButtonFfsAttribNew() {\r
+        if (jButtonFfsAttribNew == null) {\r
+            jButtonFfsAttribNew = new JButton();\r
+            jButtonFfsAttribNew.setPreferredSize(new java.awt.Dimension(80, 20));\r
+            jButtonFfsAttribNew.setText("New");\r
+            jButtonFfsAttribNew.addActionListener(new AbstractAction() {\r
+                /**\r
+                 * \r
+                 */\r
+                private static final long serialVersionUID = 1L;\r
+\r
+                public void actionPerformed(ActionEvent arg0) {\r
+                    if (jTableFfs.getSelectedRow() < 0) {\r
+                        return;\r
+                    }\r
+                    Object[] o = { "", "" };\r
+                    ffsAttributesTableModel.addRow(o);\r
+                    docConsole.setSaved(false);\r
+                    ffc.genBuildOptionsFfsAttribute(jTableFfs.getSelectedRow(), "", "");\r
+                }\r
+            });\r
         }\r
-        return jPanel18;\r
+        return jButtonFfsAttribNew;\r
     }\r
 \r
     /**\r
-     * This method initializes jScrollPane4    \r
-     *         \r
-     * @return javax.swing.JScrollPane \r
+     * This method initializes jButton18    \r
+     *  \r
+     * @return javax.swing.JButton  \r
      */\r
-    private JScrollPane getJScrollPane4() {\r
-        if (jScrollPane4 == null) {\r
-            jScrollPane4 = new JScrollPane();\r
-            jScrollPane4.setPreferredSize(new java.awt.Dimension(120,330));\r
-            jScrollPane4.setViewportView(getJList());\r
+    private JButton getJButtonFfsAttribRemove() {\r
+        if (jButtonFfsAttribRemove == null) {\r
+            jButtonFfsAttribRemove = new JButton();\r
+            jButtonFfsAttribRemove.setPreferredSize(new java.awt.Dimension(80, 20));\r
+            jButtonFfsAttribRemove.setText("Remove");\r
+            jButtonFfsAttribRemove.addActionListener(new AbstractAction() {\r
+                /**\r
+                 * \r
+                 */\r
+                private static final long serialVersionUID = 1L;\r
+\r
+                public void actionPerformed(ActionEvent arg0) {\r
+                    if (jTableFfs.getSelectedRow() < 0) {\r
+                        return;\r
+                    }\r
+                    if (jTableFfsAttribs.getSelectedRow() >= 0) {\r
+                        docConsole.setSaved(false);\r
+                        ffsAttributesTableModel.removeRow(jTableFfsAttribs.getSelectedRow());\r
+                        ffc.removeBuildOptionsFfsAttribute(jTableFfs.getSelectedRow(),\r
+                                                           jTableFfsAttribs.getSelectedRow());\r
+                    }\r
+                }\r
+            });\r
         }\r
-        return jScrollPane4;\r
+        return jButtonFfsAttribRemove;\r
     }\r
 \r
     /**\r
-     * This method initializes jList   \r
-     *         \r
-     * @return javax.swing.JList       \r
+     * This method initializes jScrollPane  \r
+     *  \r
+     * @return javax.swing.JScrollPane  \r
      */\r
-    private JList getJList() {\r
-        if (jList == null) {\r
-            jList = new JList(listModel);\r
+    private JScrollPane getJScrollPaneFfs() {\r
+        if (jScrollPaneFfs == null) {\r
+            jScrollPaneFfs = new JScrollPane();\r
+            jScrollPaneFfs.setPreferredSize(new java.awt.Dimension(150, 419));\r
+            jScrollPaneFfs.setViewportView(getJTableFfs());\r
         }\r
-        return jList;\r
+        return jScrollPaneFfs;\r
     }\r
 \r
     /**\r
-     * This method initializes jPanel15        \r
-     *         \r
-     * @return javax.swing.JPanel      \r
+     * This method initializes jTable   \r
+     *  \r
+     * @return javax.swing.JTable   \r
      */\r
-    private JPanel getJPanel15() {\r
-        if (jPanel15 == null) {\r
-            FlowLayout flowLayout5 = new FlowLayout();\r
-            flowLayout5.setAlignment(java.awt.FlowLayout.RIGHT);\r
-            jLabel7 = new JLabel();\r
-            jLabel7.setText("Type");\r
-            jPanel15 = new JPanel();\r
-            jPanel15.setLayout(flowLayout5);\r
-            jPanel15.add(jLabel7, null);\r
-            jPanel15.add(getJTextField6(), null);\r
-            jPanel15.add(getJButton8(), null);\r
-            jPanel15.add(getJButton9(), null);\r
+    private JTable getJTableFfs() {\r
+        if (jTableFfs == null) {\r
+            ffsTableModel = new DefaultTableModel();\r
+            ffsTableModel.addColumn("FFS Type");\r
+            jTableFfs = new JTable(ffsTableModel);\r
+            jTableFfs.setShowGrid(false);\r
+            jTableFfs.setRowHeight(20);\r
+\r
+            jTableFfs.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
+            jTableFfs.getSelectionModel().addListSelectionListener(new ListSelectionListener() {\r
+                public void valueChanged(ListSelectionEvent e) {\r
+\r
+                    if (e.getValueIsAdjusting()) {\r
+                        return;\r
+                    }\r
+                    ListSelectionModel lsm = (ListSelectionModel) e.getSource();\r
+                    if (lsm.isSelectionEmpty()) {\r
+                        return;\r
+                    } else {\r
+                        int row = lsm.getMinSelectionIndex();\r
+                        sectionTableModel.setRowCount(0);\r
+                        sectionsTableModel.setRowCount(0);\r
+                        subsectionsTableModel.setRowCount(0);\r
+                        ffsAttributesTableModel.setRowCount(0);\r
+                        String[] sArray = { "", "" };\r
+                        LinkedHashMap<String, String> lhm = new LinkedHashMap<String, String>();\r
+                        ArrayList<String> alSections = new ArrayList<String>();\r
+                        ArrayList<String> alSection = new ArrayList<String>();\r
+                        ffc.getBuildOptionsFfs(row, sArray, lhm, alSections, alSection);\r
+                        jTextFieldFfsKey.setText(sArray[0]);\r
+                        jTextFieldEncapType.setText(sArray[1]);\r
+                        for (int i = 0; i < alSection.size(); ++i) {\r
+                            String[] sectionRow = { alSection.get(i) };\r
+                            sectionTableModel.addRow(sectionRow);\r
+                        }\r
+                        for (int j = 0; j < alSections.size(); ++j) {\r
+                            String[] sectionsRow = { alSections.get(j) };\r
+                            sectionsTableModel.addRow(sectionsRow);\r
+                        }\r
+                        if (lhm.size() <= 0) {\r
+                            return;\r
+                        }\r
+                        Set<String> keySet = lhm.keySet();\r
+                        Iterator<String> is = keySet.iterator();\r
+                        while (is.hasNext()) {\r
+                            String key = is.next();\r
+                            String[] attribRow = { key, lhm.get(key) };\r
+                            ffsAttributesTableModel.addRow(attribRow);\r
+                        }\r
+                    }\r
+                }\r
+            });\r
+\r
+            jTableFfs.getModel().addTableModelListener(new TableModelListener() {\r
+                public void tableChanged(TableModelEvent arg0) {\r
+                    // TODO Auto-generated method stub\r
+                    int row = arg0.getFirstRow();\r
+                    TableModel m = (TableModel) arg0.getSource();\r
+                    if (arg0.getType() == TableModelEvent.UPDATE) {\r
+                        //ToDo Data Validition check.\r
+                        String id = m.getValueAt(row, 0) + "";\r
+\r
+                        if (id.length() == 0) {\r
+                            return;\r
+                        }\r
+                        docConsole.setSaved(false);\r
+                        ffc.updateBuildOptionsFfsKey(row, id);\r
+                    }\r
+                }\r
+            });\r
         }\r
-        return jPanel15;\r
+        return jTableFfs;\r
     }\r
 \r
     /**\r
-     * This method initializes jPanel16        \r
-     *         \r
-     * @return javax.swing.JPanel      \r
+     * This method initializes jScrollPane1 \r
+     *  \r
+     * @return javax.swing.JScrollPane  \r
      */\r
-    private JPanel getJPanel16() {\r
-        if (jPanel16 == null) {\r
-            FlowLayout flowLayout6 = new FlowLayout();\r
-            flowLayout6.setHgap(5);\r
-            flowLayout6.setAlignment(java.awt.FlowLayout.LEFT);\r
-            jPanel16 = new JPanel();\r
-            jPanel16.setPreferredSize(new java.awt.Dimension(491,130));\r
-            jPanel16.setLayout(flowLayout6);\r
-            jPanel16.add(getJCheckBox5(), null);\r
-            jPanel16.add(getJButton17(), null);\r
-            jPanel16.add(getJButton18(), null);\r
-            jPanel16.add(getJScrollPane5(), null);\r
+    private JScrollPane getJScrollPaneFfsSection() {\r
+        if (jScrollPaneFfsSection == null) {\r
+            jScrollPaneFfsSection = new JScrollPane();\r
+//            jScrollPaneFfsSection.setPreferredSize(new java.awt.Dimension(500, 80));\r
+            jScrollPaneFfsSection.setViewportView(getJTableFfsSection());\r
         }\r
-        return jPanel16;\r
+        return jScrollPaneFfsSection;\r
     }\r
 \r
     /**\r
-     * This method initializes jPanel17        \r
-     *         \r
-     * @return javax.swing.JPanel      \r
+     * This method initializes jTable1  \r
+     *  \r
+     * @return javax.swing.JTable   \r
      */\r
-    private JPanel getJPanel17() {\r
-        if (jPanel17 == null) {\r
-            jPanel17 = new JPanel();\r
-            jPanel17.add(getJScrollPane7(), null);\r
+    private JTable getJTableFfsSection() {\r
+        if (jTableFfsSection == null) {\r
+            sectionTableModel = new DefaultTableModel();\r
+            sectionTableModel.addColumn("SectionType");\r
+\r
+            jTableFfsSection = new JTable(sectionTableModel);\r
+            jTableFfsSection.setRowHeight(20);\r
+            JComboBox cb = new JComboBox();\r
+            cb.addItem("EFI_SECTION_FREEFORM_SUBTYPE_GUID");\r
+            cb.addItem("EFI_SECTION_VERSION");\r
+            cb.addItem("EFI_SECTION_USER_INTERFACE");\r
+            cb.addItem("EFI_SECTION_DXE_DEPEX");\r
+            cb.addItem("EFI_SECTION_PEI_DEPEX");\r
+            cb.addItem("EFI_SECTION_PE32");\r
+            cb.addItem("EFI_SECTION_PIC");\r
+            cb.addItem("EFI_SECTION_TE");\r
+            cb.addItem("EFI_SECTION_RAW");\r
+            cb.addItem("EFI_SECTION_COMPRESSION");\r
+            cb.addItem("EFI_SECTION_GUID_DEFINED");\r
+            cb.addItem("EFI_SECTION_COMPATIBILITY16");\r
+            cb.addItem("EFI_SECTION_FIRMWARE_VOLUME_IMAGE");\r
+            jTableFfsSection.getColumnModel().getColumn(0).setCellEditor(new DefaultCellEditor(cb));\r
+\r
+            jTableFfsSection.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
+\r
+            jTableFfsSection.getModel().addTableModelListener(new TableModelListener() {\r
+                public void tableChanged(TableModelEvent arg0) {\r
+                    // TODO Auto-generated method stub\r
+                    if (jTableFfs.getSelectedRow() < 0) {\r
+                        return;\r
+                    }\r
+                    int row = arg0.getFirstRow();\r
+                    TableModel m = (TableModel) arg0.getSource();\r
+                    if (arg0.getType() == TableModelEvent.UPDATE) {\r
+                        //ToDo Data Validition check.\r
+                        String type = m.getValueAt(row, 0) + "";\r
+                        docConsole.setSaved(false);\r
+                        ffc.updateBuildOptionsFfsSectionsSection(jTableFfs.getSelectedRow(), row, type);\r
+                    }\r
+                }\r
+            });\r
         }\r
-        return jPanel17;\r
+        return jTableFfsSection;\r
     }\r
 \r
     /**\r
-     * This method initializes jTextField6     \r
-     *         \r
-     * @return javax.swing.JTextField  \r
+     * This method initializes jScrollPane3 \r
+     *  \r
+     * @return javax.swing.JScrollPane  \r
      */\r
-    private JTextField getJTextField6() {\r
-        if (jTextField6 == null) {\r
-            jTextField6 = new JTextField();\r
-            jTextField6.setPreferredSize(new java.awt.Dimension(150,20));\r
+    private JScrollPane getJScrollPaneFfsSubSection() {\r
+        if (jScrollPaneFfsSubSection == null) {\r
+            jScrollPaneFfsSubSection = new JScrollPane();\r
+//            jScrollPaneFfsSubSection.setPreferredSize(new java.awt.Dimension(500, 90));\r
+            jScrollPaneFfsSubSection.setViewportView(getJTableFfsSubSection());\r
         }\r
-        return jTextField6;\r
+        return jScrollPaneFfsSubSection;\r
     }\r
 \r
     /**\r
-     * This method initializes jButton8        \r
-     *         \r
-     * @return javax.swing.JButton     \r
+     * This method initializes jTable3  \r
+     *  \r
+     * @return javax.swing.JTable   \r
      */\r
-    private JButton getJButton8() {\r
-        if (jButton8 == null) {\r
-            jButton8 = new JButton();\r
-            jButton8.setPreferredSize(new java.awt.Dimension(70,20));\r
-            jButton8.setText("Add");\r
-            jButton8.addActionListener(new AbstractAction() {\r
-                public void actionPerformed(java.awt.event.ActionEvent e) {\r
-                    if (jTextField6.getText().length() > 0) {\r
-                        listModel.addElement(jTextField6.getText());\r
+    private JTable getJTableFfsSubSection() {\r
+        if (jTableFfsSubSection == null) {\r
+            subsectionsTableModel = new DefaultTableModel();\r
+            subsectionsTableModel.addColumn("SectionType");\r
+            jTableFfsSubSection = new JTable(subsectionsTableModel);\r
+            jTableFfsSubSection.setRowHeight(20);\r
+            JComboBox cb = new JComboBox();\r
+            cb.addItem("EFI_SECTION_FREEFORM_SUBTYPE_GUID");\r
+            cb.addItem("EFI_SECTION_VERSION");\r
+            cb.addItem("EFI_SECTION_USER_INTERFACE");\r
+            cb.addItem("EFI_SECTION_DXE_DEPEX");\r
+            cb.addItem("EFI_SECTION_PEI_DEPEX");\r
+            cb.addItem("EFI_SECTION_PE32");\r
+            cb.addItem("EFI_SECTION_PIC");\r
+            cb.addItem("EFI_SECTION_TE");\r
+            cb.addItem("EFI_SECTION_RAW");\r
+            cb.addItem("EFI_SECTION_COMPRESSION");\r
+            cb.addItem("EFI_SECTION_GUID_DEFINED");\r
+            cb.addItem("EFI_SECTION_COMPATIBILITY16");\r
+            cb.addItem("EFI_SECTION_FIRMWARE_VOLUME_IMAGE");\r
+            jTableFfsSubSection.getColumnModel().getColumn(0).setCellEditor(new DefaultCellEditor(cb));\r
+            jTableFfsSubSection.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
+\r
+            jTableFfsSubSection.getModel().addTableModelListener(new TableModelListener() {\r
+                public void tableChanged(TableModelEvent arg0) {\r
+                    // TODO Auto-generated method stub\r
+                    if (jTableFfs.getSelectedRow() < 0 || jTableFfsSections.getSelectedRow() < 0) {\r
+                        return;\r
+                    }\r
+                    int row = arg0.getFirstRow();\r
+                    TableModel m = (TableModel) arg0.getSource();\r
+                    if (arg0.getType() == TableModelEvent.UPDATE) {\r
+                        //ToDo Data Validition check.\r
+                        String type = m.getValueAt(row, 0) + "";\r
+                        docConsole.setSaved(false);\r
+                        ffc.updateBuildOptionsFfsSectionsSectionsSection(jTableFfs.getSelectedRow(),\r
+                                                                         jTableFfsSections.getSelectedRow(), row, type);\r
                     }\r
                 }\r
             });\r
         }\r
-        return jButton8;\r
+        return jTableFfsSubSection;\r
     }\r
 \r
     /**\r
-     * This method initializes jButton9        \r
-     *         \r
-     * @return javax.swing.JButton     \r
+     * This method initializes jTextField   \r
+     *  \r
+     * @return javax.swing.JTextField   \r
      */\r
-    private JButton getJButton9() {\r
-        if (jButton9 == null) {\r
-            jButton9 = new JButton();\r
-            jButton9.setPreferredSize(new java.awt.Dimension(70,20));\r
-            jButton9.setText("Delete");\r
-            jButton9.addActionListener(new AbstractAction() {\r
-                public void actionPerformed(ActionEvent arg0){\r
-                    listModel.remove(jList.getSelectedIndex());\r
+    private JTextField getJTextFieldEncapType() {\r
+        if (jTextFieldEncapType == null) {\r
+            jTextFieldEncapType = new JTextField();\r
+            jTextFieldEncapType.setPreferredSize(new java.awt.Dimension(100, 20));\r
+            jTextFieldEncapType.addFocusListener(new java.awt.event.FocusAdapter() {\r
+                public void focusLost(java.awt.event.FocusEvent e) {\r
+                    if (jTableFfs.getSelectedRow() < 0) {\r
+                        return;\r
+                    }\r
+                    ffc.updateBuildOptionsFfsSectionsType(jTableFfs.getSelectedRow(), jTextFieldEncapType.getText());\r
                 }\r
             });\r
         }\r
-        return jButton9;\r
+        return jTextFieldEncapType;\r
     }\r
 \r
     /**\r
-     * This method initializes jCheckBox5      \r
-     *         \r
-     * @return javax.swing.JCheckBox   \r
+     * This method initializes jPanel4  \r
+     *  \r
+     * @return javax.swing.JPanel   \r
      */\r
-    private JCheckBox getJCheckBox5() {\r
-        if (jCheckBox5 == null) {\r
-            jCheckBox5 = new JCheckBox();\r
-            jCheckBox5.setText("Attributes");\r
-            jCheckBox5.setPreferredSize(new java.awt.Dimension(81,20));\r
+    private JPanel getJPanelFfsAttribButtonGroup() {\r
+        if (jPanelFfsAttribButtonGroup == null) {\r
+            jPanelFfsAttribButtonGroup = new JPanel();\r
+            jPanelFfsAttribButtonGroup.setPreferredSize(new java.awt.Dimension(100, 100));\r
+            jPanelFfsAttribButtonGroup.add(getJButtonFfsAttribNew(), null);\r
+            jPanelFfsAttribButtonGroup.add(getJButtonFfsAttribRemove(), null);\r
         }\r
-        return jCheckBox5;\r
+        return jPanelFfsAttribButtonGroup;\r
     }\r
 \r
     /**\r
-     * This method initializes jScrollPane5    \r
-     *         \r
-     * @return javax.swing.JScrollPane \r
+     * This method initializes jButton  \r
+     *  \r
+     * @return javax.swing.JButton  \r
      */\r
-    private JScrollPane getJScrollPane5() {\r
-        if (jScrollPane5 == null) {\r
-            jScrollPane5 = new JScrollPane();\r
-            jScrollPane5.setPreferredSize(new java.awt.Dimension(350,100));\r
-            jScrollPane5.setViewportView(getJTable4());\r
+    private JButton getJButtonFfsSectionNew() {\r
+        if (jButtonFfsSectionNew == null) {\r
+            jButtonFfsSectionNew = new JButton();\r
+            jButtonFfsSectionNew.setPreferredSize(new java.awt.Dimension(80, 20));\r
+            jButtonFfsSectionNew.setText("New");\r
+            jButtonFfsSectionNew.addActionListener(new java.awt.event.ActionListener() {\r
+                public void actionPerformed(java.awt.event.ActionEvent e) {\r
+                    if (jTableFfs.getSelectedRow() < 0) {\r
+                        return;\r
+                    }\r
+                    docConsole.setSaved(false);\r
+                    String[] row = { "EFI_SECTION_RAW" };\r
+                    sectionTableModel.addRow(row);\r
+                    ffc.genBuildOptionsFfsSectionsSection(jTableFfs.getSelectedRow(), row[0]);\r
+                }\r
+            });\r
         }\r
-        return jScrollPane5;\r
+        return jButtonFfsSectionNew;\r
     }\r
 \r
     /**\r
-     * This method initializes jTable4 \r
-     *         \r
-     * @return javax.swing.JTable      \r
+     * This method initializes jButton1 \r
+     *  \r
+     * @return javax.swing.JButton  \r
      */\r
-    private JTable getJTable4() {\r
-        if (jTable4 == null) {\r
-            ffsAttributesTableModel = new DefaultTableModel();\r
-            jTable4 = new JTable(ffsAttributesTableModel);\r
-            jTable4.setPreferredSize(new java.awt.Dimension(400,80));\r
-            ffsAttributesTableModel.addColumn("Name");\r
-            ffsAttributesTableModel.addColumn("Value");\r
+    private JButton getJButtonFfsSectionRemove() {\r
+        if (jButtonFfsSectionRemove == null) {\r
+            jButtonFfsSectionRemove = new JButton();\r
+            jButtonFfsSectionRemove.setPreferredSize(new java.awt.Dimension(80, 20));\r
+            jButtonFfsSectionRemove.setText("Remove");\r
+\r
+            jButtonFfsSectionRemove.addActionListener(new java.awt.event.ActionListener() {\r
+                public void actionPerformed(java.awt.event.ActionEvent e) {\r
+                    if (jTableFfs.getSelectedRow() < 0 || jTableFfsSection.getSelectedRow() < 0) {\r
+                        return;\r
+                    }\r
+                    docConsole.setSaved(false);\r
+                    sectionTableModel.removeRow(jTableFfsSection.getSelectedRow());\r
+                    ffc.removeBuildOptionsFfsSectionsSection(jTableFfs.getSelectedRow(),\r
+                                                             jTableFfsSection.getSelectedRow());\r
+                }\r
+            });\r
         }\r
-        return jTable4;\r
+        return jButtonFfsSectionRemove;\r
     }\r
 \r
     /**\r
-     * This method initializes jPanel19        \r
-     *         \r
-     * @return javax.swing.JPanel      \r
+     * This method initializes jButton2 \r
+     *  \r
+     * @return javax.swing.JButton  \r
      */\r
-    private JPanel getJPanel19() {\r
-        if (jPanel19 == null) {\r
-            jPanel19 = new JPanel();\r
-            jPanel19.setLayout(new CardLayout());\r
-            jPanel19.add(getJPanel21(), getJPanel21().getName());\r
-            jPanel19.add(getJPanel22(), getJPanel22().getName());\r
+    private JButton getJButtonFfsSubSectionNew() {\r
+        if (jButtonFfsSubSectionNew == null) {\r
+            jButtonFfsSubSectionNew = new JButton();\r
+            jButtonFfsSubSectionNew.setPreferredSize(new java.awt.Dimension(80, 20));\r
+            jButtonFfsSubSectionNew.setText("New");\r
+            jButtonFfsSubSectionNew.addActionListener(new java.awt.event.ActionListener() {\r
+                public void actionPerformed(java.awt.event.ActionEvent e) {\r
+                    if (jTableFfs.getSelectedRow() < 0 || jTableFfsSections.getSelectedRow() < 0) {\r
+                        return;\r
+                    }\r
+                    docConsole.setSaved(false);\r
+                    String[] row = { "EFI_SECTION_RAW" };\r
+                    subsectionsTableModel.addRow(row);\r
+                    ffc.genBuildOptionsFfsSectionsSectionsSection(jTableFfs.getSelectedRow(),\r
+                                                                  jTableFfsSections.getSelectedRow(), row[0]);\r
+\r
+                }\r
+            });\r
         }\r
-        return jPanel19;\r
+        return jButtonFfsSubSectionNew;\r
     }\r
 \r
     /**\r
-     * This method initializes jPanel20        \r
-     *         \r
-     * @return javax.swing.JPanel      \r
+     * This method initializes jButton3 \r
+     *  \r
+     * @return javax.swing.JButton  \r
      */\r
-    private JPanel getJPanel20() {\r
-        if (jPanel20 == null) {\r
-            jLabel15 = new JLabel();\r
-            jLabel15.setText("Tag Name");\r
-            FlowLayout flowLayout9 = new FlowLayout();\r
-            flowLayout9.setAlignment(java.awt.FlowLayout.LEFT);\r
-            jLabel14 = new JLabel();\r
-            jLabel14.setText("Build Targets");\r
-            jLabel12 = new JLabel();\r
-            jLabel12.setText("Tool Command");\r
-            jLabel11 = new JLabel();\r
-            jLabel11.setText("Supported Arch");\r
-            jLabel10 = new JLabel();\r
-            jLabel10.setText("Tool Chain Family");\r
-            jLabel9 = new JLabel();\r
-            jLabel9.setText("Option Contents");\r
-            jPanel20 = new JPanel();\r
-            jPanel20.setLayout(flowLayout9);\r
-            jPanel20.add(jLabel14, null);\r
-            jPanel20.add(getJTextField12(), null);\r
-            jPanel20.add(jLabel10, null);\r
-            jPanel20.add(getJComboBox2(), null);\r
-            jPanel20.add(jLabel12, null);\r
-            jPanel20.add(getJTextField8(), null);\r
-            jPanel20.add(jLabel11, null);\r
-            jPanel20.add(getJCheckBox9(), null);\r
-            jPanel20.add(getJCheckBox10(), null);\r
-            jPanel20.add(getJCheckBox11(), null);\r
-            jPanel20.add(getJCheckBox12(), null);\r
-            jPanel20.add(getJCheckBox13(), null);\r
-            jPanel20.add(getJCheckBox14(), null);\r
-            jPanel20.add(jLabel15, null);\r
-            jPanel20.add(getJTextField13(), null);\r
-            jPanel20.add(jLabel9, null);\r
-            jPanel20.add(getJTextField7(), null);\r
-            jPanel20.add(getJButton10(), null);\r
-            jPanel20.add(getJButton11(), null);\r
-            jPanel20.add(getJButton19(), null);\r
-            jPanel20.add(getJScrollPane6(), null);\r
-        }\r
-        return jPanel20;\r
-    }\r
-\r
-    /**\r
-     * This method initializes jTextField7     \r
-     *         \r
-     * @return javax.swing.JTextField  \r
-     */\r
-    private JTextField getJTextField7() {\r
-        if (jTextField7 == null) {\r
-            jTextField7 = new JTextField();\r
-            jTextField7.setPreferredSize(new java.awt.Dimension(300,20));\r
+    private JButton getJButtonFfsSubSectionRemove() {\r
+        if (jButtonFfsSubSectionRemove == null) {\r
+            jButtonFfsSubSectionRemove = new JButton();\r
+            jButtonFfsSubSectionRemove.setPreferredSize(new java.awt.Dimension(80, 20));\r
+            jButtonFfsSubSectionRemove.setText("Remove");\r
+            jButtonFfsSubSectionRemove.addActionListener(new java.awt.event.ActionListener() {\r
+                public void actionPerformed(java.awt.event.ActionEvent e) {\r
+                    if (jTableFfs.getSelectedRow() < 0 || jTableFfsSections.getSelectedRow() < 0\r
+                        || jTableFfsSubSection.getSelectedRow() < 0) {\r
+                        return;\r
+                    }\r
+                    docConsole.setSaved(false);\r
+                    subsectionsTableModel.removeRow(jTableFfsSubSection.getSelectedRow());\r
+                    ffc.removeBuildOptionsFfsSectionsSectionsSection(jTableFfs.getSelectedRow(),\r
+                                                                     jTableFfsSections.getSelectedRow(),\r
+                                                                     jTableFfsSubSection.getSelectedRow());\r
+                }\r
+            });\r
         }\r
-        return jTextField7;\r
+        return jButtonFfsSubSectionRemove;\r
     }\r
 \r
     /**\r
-     * This method initializes jComboBox2      \r
-     *         \r
-     * @return javax.swing.JComboBox   \r
+     * This method initializes jButton6 \r
+     *  \r
+     * @return javax.swing.JButton  \r
      */\r
-    private JComboBox getJComboBox2() {\r
-        if (jComboBox2 == null) {\r
-            jComboBox2 = new JComboBox();\r
-            jComboBox2.setPreferredSize(new java.awt.Dimension(80,20));\r
-            jComboBox2.addItem("MSFT");\r
-            jComboBox2.addItem("GCC");\r
-            jComboBox2.addItem("CYGWIN");\r
-            jComboBox2.addItem("INTEL");\r
-            jComboBox2.setSelectedIndex(0);\r
+    private JButton getJButtonFfsSectionsNew() {\r
+        if (jButtonFfsSectionsNew == null) {\r
+            jButtonFfsSectionsNew = new JButton();\r
+            jButtonFfsSectionsNew.setPreferredSize(new java.awt.Dimension(80, 20));\r
+            jButtonFfsSectionsNew.setText("New");\r
+            jButtonFfsSectionsNew.addActionListener(new java.awt.event.ActionListener() {\r
+                public void actionPerformed(java.awt.event.ActionEvent e) {\r
+                    if (jTableFfs.getSelectedRow() < 0) {\r
+                        return;\r
+                    }\r
+                    docConsole.setSaved(false);\r
+                    String[] row = { "" };\r
+                    sectionsTableModel.addRow(row);\r
+                    ffc.genBuildOptionsFfsSectionsSections(jTableFfs.getSelectedRow(), "");\r
+                }\r
+            });\r
         }\r
-        return jComboBox2;\r
+        return jButtonFfsSectionsNew;\r
     }\r
 \r
     /**\r
-     * This method initializes jTextField8     \r
-     *         \r
-     * @return javax.swing.JTextField  \r
+     * This method initializes jButton7 \r
+     *  \r
+     * @return javax.swing.JButton  \r
      */\r
-    private JTextField getJTextField8() {\r
-        if (jTextField8 == null) {\r
-            jTextField8 = new JTextField();\r
-            jTextField8.setPreferredSize(new java.awt.Dimension(110,20));\r
+    private JButton getJButtonFfsSectionsRemove() {\r
+        if (jButtonFfsSectionsRemove == null) {\r
+            jButtonFfsSectionsRemove = new JButton();\r
+            jButtonFfsSectionsRemove.setPreferredSize(new java.awt.Dimension(80, 20));\r
+            jButtonFfsSectionsRemove.setText("Remove");\r
+            jButtonFfsSectionsRemove.addActionListener(new java.awt.event.ActionListener() {\r
+                public void actionPerformed(java.awt.event.ActionEvent e) {\r
+                    if (jTableFfs.getSelectedRow() < 0 || jTableFfsSections.getSelectedRow() < 0) {\r
+                        return;\r
+                    }\r
+                    docConsole.setSaved(false);\r
+                    sectionsTableModel.removeRow(jTableFfsSections.getSelectedRow());\r
+                    ffc.removeBuildOptionsFfsSectionsSections(jTableFfs.getSelectedRow(),\r
+                                                              jTableFfsSections.getSelectedRow());\r
+                }\r
+            });\r
         }\r
-        return jTextField8;\r
+        return jButtonFfsSectionsRemove;\r
     }\r
 \r
-    /**\r
-     * This method initializes jScrollPane6    \r
-     *         \r
-     * @return javax.swing.JScrollPane \r
-     */\r
-    private JScrollPane getJScrollPane6() {\r
-        if (jScrollPane6 == null) {\r
-            jScrollPane6 = new JScrollPane();\r
-            jScrollPane6.setPreferredSize(new java.awt.Dimension(630,200));\r
-            jScrollPane6.setViewportView(getJTable5());\r
+    private JScrollPane getJScrollPaneFfsSections() {\r
+        if (jScrollPaneFfsSections == null) {\r
+            jScrollPaneFfsSections = new JScrollPane();\r
+//            jScrollPaneFfsSections.setPreferredSize(new java.awt.Dimension(500, 80));\r
+            jScrollPaneFfsSections.setViewportView(getJTableFfsSections());\r
         }\r
-        return jScrollPane6;\r
+        return jScrollPaneFfsSections;\r
     }\r
 \r
     /**\r
-     * This method initializes jTable5 \r
-     *         \r
-     * @return javax.swing.JTable      \r
+     * This method initializes jTable \r
+     *  \r
+     * @return javax.swing.JTable   \r
      */\r
-    private JTable getJTable5() {\r
-        if (jTable5 == null) {\r
-            optionsTableModel = new DefaultTableModel();\r
-            jTable5 = new JTable(optionsTableModel);\r
-            optionsTableModel.addColumn("BuildTargets");\r
-            optionsTableModel.addColumn("ToolChainFamily");\r
-            optionsTableModel.addColumn("SupportedArch");\r
-            optionsTableModel.addColumn("ToolCommand");\r
-            optionsTableModel.addColumn("TagName");\r
-            optionsTableModel.addColumn("Contents");\r
-            \r
-            TableColumn toolFamilyCol = jTable5.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
-            toolFamilyCol.setCellEditor(new DefaultCellEditor(cb));\r
-            \r
-            jTable5.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
-            jTable5.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
+    private JTable getJTableFfsSections() {\r
+        if (jTableFfsSections == null) {\r
+            sectionsTableModel = new DefaultTableModel();\r
+            sectionsTableModel.addColumn("EncapsulationType");\r
+            jTableFfsSections = new JTable(sectionsTableModel);\r
+            jTableFfsSections.setRowHeight(20);\r
+            jTableFfsSections.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
+            jTableFfsSections.getSelectionModel().addListSelectionListener(new ListSelectionListener() {\r
                 public void valueChanged(ListSelectionEvent e) {\r
-                    selectedRow = -1;\r
-                    if (e.getValueIsAdjusting()){\r
+                    if (e.getValueIsAdjusting()) {\r
                         return;\r
                     }\r
-                    ListSelectionModel lsm = (ListSelectionModel)e.getSource();\r
+                    ListSelectionModel lsm = (ListSelectionModel) e.getSource();\r
                     if (lsm.isSelectionEmpty()) {\r
                         return;\r
-                    }\r
-                    else{\r
-                        selectedRow = lsm.getMinSelectionIndex();\r
+                    } else {\r
+                        int sectionsRow = lsm.getMinSelectionIndex();\r
+                        if (jTableFfs.getSelectedRow() < 0) {\r
+                            return;\r
+                        }\r
+                        subsectionsTableModel.setRowCount(0);\r
+                        ArrayList<String> al = new ArrayList<String>();\r
+                        ffc.getBuildOptionsFfsSectionsSectionsSection(jTableFfs.getSelectedRow(), sectionsRow, al);\r
+                        for (int i = 0; i < al.size(); ++i) {\r
+                            String[] subsectionRow = { al.get(i) };\r
+                            subsectionsTableModel.addRow(subsectionRow);\r
+                        }\r
                     }\r
                 }\r
             });\r
-            \r
-            jTable5.getModel().addTableModelListener(new TableModelListener() {\r
+\r
+            jTableFfsSections.getModel().addTableModelListener(new TableModelListener() {\r
                 public void tableChanged(TableModelEvent arg0) {\r
                     // TODO Auto-generated method stub\r
                     int row = arg0.getFirstRow();\r
-                    TableModel m = (TableModel)arg0.getSource();\r
-                    if (arg0.getType() == TableModelEvent.UPDATE){\r
+                    TableModel m = (TableModel) arg0.getSource();\r
+                    if (arg0.getType() == TableModelEvent.UPDATE) {\r
                         //ToDo Data Validition check.\r
-                        String targetName = m.getValueAt(row, 0) + "";\r
-                        String toolChain = m.getValueAt(row, 1) + "";\r
-                        String supArch = m.getValueAt(row, 2) + "";\r
-                        String toolCmd = m.getValueAt(row, 3) + "";\r
-                        String tagName = m.getValueAt(row, 4) + "";\r
-                        String contents = m.getValueAt(row, 5) + "";\r
-                        ffc.updateBuildOptionsOpt(row, targetName, toolChain, tagName, toolCmd, supArch, contents);\r
+                        String encapType = m.getValueAt(row, 0) + "";\r
+                        docConsole.setSaved(false);\r
+                        ffc.updateBuildOptionsFfsSectionsSections(jTableFfs.getSelectedRow(), row, encapType);\r
                     }\r
                 }\r
             });\r
         }\r
-        return jTable5;\r
+        return jTableFfsSections;\r
     }\r
 \r
     /**\r
-     * This method initializes jButton10       \r
-     *         \r
-     * @return javax.swing.JButton     \r
+     * This method initializes jSplitPaneFfsC   \r
+     *  \r
+     * @return javax.swing.JSplitPane   \r
      */\r
-    private JButton getJButton10() {\r
-        if (jButton10 == null) {\r
-            jButton10 = new JButton();\r
-            jButton10.setText("Add");\r
-            jButton10.setPreferredSize(new java.awt.Dimension(70,20));\r
-            jButton10.addActionListener(new AbstractAction() {\r
-                public void actionPerformed(java.awt.event.ActionEvent e) {\r
-                    boolean[] boolArray = {jCheckBox9.isSelected(),jCheckBox10.isSelected(),jCheckBox11.isSelected(),\r
-                                           jCheckBox12.isSelected(),jCheckBox13.isSelected(),jCheckBox14.isSelected()};\r
-                    String s = boolToList(boolArray);\r
-                    Object[] o = {jTextField12.getText(), jComboBox2.getSelectedItem(), s,\r
-                                  jTextField8.getText(), jTextField13.getText(), jTextField7.getText()};\r
-                    optionsTableModel.addRow(o);\r
-                    ffc.genBuildOptionsOpt(jTextField12.getText(), jComboBox2.getSelectedItem()+"", jTextField13.getText(), jTextField8.getText(), s, jTextField7.getText());\r
-                }\r
-            });\r
-        }\r
-        return jButton10;\r
-    }\r
-    \r
-    private String boolToList (boolean[] bool) {\r
-        String s = " ";\r
-        if (bool[0]) {\r
-            s += "IA32 ";\r
-        }\r
-        if (bool[1]) {\r
-            s += "IPF ";\r
-        }\r
-        if (bool[2]) {\r
-            s += "X64 ";\r
-        }\r
-        if (bool[3]) {\r
-            s += "EBC ";\r
-        }\r
-        if (bool[4]) {\r
-            s += "ARM ";\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
-        if (bool[5]) {\r
-            s += "PPC ";\r
-        }\r
-        \r
-        return s.trim();\r
+        return jSplitPaneFfsC;\r
     }\r
 \r
     /**\r
-     * This method initializes jButton11       \r
-     *         \r
-     * @return javax.swing.JButton     \r
+     * This method initializes jPanelFfsCTop    \r
+     *  \r
+     * @return javax.swing.JPanel   \r
      */\r
-    private JButton getJButton11() {\r
-        if (jButton11 == null) {\r
-            jButton11 = new JButton();\r
-            jButton11.setText("Delete");\r
-            jButton11.setPreferredSize(new java.awt.Dimension(70,20));\r
-            jButton11.addActionListener(new AbstractAction() {\r
-                public void actionPerformed(java.awt.event.ActionEvent e) {\r
-                    if (selectedRow >= 0) {\r
-                        optionsTableModel.removeRow(selectedRow);\r
-                        ffc.removeBuildOptionsOpt(selectedRow);\r
-                    }\r
-                }\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(getJScrollPaneFfsSection(), java.awt.BorderLayout.CENTER);\r
         }\r
-        return jButton11;\r
+        return jPanelFfsCTop;\r
     }\r
 \r
     /**\r
-     * This method initializes jPanel21        \r
-     *         \r
-     * @return javax.swing.JPanel      \r
+     * This method initializes jSplitPaneFfsCBottom \r
+     *  \r
+     * @return javax.swing.JSplitPane   \r
      */\r
-    private JPanel getJPanel21() {\r
-        if (jPanel21 == null) {\r
-            jLabel13 = new JLabel();\r
-            jLabel13.setText("EncapsulationTag");\r
-            jLabel8 = new JLabel();\r
-            jLabel8.setText("EncapsulationType");\r
-            jPanel21 = new JPanel();\r
-            jPanel21.setName("jPanel21");\r
-            jPanel21.add(jLabel8, null);\r
-            jPanel21.add(getJTextField9(), null);\r
-            jPanel21.add(jLabel13, null);\r
-            jPanel21.add(getJTextField10(), null);\r
-            jPanel21.add(getJButton12(), null);\r
-            jPanel21.add(getJButton13(), null);\r
-            jPanel21.add(getJButton16(), null);\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 jPanel21;\r
+        return jSplitPaneFfsCBottom;\r
     }\r
 \r
     /**\r
-     * This method initializes jButton12       \r
-     *         \r
-     * @return javax.swing.JButton     \r
+     * This method initializes jPanelFfsCBottomTop  \r
+     *  \r
+     * @return javax.swing.JPanel   \r
      */\r
-    private JButton getJButton12() {\r
-        if (jButton12 == null) {\r
-            jButton12 = new JButton();\r
-            jButton12.setText("Add Sections");\r
-            jButton12.setPreferredSize(new java.awt.Dimension(109,20));\r
-            jButton12.addActionListener(new AbstractAction(){\r
-                public void actionPerformed(ActionEvent arg0){\r
-                }\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(getJScrollPaneFfsSections(), java.awt.BorderLayout.CENTER);\r
         }\r
-        return jButton12;\r
+        return jPanelFfsCBottomTop;\r
     }\r
 \r
     /**\r
-     * This method initializes jButton13       \r
-     *         \r
-     * @return javax.swing.JButton     \r
+     * This method initializes jPanelFfsCBottomBottom   \r
+     *  \r
+     * @return javax.swing.JPanel   \r
      */\r
-    private JButton getJButton13() {\r
-        if (jButton13 == null) {\r
-            jButton13 = new JButton();\r
-            jButton13.setText("Add Section");\r
-            jButton13.setPreferredSize(new java.awt.Dimension(102,20));\r
-            jButton13.addActionListener(new AbstractAction(){\r
-                public void actionPerformed(ActionEvent arg0){\r
-                    CardLayout cl = (CardLayout)jPanel19.getLayout();\r
-                    cl.last(jPanel19);\r
-                }\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(getJScrollPaneFfsSubSection(), java.awt.BorderLayout.CENTER);\r
         }\r
-        return jButton13;\r
+        return jPanelFfsCBottomBottom;\r
     }\r
 \r
     /**\r
-     * This method initializes jTextField9     \r
-     *         \r
-     * @return javax.swing.JTextField  \r
+     * This method initializes jPanelSectionN   \r
+     *  \r
+     * @return javax.swing.JPanel   \r
      */\r
-    private JTextField getJTextField9() {\r
-        if (jTextField9 == null) {\r
-            jTextField9 = new JTextField();\r
-            jTextField9.setPreferredSize(new java.awt.Dimension(250,20));\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 jTextField9;\r
+        return jPanelSectionN;\r
     }\r
 \r
     /**\r
-     * This method initializes jTextField10    \r
-     *         \r
-     * @return javax.swing.JTextField  \r
+     * This method initializes jPanelSectionsN  \r
+     *  \r
+     * @return javax.swing.JPanel   \r
      */\r
-    private JTextField getJTextField10() {\r
-        if (jTextField10 == null) {\r
-            jTextField10 = new JTextField();\r
-            jTextField10.setPreferredSize(new java.awt.Dimension(250,20));\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 jTextField10;\r
+        return jPanelSectionsN;\r
     }\r
 \r
     /**\r
-     * This method initializes jPanel22        \r
-     *         \r
-     * @return javax.swing.JPanel      \r
+     * This method initializes jPanelSubSectionN    \r
+     *  \r
+     * @return javax.swing.JPanel   \r
      */\r
-    private JPanel getJPanel22() {\r
-        if (jPanel22 == null) {\r
-            FlowLayout flowLayout7 = new FlowLayout();\r
-            flowLayout7.setAlignment(java.awt.FlowLayout.LEFT);\r
-            jPanel22 = new JPanel();\r
-            jPanel22.setLayout(flowLayout7);\r
-            jPanel22.setName("jPanel22");\r
-            jPanel22.add(getJCheckBox6(), null);\r
-            jPanel22.add(getJComboBox4(), null);\r
-            jPanel22.add(getJCheckBox7(), null);\r
-            jPanel22.add(getJComboBox5(), null);\r
-            jPanel22.add(getJCheckBox8(), null);\r
-            jPanel22.add(getJTextField11(), null);\r
-            jPanel22.add(getJButton14(), null);\r
-            jPanel22.add(getJButton15(), null);\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 jPanel22;\r
+        return jPanelSubSectionN;\r
     }\r
 \r
     /**\r
-     * This method initializes jCheckBox6      \r
-     *         \r
-     * @return javax.swing.JCheckBox   \r
+     * The following section contains all Build Options content\r
      */\r
-    private JCheckBox getJCheckBox6() {\r
-        if (jCheckBox6 == null) {\r
-            jCheckBox6 = new JCheckBox();\r
-            jCheckBox6.setText("Section Type");\r
-            jCheckBox6.setPreferredSize(new java.awt.Dimension(98,20));\r
-        }\r
-        return jCheckBox6;\r
-    }\r
 \r
     /**\r
-     * This method initializes jComboBox4      \r
+     * This method initializes jPanelOptionsTab\r
      *         \r
-     * @return javax.swing.JComboBox   \r
-     */\r
-    private JComboBox getJComboBox4() {\r
-        if (jComboBox4 == null) {\r
-            jComboBox4 = new JComboBox();\r
-            jComboBox4.setPreferredSize(new java.awt.Dimension(260,20));\r
+     * This is the main Options screen\r
+     * \r
+     * @return javax.swing.JPanel      jPanelOptionsTab\r
+     */\r
+    private JPanel getJPanelOptionsTab() {\r
+        if (jPanelOptionsTab == null) {\r
+            // This container holds the Options Tab content\r
+\r
+            //            FlowLayout flowLayout9 = new FlowLayout();\r
+            //            flowLayout9.setAlignment(java.awt.FlowLayout.LEFT);\r
+\r
+            jPanelOptionsTab = new JPanel();\r
+            jPanelOptionsTab.setBounds(new java.awt.Rectangle(0, 0, dialogWidth * 2, dialogHeight * 3));\r
+            jPanelOptionsTab.setPreferredSize(new java.awt.Dimension(dialogWidth + 10, (dialogHeight * 3) + 10));\r
+            jPanelOptionsTab.setAutoscrolls(true);\r
+            jPanelOptionsTab.setLocation(0, 0);\r
+            jPanelOptionsTab.setLayout(null);\r
+            jPanelOptionsTab.add(getJPanelOptionsContainer(), null);\r
+            jPanelOptionsTab.add(getJScrollPaneOptions(), null);\r
+\r
+        }\r
+        return jPanelOptionsTab;\r
+    }\r
+\r
+    /**\r
+     * This method initializes jPanelOptionsContainer   \r
+     *  \r
+     * @return javax.swing.JPanel   \r
+     */\r
+    private JPanel getJPanelOptionsContainer() {\r
+        if (jPanelOptionsContainer == null) {\r
+            jLabelTagName = new JLabel();\r
+            jLabelTagName.setBounds(new java.awt.Rectangle(labelColumn, rowOne, labelWidth, oneRowHeight));\r
+            jLabelTagName.setLocation(new java.awt.Point(labelColumn, rowOne));\r
+            jLabelTagName.setText("Tag Name");\r
+            jLabelBuildTargets = new JLabel();\r
+            jLabelBuildTargets.setBounds(new java.awt.Rectangle(labelColumn, rowTwo, labelWidth, oneRowHeight));\r
+            jLabelBuildTargets.setLocation(new java.awt.Point(labelColumn, rowTwo));\r
+            jLabelBuildTargets.setText("Build Targets");\r
+            jLabelToolCmd = new JLabel();\r
+            jLabelToolCmd.setBounds(new java.awt.Rectangle(labelColumn, rowThree, labelWidth, oneRowHeight));\r
+            jLabelToolCmd.setLocation(new java.awt.Point(labelColumn, rowThree));\r
+            jLabelToolCmd.setText("Tool Command");\r
+            jLabelSupArch = new JLabel();\r
+            jLabelSupArch.setBounds(new java.awt.Rectangle(labelColumn, rowFour, labelWidth, oneRowHeight));\r
+            jLabelSupArch.setLocation(new java.awt.Point(labelColumn, rowFour));\r
+            jLabelSupArch.setText("Supported Architectures");\r
+            jLabelToolChainFamily = new JLabel();\r
+            jLabelToolChainFamily.setBounds(new java.awt.Rectangle(labelColumn, rowFive, labelWidth, oneRowHeight));\r
+            jLabelToolChainFamily.setLocation(new java.awt.Point(labelColumn, rowFive));\r
+            jLabelToolChainFamily.setText("Tool Chain Family");\r
+\r
+            jLabelOptionContents = new JLabel();\r
+            jLabelOptionContents.setBounds(new java.awt.Rectangle(labelColumn, rowSix, labelWidth, oneRowHeight));\r
+            jLabelOptionContents.setLocation(new java.awt.Point(labelColumn, rowSix));\r
+            jLabelOptionContents.setText("Option Contents");\r
+\r
+            jPanelOptionsContainer = new JPanel();\r
+\r
+            jPanelOptionsContainer.setLayout(null);\r
             \r
-            jComboBox4.addItem("EFI_SECTION_FREEFORM_SUBTYPE_GUID");\r
-            jComboBox4.addItem("EFI_SECTION_VERSION");\r
-            jComboBox4.addItem("EFI_SECTION_USER_INTERFACE");\r
-            jComboBox4.addItem("EFI_SECTION_DXE_DEPEX");\r
-            jComboBox4.addItem("EFI_SECTION_PEI_DEPEX");\r
-            jComboBox4.addItem("EFI_SECTION_PE32");\r
-            jComboBox4.addItem("EFI_SECTION_PIC");\r
-            jComboBox4.addItem("EFI_SECTION_TE");\r
-            jComboBox4.addItem("EFI_SECTION_RAW");\r
-            jComboBox4.addItem("EFI_SECTION_COMPRESSION");\r
-            jComboBox4.addItem("EFI_SECTION_GUID_DEFINED");\r
-            jComboBox4.addItem("EFI_SECTION_COMPATIBILITY16");\r
-            jComboBox4.addItem("EFI_SECTION_FIRMWARE_VOLUME_IMAGE");\r
-            jComboBox4.setSelectedIndex(0);\r
-        }\r
-        return jComboBox4;\r
-    }\r
-\r
-    /**\r
-     * This method initializes jCheckBox7      \r
-     *         \r
-     * @return javax.swing.JCheckBox   \r
-     */\r
-    private JCheckBox getJCheckBox7() {\r
-        if (jCheckBox7 == null) {\r
-            jCheckBox7 = new JCheckBox();\r
-            jCheckBox7.setPreferredSize(new java.awt.Dimension(120,20));\r
-            jCheckBox7.setText("Compressible");\r
+            jPanelOptionsContainer.setLocation(new java.awt.Point(2, 2));\r
+            jPanelOptionsContainer.setBounds(new java.awt.Rectangle(2, 2, dialogWidth * 2, dialogHeight));\r
+            jPanelOptionsContainer.setPreferredSize(new java.awt.Dimension(dialogWidth, dialogHeight));\r
+            /*\r
+            jPanelOptionsContainer\r
+                                  .setBorder(javax.swing.BorderFactory\r
+                                                                      .createEtchedBorder(javax.swing.border.EtchedBorder.RAISED));\r
+*/\r
+            jPanelOptionsContainer.add(jLabelTagName, null);\r
+            jPanelOptionsContainer.add(getJTextFieldTagName(), null);\r
+\r
+            jPanelOptionsContainer.add(jLabelBuildTargets, null);\r
+            jPanelOptionsContainer.add(getJTextFieldBuildTargets(), null);\r
+\r
+            jPanelOptionsContainer.add(jLabelToolChainFamily, null);\r
+            jPanelOptionsContainer.add(getJTextFieldToolChainFamily(), null);\r
+\r
+            jPanelOptionsContainer.add(jLabelToolCmd, null);\r
+            jPanelOptionsContainer.add(getJTextFieldToolCmd(), null);\r
+\r
+            jPanelOptionsContainer.add(jLabelSupArch, null);\r
+            jPanelOptionsContainer.add(getArchitectureSelections(), null);\r
+\r
+            jPanelOptionsContainer.add(jLabelOptionContents, null);\r
+            jPanelOptionsContainer.add(getJTextFieldOptionContents(), null);\r
+\r
+            jPanelOptionsContainer.add(getJButtonOptionsAdd(), null);\r
+            jPanelOptionsContainer.add(getJButtonOptionsDel(), null);\r
         }\r
-        return jCheckBox7;\r
+        return jPanelOptionsContainer;\r
     }\r
 \r
     /**\r
-     * This method initializes jComboBox5      \r
-     *         \r
-     * @return javax.swing.JComboBox   \r
+     * This method initializes jTextFieldOptionTagName  Row 1\r
+     *  \r
+     * @return javax.swing.JTextField   \r
      */\r
-    private JComboBox getJComboBox5() {\r
-        if (jComboBox5 == null) {\r
-            jComboBox5 = new JComboBox();\r
-            jComboBox5.setPreferredSize(new java.awt.Dimension(80,20));\r
-            \r
-            jComboBox5.addItem("false");\r
-            jComboBox5.addItem("true");\r
-            jComboBox5.setSelectedIndex(0);\r
+    private JTextField getJTextFieldTagName() {\r
+        if (jTextFieldTagName == null) {\r
+            jTextFieldTagName = new JTextField();\r
+            jTextFieldTagName.setBounds(new java.awt.Rectangle(fieldColumn, rowOne, fieldWidth, oneRowHeight));\r
+            jTextFieldTagName.setPreferredSize(new java.awt.Dimension(fieldWidth, oneRowHeight));\r
+            jTextFieldTagName.setLocation(new java.awt.Point(fieldColumn, rowOne));\r
         }\r
-        return jComboBox5;\r
+        return jTextFieldTagName;\r
     }\r
 \r
     /**\r
-     * This method initializes jCheckBox8      \r
-     *         \r
-     * @return javax.swing.JCheckBox   \r
+     * This method initializes jTextFieldBuildTargets  Row 2 \r
+     *  \r
+     * @return javax.swing.JTextField   jTextFieldBuildTargets\r
      */\r
-    private JCheckBox getJCheckBox8() {\r
-        if (jCheckBox8 == null) {\r
-            jCheckBox8 = new JCheckBox();\r
-            jCheckBox8.setText("Binding Order");\r
-            jCheckBox8.setPreferredSize(new java.awt.Dimension(103,20));\r
+    private JTextField getJTextFieldBuildTargets() {\r
+        if (jTextFieldBuildTargets == null) {\r
+            jTextFieldBuildTargets = new JTextField();\r
+            jTextFieldBuildTargets.setBounds(new java.awt.Rectangle(fieldColumn, rowTwo, fieldWidth, oneRowHeight));\r
+            jTextFieldBuildTargets.setPreferredSize(new java.awt.Dimension(fieldWidth, oneRowHeight));\r
+            jTextFieldBuildTargets.setLocation(new java.awt.Point(fieldColumn, rowTwo));\r
         }\r
-        return jCheckBox8;\r
+        return jTextFieldBuildTargets;\r
     }\r
 \r
     /**\r
-     * This method initializes jTextField11    \r
-     *         \r
-     * @return javax.swing.JTextField  \r
+     * This method initializes jTextFieldToolCmd Row 3    \r
+     * \r
+     *  This should be a dropdown box of command codes from tools_def.txt\r
+     *      \r
+     * @return javax.swing.JTextField   jTextFieldToolCmd\r
      */\r
-    private JTextField getJTextField11() {\r
-        if (jTextField11 == null) {\r
-            jTextField11 = new JTextField();\r
-            jTextField11.setPreferredSize(new java.awt.Dimension(150,20));\r
+    private JTextField getJTextFieldToolCmd() {\r
+        if (jTextFieldToolCmd == null) {\r
+            jTextFieldToolCmd = new JTextField();\r
+            jTextFieldToolCmd.setBounds(new java.awt.Rectangle(fieldColumn, rowThree, fieldWidth, oneRowHeight));\r
+            jTextFieldToolCmd.setPreferredSize(new java.awt.Dimension(fieldWidth, oneRowHeight));\r
+            jTextFieldToolCmd.setLocation(new java.awt.Point(fieldColumn, rowThree));\r
         }\r
-        return jTextField11;\r
+        return jTextFieldToolCmd;\r
     }\r
 \r
     /**\r
-     * This method initializes jButton14       \r
-     *         \r
-     * @return javax.swing.JButton     \r
+     * This method initializes jArchitectureSelections Row 4\r
+     * \r
+     * @return jArchitectureSelections\r
      */\r
-    private JButton getJButton14() {\r
-        if (jButton14 == null) {\r
-            jButton14 = new JButton();\r
-            jButton14.setText("Add");\r
-            jButton14.setPreferredSize(new java.awt.Dimension(70,20));\r
-            jButton14.addActionListener(new AbstractAction(){\r
-                public void actionPerformed(ActionEvent arg0){\r
-                }\r
-            });\r
+    private JPanel getArchitectureSelections() {\r
+        if (jArchitectureSelections == null) {\r
+            jArchitectureSelections = new JPanel();\r
+            jArchitectureSelections.setLayout(null);\r
+            jArchitectureSelections.add(getJCheckBoxIA32(), null);\r
+            jArchitectureSelections.add(getJCheckBoxX64(), null);\r
+            jArchitectureSelections.add(getJCheckBoxIpf(), null);\r
+            jArchitectureSelections.add(getJCheckBoxEBC(), null);\r
+            jArchitectureSelections.add(getJCheckBoxARM(), null);\r
+            jArchitectureSelections.add(getJCheckBoxPPC(), null);\r
+            jArchitectureSelections.setBounds(new java.awt.Rectangle(fieldColumn, rowFour, fieldWidth, oneRowHeight));\r
+            jArchitectureSelections.setPreferredSize(new java.awt.Dimension(fieldWidth, oneRowHeight));\r
+            jArchitectureSelections.setLocation(new java.awt.Point(fieldColumn, rowFour));\r
         }\r
-        return jButton14;\r
+        return jArchitectureSelections;\r
     }\r
 \r
     /**\r
-     * This method initializes jButton15       \r
-     *         \r
-     * @return javax.swing.JButton     \r
+     * This method initializes jCheckBoxIA32  \r
+     *  \r
+     * @return javax.swing.JCheckBox    jCheckBoxIA32\r
      */\r
-    private JButton getJButton15() {\r
-        if (jButton15 == null) {\r
-            jButton15 = new JButton();\r
-            jButton15.setPreferredSize(new java.awt.Dimension(70,20));\r
-            jButton15.setText("Delete");\r
+    private JCheckBox getJCheckBoxIA32() {\r
+        if (jCheckBoxIA32 == null) {\r
+            jCheckBoxIA32 = new JCheckBox();\r
+            jCheckBoxIA32.setBounds(new java.awt.Rectangle(0, 0, 55, 20));\r
+            jCheckBoxIA32.setText("IA32");\r
         }\r
-        return jButton15;\r
+        return jCheckBoxIA32;\r
     }\r
 \r
     /**\r
-     * This method initializes jButton16       \r
-     *         \r
-     * @return javax.swing.JButton     \r
+     * This method initializes jCheckBoxX64 \r
+     *  \r
+     * @return javax.swing.JCheckBox    jCheckBoxX64\r
      */\r
-    private JButton getJButton16() {\r
-        if (jButton16 == null) {\r
-            jButton16 = new JButton();\r
-            jButton16.setText("Delete");\r
-            jButton16.setPreferredSize(new java.awt.Dimension(70,20));\r
+    private JCheckBox getJCheckBoxX64() {\r
+        if (jCheckBoxX64 == null) {\r
+            jCheckBoxX64 = new JCheckBox();\r
+            jCheckBoxX64.setText("X64");\r
+            jCheckBoxX64.setBounds(new java.awt.Rectangle(55, 0, 53, 20));\r
         }\r
-        return jButton16;\r
+        return jCheckBoxX64;\r
     }\r
 \r
     /**\r
-     * This method initializes jScrollPane7    \r
-     *         \r
-     * @return javax.swing.JScrollPane \r
+     * This method initializes jCheckBoxIpf\r
+     *  \r
+     * @return javax.swing.JCheckBox    jCheckBoxIpf\r
      */\r
-    private JScrollPane getJScrollPane7() {\r
-        if (jScrollPane7 == null) {\r
-            jScrollPane7 = new JScrollPane();\r
-            jScrollPane7.setPreferredSize(new java.awt.Dimension(110,200));\r
-            jScrollPane7.setViewportView(getJTree());\r
+    private JCheckBox getJCheckBoxIpf() {\r
+        if (jCheckBoxIpf == null) {\r
+            jCheckBoxIpf = new JCheckBox();\r
+            jCheckBoxIpf.setBounds(new java.awt.Rectangle(108, 0, 52, 20));\r
+            jCheckBoxIpf.setText("IPF");\r
         }\r
-        return jScrollPane7;\r
+        return jCheckBoxIpf;\r
     }\r
 \r
+\r
     /**\r
-     * This method initializes jTree   \r
-     *         \r
-     * @return javax.swing.JTree       \r
+     * This method initializes jCheckBoxEBC\r
+     *  \r
+     * @return javax.swing.JCheckBox    jCheckBoxEBC\r
      */\r
-    private JTree getJTree() {\r
-        if (jTree == null) {\r
-            jTree = new JTree();\r
+    private JCheckBox getJCheckBoxEBC() {\r
+        if (jCheckBoxEBC == null) {\r
+            jCheckBoxEBC = new JCheckBox();\r
+            jCheckBoxEBC.setBounds(new java.awt.Rectangle(160, 0, 53, 20));\r
+            jCheckBoxEBC.setText("EBC");\r
         }\r
-        return jTree;\r
+        return jCheckBoxEBC;\r
     }\r
 \r
     /**\r
-     * This method initializes jButton17       \r
-     *         \r
-     * @return javax.swing.JButton     \r
+     * This method initializes jCheckBoxARM\r
+     *  \r
+     * @return javax.swing.JCheckBox    jCheckBoxARM\r
      */\r
-    private JButton getJButton17() {\r
-        if (jButton17 == null) {\r
-            jButton17 = new JButton();\r
-            jButton17.setPreferredSize(new java.awt.Dimension(70,20));\r
-            jButton17.setText("Add");\r
-            jButton17.addActionListener(new AbstractAction() {\r
-                public void actionPerformed(ActionEvent arg0){\r
-                    Object[] o = {"", ""};\r
-                    ffsAttributesTableModel.addRow(o);\r
+    private JCheckBox getJCheckBoxARM() {\r
+        if (jCheckBoxARM == null) {\r
+            jCheckBoxARM = new JCheckBox();\r
+            jCheckBoxARM.setBounds(new java.awt.Rectangle(213, 0, 54, 20));\r
+            jCheckBoxARM.setText("ARM");\r
+        }\r
+        return jCheckBoxARM;\r
+    }\r
+\r
+    /**\r
+     * This method initializes jCheckBoxPPC \r
+     *  \r
+     * @return javax.swing.JCheckBox    jCheckBoxPPC\r
+     */\r
+    private JCheckBox getJCheckBoxPPC() {\r
+        if (jCheckBoxPPC == null) {\r
+            jCheckBoxPPC = new JCheckBox();\r
+            jCheckBoxPPC.setBounds(new java.awt.Rectangle(267, 0, 53, 20));\r
+            jCheckBoxPPC.setText("PPC");\r
+        }\r
+        return jCheckBoxPPC;\r
+    }\r
+\r
+    /**\r
+     * This method initializes jTextFieldToolChainFamily  Row 5    \r
+     *  \r
+     * This should be a drop down for MSFT, INTEL, GCC or USER_DEFINED\r
+     * \r
+     * @return javax.swing.JTextField   \r
+     */\r
+    private JTextField getJTextFieldToolChainFamily() {\r
+        if (jTextFieldToolChainFamily == null) {\r
+            jTextFieldToolChainFamily = new JTextField();\r
+            jTextFieldToolChainFamily.setBounds(new java.awt.Rectangle(fieldColumn, rowFive, fieldWidth, oneRowHeight));\r
+            jTextFieldToolChainFamily.setPreferredSize(new java.awt.Dimension(fieldWidth, oneRowHeight));\r
+            jTextFieldToolChainFamily.setLocation(new java.awt.Point(fieldColumn, rowFive));\r
+        }\r
+        return jTextFieldToolChainFamily;\r
+    }\r
+\r
+    /**\r
+     * This method initializes jTextFieldOptionContents Row 6\r
+     * \r
+     *         This is where we should put the checkbox & entry data for the command arguments\r
+     * \r
+     * @return javax.swing.JTextField  \r
+     */\r
+    private JTextField getJTextFieldOptionContents() {\r
+        if (jTextFieldOptionContents == null) {\r
+            jTextFieldOptionContents = new JTextField();\r
+            jTextFieldOptionContents.setPreferredSize(new java.awt.Dimension(fieldWidth, oneRowHeight));\r
+            jTextFieldOptionContents.setBounds(fieldColumn, rowSix, fieldWidth, oneRowHeight);\r
+            jTextFieldOptionContents.setLocation(new java.awt.Point(fieldColumn, rowSix));\r
+        }\r
+        return jTextFieldOptionContents;\r
+    }\r
+\r
+    /**\r
+     * This method initializes jButtonOptionsAdd\r
+     *  \r
+     * Add entry from the top screen to the table\r
+     * \r
+     * @return javax.swing.JButton  jButtonOptionsAdd\r
+     */\r
+    private JButton getJButtonOptionsAdd() {\r
+        if (jButtonOptionsAdd == null) {\r
+            jButtonOptionsAdd = new JButton();\r
+            jButtonOptionsAdd.setText("Add");\r
+\r
+            jButtonOptionsAdd.setPreferredSize(new java.awt.Dimension(buttonWidth, oneRowHeight));\r
+            jButtonOptionsAdd.setBounds(new java.awt.Rectangle(firstButtonLoc, buttonRow, buttonWidth, oneRowHeight));            \r
+            jButtonOptionsAdd.setLocation(new java.awt.Point(firstButtonLoc, buttonRow));\r
+            jButtonOptionsAdd.addActionListener(new AbstractAction() {\r
+                /**\r
+                 * \r
+                 */\r
+                private static final long serialVersionUID = 1L;\r
+\r
+                public void actionPerformed(java.awt.event.ActionEvent e) {\r
+                    boolean[] boolArray = { jCheckBoxIA32.isSelected(), jCheckBoxIpf.isSelected(),\r
+                                           jCheckBoxX64.isSelected(), jCheckBoxEBC.isSelected(),\r
+                                           jCheckBoxARM.isSelected(), jCheckBoxPPC.isSelected() };\r
+                    String s = boolToList(boolArray);\r
+                    Object[] o = { jTextFieldBuildTargets.getText(), jTextFieldToolChainFamily.getText(), s,\r
+                                  jTextFieldToolCmd.getText(), jTextFieldTagName.getText(),\r
+                                  jTextFieldOptionContents.getText() };\r
+                    optionsTableModel.addRow(o);\r
+                    docConsole.setSaved(false);\r
+                    ffc.genBuildOptionsOpt(stringToVector(jTextFieldBuildTargets.getText()),\r
+                                           jTextFieldToolChainFamily.getText(), jTextFieldTagName.getText(),\r
+                                           jTextFieldToolCmd.getText(), stringToVector(s),\r
+                                           jTextFieldOptionContents.getText());\r
                 }\r
             });\r
         }\r
-        return jButton17;\r
+        return jButtonOptionsAdd;\r
     }\r
 \r
     /**\r
-     * This method initializes jButton18       \r
-     *         \r
-     * @return javax.swing.JButton     \r
-     */\r
-    private JButton getJButton18() {\r
-        if (jButton18 == null) {\r
-            jButton18 = new JButton();\r
-            jButton18.setPreferredSize(new java.awt.Dimension(70,20));\r
-            jButton18.setText("Delete");\r
-            jButton18.addActionListener(new AbstractAction(){\r
-                public void actionPerformed(ActionEvent arg0){\r
-                    if (jTable4.getSelectedRow() >= 0){\r
-                        ffsAttributesTableModel.removeRow(jTable4.getSelectedRow());\r
+     * This method initializes jButtonOptionsDel    \r
+     *  \r
+     * Remove a line from the table below\r
+     * \r
+     * @return javax.swing.JButton  jButtonOptionsDel\r
+     */\r
+    private JButton getJButtonOptionsDel() {\r
+        if (jButtonOptionsDel == null) {\r
+            jButtonOptionsDel = new JButton();\r
+            jButtonOptionsDel.setText("Delete");\r
+            jButtonOptionsDel.setPreferredSize(new java.awt.Dimension(buttonWidth, oneRowHeight));\r
+            jButtonOptionsDel.setBounds(new java.awt.Rectangle(next2LastButtonLoc, buttonRow, buttonWidth, oneRowHeight));\r
+            jButtonOptionsDel.setLocation(new java.awt.Point(next2LastButtonLoc, buttonRow));\r
+            jButtonOptionsDel.addActionListener(new AbstractAction() {\r
+                /**\r
+                 * \r
+                 */\r
+                private static final long serialVersionUID = 1L;\r
+\r
+                public void actionPerformed(java.awt.event.ActionEvent e) {\r
+                    if (selectedRow >= 0) {\r
+                        optionsTableModel.removeRow(selectedRow);\r
+                        docConsole.setSaved(false);\r
+                        ffc.removeBuildOptionsOpt(selectedRow);\r
                     }\r
                 }\r
             });\r
         }\r
-        return jButton18;\r
+        return jButtonOptionsDel;\r
     }\r
 \r
     /**\r
-     * This method initializes jButton19       \r
-     *         \r
-     * @return javax.swing.JButton     \r
+     * This method initializes jScrollPaneOptions      \r
+     *         Contains the Table and is located below the data entry section\r
+     * @return javax.swing.JScrollPane jScrollPaneOptoins\r
      */\r
-    private JButton getJButton19() {\r
-        if (jButton19 == null) {\r
-            jButton19 = new JButton();\r
-            jButton19.setPreferredSize(new java.awt.Dimension(75,20));\r
-            jButton19.setEnabled(false);\r
-            jButton19.setText("Update");\r
+    private JScrollPane getJScrollPaneOptions() {\r
+        if (jScrollPaneOptions == null) {\r
+            jScrollPaneOptions = new JScrollPane();\r
+            jScrollPaneOptions.setPreferredSize(new java.awt.Dimension(dialogWidth, dialogHeight * 2));\r
+            jScrollPaneOptions.setBounds(new java.awt.Rectangle(2, (dialogHeight * 2) + 2, dialogWidth * 2, dialogHeight * 2));\r
+            jScrollPaneOptions.setLocation(new java.awt.Point(2, dialogHeight + 2));\r
+\r
+            jScrollPaneOptions.setViewportView(getJTableOptions());\r
         }\r
-        return jButton19;\r
+        return jScrollPaneOptions;\r
     }\r
 \r
     /**\r
-     * This method initializes jCheckBox9      \r
+     * This method initializes jTableOptions\r
      *         \r
-     * @return javax.swing.JCheckBox   \r
+     * @return javax.swing.JTable      jTableOptions\r
      */\r
-    private JCheckBox getJCheckBox9() {\r
-        if (jCheckBox9 == null) {\r
-            jCheckBox9 = new JCheckBox();\r
-            jCheckBox9.setPreferredSize(new java.awt.Dimension(50,20));\r
-            jCheckBox9.setText("IA32");\r
+    private JTable getJTableOptions() {\r
+        if (jTableOptions == null) {\r
+            jTitle = new JLabel();\r
+            jTitle.setText("Current Option Configuration Lines");\r
+            jTitle.setBounds(2, 2, labelWidth, oneRowHeight);\r
+            \r
+            optionsTableModel = new DefaultTableModel();\r
+            jTableOptions = new JTable(optionsTableModel);\r
+            jTableOptions.setRowHeight(20);\r
+            optionsTableModel.addColumn("Build Targets");\r
+            optionsTableModel.addColumn("Tool Chain Family");\r
+            optionsTableModel.addColumn("Supported Architectures");\r
+            optionsTableModel.addColumn("Tool Command Code");\r
+            optionsTableModel.addColumn("TagName");\r
+            optionsTableModel.addColumn("Contents");\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
+            Vector<String> vArch = new Vector<String>();\r
+            vArch.add("IA32");\r
+            vArch.add("X64");\r
+            vArch.add("IPF");\r
+            vArch.add("EBC");\r
+            vArch.add("ARM");\r
+            vArch.add("PPC");\r
+            jTableOptions.getColumnModel().getColumn(2).setCellEditor(new ListEditor(vArch));\r
+            \r
+            jTableOptions.getColumnModel().getColumn(5).setCellEditor(new LongTextEditor());\r
+            \r
+            jTableOptions.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
+           jTableOptions.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r
+            jTableOptions.getSelectionModel().addListSelectionListener(new ListSelectionListener() {\r
+                public void valueChanged(ListSelectionEvent e) {\r
+                    selectedRow = -1;\r
+                    if (e.getValueIsAdjusting()) {\r
+                        return;\r
+                    }\r
+                    ListSelectionModel lsm = (ListSelectionModel) e.getSource();\r
+                    if (lsm.isSelectionEmpty()) {\r
+                        return;\r
+                    } else {\r
+                        selectedRow = lsm.getMinSelectionIndex();\r
+                    }\r
+                }\r
+            });\r
+\r
+            jTableOptions.getModel().addTableModelListener(new TableModelListener() {\r
+                public void tableChanged(TableModelEvent arg0) {\r
+                    // TODO Auto-generated method stub\r
+                    int row = arg0.getFirstRow();\r
+                    TableModel m = (TableModel) arg0.getSource();\r
+                    if (arg0.getType() == TableModelEvent.UPDATE) {\r
+                        //ToDo Data Validition check.\r
+                        String targets = m.getValueAt(row, 0) + "";\r
+                        Vector<Object> targetName = new Vector<Object>();\r
+                        String[] sArray = targets.split("( )+");\r
+                        for (int i = 0; i < sArray.length; ++i) {\r
+                            targetName.add(sArray[i]);\r
+                        }\r
+                        String toolChain = m.getValueAt(row, 1) + "";\r
+                        String archs = m.getValueAt(row, 2) + "";\r
+                        Vector<Object> supArch = null;\r
+                        if (archs.length() > 0) {\r
+                            supArch = new Vector<Object>();\r
+                            String[] sArray1 = archs.split("( )+");\r
+                            for (int i = 0; i < sArray1.length; ++i) {\r
+                                supArch.add(sArray1[i]);\r
+                            }\r
+                        }\r
+\r
+                        String toolCmd = m.getValueAt(row, 3) + "";\r
+                        String tagName = m.getValueAt(row, 4) + "";\r
+                        String contents = m.getValueAt(row, 5) + "";\r
+                        docConsole.setSaved(false);\r
+                        ffc.updateBuildOptionsOpt(row, targetName, toolChain, tagName, toolCmd, supArch, contents);\r
+                    }\r
+                }\r
+            });\r
         }\r
-        return jCheckBox9;\r
+        return jTableOptions;\r
     }\r
 \r
+    private Vector<Object> stringToVector(String s) {\r
+        String[] sArray = s.split(" ");\r
+        Vector<Object> v = null;\r
+        if (s.length() > 0) {\r
+            v = new Vector<Object>();\r
+            for (int i = 0; i < sArray.length; ++i) {\r
+                v.add(sArray[i]);\r
+            }\r
+        }\r
+        return v;\r
+    }\r
+\r
+    private String boolToList(boolean[] bool) {\r
+        String s = " ";\r
+        if (bool[0]) {\r
+            s += "IA32 ";\r
+        }\r
+        if (bool[1]) {\r
+            s += "IPF ";\r
+        }\r
+        if (bool[2]) {\r
+            s += "X64 ";\r
+        }\r
+        if (bool[3]) {\r
+            s += "EBC ";\r
+        }\r
+        if (bool[4]) {\r
+            s += "ARM ";\r
+        }\r
+        if (bool[5]) {\r
+            s += "PPC ";\r
+        }\r
+        if (s == " ") {\r
+            s += "IA32";\r
+        }\r
+        return s.trim();\r
+    }\r
+\r
+    private void initOptionTable() {\r
+        if (ffc.getBuildOptionsOptCount() == 0) {\r
+            //ToDo get default options from *.txt file\r
+            return;\r
+        }\r
+        String[][] saa = new String[ffc.getBuildOptionsOptCount()][6];\r
+        ffc.getBuildOptionsOpts(saa);\r
+        for (int i = 0; i < saa.length; ++i) {\r
+            optionsTableModel.addRow(saa[i]);\r
+        }\r
+    }\r
+\r
+\r
     /**\r
-     * This method initializes jCheckBox10     \r
-     *         \r
-     * @return javax.swing.JCheckBox   \r
+     * Everything below should pertain to the ANT Task Tab\r
+     */\r
+\r
+    /**\r
+     * This method initializes jButton12    \r
+     *  \r
+     * @return javax.swing.JButton  \r
      */\r
-    private JCheckBox getJCheckBox10() {\r
-        if (jCheckBox10 == null) {\r
-            jCheckBox10 = new JCheckBox();\r
-            jCheckBox10.setPreferredSize(new java.awt.Dimension(50,20));\r
-            jCheckBox10.setText("IPF");\r
+    private JButton getJButtonAntTaskFileBrowse() {\r
+        if (jButtonAntTaskFileBrowse == null) {\r
+            jButtonAntTaskFileBrowse = new JButton();\r
+            jButtonAntTaskFileBrowse.setPreferredSize(new Dimension(buttonWidth, oneRowHeight));\r
+            jButtonAntTaskFileBrowse.setText("Browse");\r
+            jButtonAntTaskFileBrowse.addActionListener(new AbstractAction() {\r
+                private static final long serialVersionUID = 1L;\r
+\r
+                public void actionPerformed(ActionEvent arg0) {\r
+                    //\r
+                    // Select files from current workspace\r
+                    //\r
+                    String dirPrefix = System.getenv("WORKSPACE");\r
+                    JFileChooser chooser = new JFileChooser(dirPrefix);\r
+                    File theFile = null;\r
+                    String headerDest = null;\r
+\r
+                    chooser.setMultiSelectionEnabled(false);\r
+                    chooser.setFileSelectionMode(JFileChooser.FILES_ONLY);\r
+                    int retval = chooser.showOpenDialog(frame);\r
+                    if (retval == JFileChooser.APPROVE_OPTION) {\r
+\r
+                        theFile = chooser.getSelectedFile();\r
+                        String file = theFile.getPath();\r
+                        if (!file.startsWith(dirPrefix)) {\r
+                            JOptionPane.showMessageDialog(frame, "You can only select files in current package!");\r
+                            return;\r
+                        }\r
+                    } else {\r
+                        return;\r
+                    }\r
+\r
+                    headerDest = theFile.getPath();\r
+                    jTextFieldAntTaskFile.setText(headerDest.substring(dirPrefix.length()).replace('\\', '/'));\r
+\r
+                }\r
+\r
+            });\r
         }\r
-        return jCheckBox10;\r
+        return jButtonAntTaskFileBrowse;\r
     }\r
 \r
     /**\r
-     * This method initializes jCheckBox11     \r
+     * This method initializes jPanelUserDefCenterN    \r
      *         \r
-     * @return javax.swing.JCheckBox   \r
+     * @return javax.swing.JPanel      \r
      */\r
-    private JCheckBox getJCheckBox11() {\r
-        if (jCheckBox11 == null) {\r
-            jCheckBox11 = new JCheckBox();\r
-            jCheckBox11.setText("X64");\r
-            jCheckBox11.setPreferredSize(new java.awt.Dimension(47,20));\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 jCheckBox11;\r
+        return jPanelUserDefCenterN;\r
     }\r
 \r
     /**\r
-     * This method initializes jCheckBox12     \r
-     *         \r
-     * @return javax.swing.JCheckBox   \r
+     * This method initializes jPanel8  \r
+     *  \r
+     * @return javax.swing.JPanel   \r
      */\r
-    private JCheckBox getJCheckBox12() {\r
-        if (jCheckBox12 == null) {\r
-            jCheckBox12 = new JCheckBox();\r
-            jCheckBox12.setPreferredSize(new java.awt.Dimension(50,20));\r
-            jCheckBox12.setText("EBC");\r
+    private JPanel getJPanelUserDef() {\r
+        if (jPanelUserDef == null) {\r
+            jPanelUserDef = new JPanel();\r
+            jPanelUserDef.setLayout(new BorderLayout());\r
+            jPanelUserDef.add(getJPanelUserDefNorth(), java.awt.BorderLayout.NORTH);\r
+            jPanelUserDef.add(getJPanelUserDefCenter(), java.awt.BorderLayout.CENTER);\r
+\r
         }\r
-        return jCheckBox12;\r
+        return jPanelUserDef;\r
     }\r
 \r
     /**\r
-     * This method initializes jCheckBox13     \r
-     *         \r
-     * @return javax.swing.JCheckBox   \r
+     * This method initializes jPanel9  \r
+     *  \r
+     * @return javax.swing.JPanel   \r
      */\r
-    private JCheckBox getJCheckBox13() {\r
-        if (jCheckBox13 == null) {\r
-            jCheckBox13 = new JCheckBox();\r
-            jCheckBox13.setPreferredSize(new java.awt.Dimension(55,20));\r
-            jCheckBox13.setText("ARM");\r
+    private JPanel getJPanelUserDefNorth() {\r
+        if (jPanelUserDefNorth == null) {\r
+            jLabelAntTaskFile = new JLabel();\r
+            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.CENTER);\r
+            jLabelAntTaskId = new JLabel();\r
+            jLabelAntTaskId.setText("ID");\r
+            jPanelUserDefNorth = new JPanel();\r
+            jPanelUserDefNorth.setLayout(flowLayout8);\r
+            jPanelUserDefNorth.add(jLabelAntTaskFile, null);\r
+            jPanelUserDefNorth.add(getJTextFieldAntTaskFile(), null);\r
+            jPanelUserDefNorth.add(getJButtonAntTaskFileBrowse(), null);\r
+            jPanelUserDefNorth.add(jLabelAntTaskId, null);\r
+            jPanelUserDefNorth.add(getJTextFieldAntTaskId(), null);\r
         }\r
-        return jCheckBox13;\r
+        return jPanelUserDefNorth;\r
     }\r
 \r
     /**\r
-     * This method initializes jCheckBox14     \r
-     *         \r
-     * @return javax.swing.JCheckBox   \r
+     * This method initializes jPanel11 \r
+     *  \r
+     * @return javax.swing.JPanel   \r
      */\r
-    private JCheckBox getJCheckBox14() {\r
-        if (jCheckBox14 == null) {\r
-            jCheckBox14 = new JCheckBox();\r
-            jCheckBox14.setPreferredSize(new java.awt.Dimension(50,20));\r
-            jCheckBox14.setText("PPC");\r
+    private JPanel getJPanelUserDefCenter() {\r
+        if (jPanelUserDefCenter == null) {\r
+            jLabelAntCmdOpts = new JLabel();\r
+            jLabelAntCmdOpts.setText("ANT Command Options");\r
+            jLabelAntCmdOpts.setPreferredSize(new java.awt.Dimension(131, 20));\r
+            jPanelUserDefCenter = new JPanel();\r
+            jPanelUserDefCenter.setLayout(new BorderLayout());\r
+\r
+            jPanelUserDefCenter.add(getJPanelUserDefCenterN(), java.awt.BorderLayout.NORTH);\r
+            jPanelUserDefCenter.add(getJScrollPaneAntTasks(), java.awt.BorderLayout.CENTER);\r
         }\r
-        return jCheckBox14;\r
+        return jPanelUserDefCenter;\r
     }\r
 \r
     /**\r
-     * This method initializes jTextField12    \r
-     *         \r
-     * @return javax.swing.JTextField  \r
+     * This method initializes jTextField2  \r
+     *  \r
+     * @return javax.swing.JTextField   \r
      */\r
-    private JTextField getJTextField12() {\r
-        if (jTextField12 == null) {\r
-            jTextField12 = new JTextField();\r
-            jTextField12.setPreferredSize(new java.awt.Dimension(150,20));\r
+    private JTextField getJTextFieldAntTaskFile() {\r
+        if (jTextFieldAntTaskFile == null) {\r
+            jTextFieldAntTaskFile = new JTextField();\r
+            jTextFieldAntTaskFile.setPreferredSize(new java.awt.Dimension(200, 20));\r
         }\r
-        return jTextField12;\r
+        return jTextFieldAntTaskFile;\r
     }\r
 \r
     /**\r
-     * This method initializes jTextField13    \r
-     *         \r
-     * @return javax.swing.JTextField  \r
+     * This method initializes jTextField3  \r
+     *  \r
+     * @return javax.swing.JTextField   \r
      */\r
-    private JTextField getJTextField13() {\r
-        if (jTextField13 == null) {\r
-            jTextField13 = new JTextField();\r
-            jTextField13.setPreferredSize(new java.awt.Dimension(140,20));\r
+    private JTextField getJTextFieldAntTaskId() {\r
+        if (jTextFieldAntTaskId == null) {\r
+            jTextFieldAntTaskId = new JTextField();\r
+            jTextFieldAntTaskId.setPreferredSize(new java.awt.Dimension(100, 20));\r
         }\r
-        return jTextField13;\r
+        return jTextFieldAntTaskId;\r
     }\r
 \r
     /**\r
-     * @param args\r
+     * This method initializes jButton4 \r
+     *  \r
+     * @return javax.swing.JButton  \r
      */\r
-    public static void main(String[] args) {\r
-        // TODO Auto-generated method stub\r
-        new FpdBuildOptions().setVisible(true);\r
+    private JButton getJButtonAntTaskAdd() {\r
+        if (jButtonAntTaskAdd == null) {\r
+            jButtonAntTaskAdd = new JButton();\r
+            jButtonAntTaskAdd.setPreferredSize(new java.awt.Dimension(90, 20));\r
+            jButtonAntTaskAdd.setText("Add");\r
+            jButtonAntTaskAdd.addActionListener(new ActionListener() {\r
+                public void actionPerformed(ActionEvent e) {\r
+                    if (!DataValidation.isInt(jTextFieldAntTaskId.getText())\r
+                        || jTextFieldAntTaskId.getText().length() != 8) {\r
+                        JOptionPane.showMessageDialog(frame, "ID must be an 8-digit integer.");\r
+                        return;\r
+                    }\r
+                    Object[] o = { jTextFieldAntTaskId.getText(), null, null };\r
+                    o[1] = jTextFieldAntTaskFile.getText();\r
+                    o[2] = jTextFieldAntCmdOpts.getText();\r
+                    ffc.genBuildOptionsUserDefAntTask(o[0] + "", o[1] + "", o[2] + "");\r
+                    antTaskTableModel.addRow(o);\r
+                    docConsole.setSaved(false);\r
+                }\r
+            });\r
+        }\r
+        return jButtonAntTaskAdd;\r
     }\r
 \r
     /**\r
-     * This is the default constructor\r
+     * This method initializes jButton5 \r
+     *  \r
+     * @return javax.swing.JButton  \r
      */\r
-    public FpdBuildOptions() {\r
-        super();\r
-        initialize();\r
-        this.setVisible(true);\r
-    }\r
-    \r
-    public FpdBuildOptions(PlatformSurfaceAreaDocument.PlatformSurfaceArea fpd) {\r
-        this();\r
-        ffc = new FpdFileContents(fpd);\r
-        init(ffc);\r
+    private JButton getJButtonAntTaskDel() {\r
+        if (jButtonAntTaskDel == null) {\r
+            jButtonAntTaskDel = new JButton();\r
+            jButtonAntTaskDel.setPreferredSize(new java.awt.Dimension(90, 20));\r
+            jButtonAntTaskDel.setText("Delete");\r
+            jButtonAntTaskDel.addActionListener(new ActionListener() {\r
+                public void actionPerformed(ActionEvent e) {\r
+                    if (selectedRow >= 0) {\r
+                        docConsole.setSaved(false);\r
+                        antTaskTableModel.removeRow(selectedRow);\r
+                        ffc.removeBuildOptionsUserDefAntTask(selectedRow);\r
+                    }\r
+                }\r
+            });\r
+        }\r
+        return jButtonAntTaskDel;\r
     }\r
 \r
-    private void init(FpdFileContents ffc) {\r
-        initOptionTable();\r
-        initAntTaskTable();\r
+    /**\r
+     * This method initializes jTextField4  \r
+     *  \r
+     * @return javax.swing.JTextField   \r
+     */\r
+    private JTextField getJTextFieldAntCmdOpts() {\r
+        if (jTextFieldAntCmdOpts == null) {\r
+            jTextFieldAntCmdOpts = new JTextField();\r
+            jTextFieldAntCmdOpts.setPreferredSize(new java.awt.Dimension(270, 20));\r
+            jTextFieldAntCmdOpts.setEnabled(true);\r
+        }\r
+        return jTextFieldAntCmdOpts;\r
     }\r
-    \r
-    private void initOptionTable() {\r
-        if (ffc.getBuildOptionsOptCount() == 0) {\r
-            //ToDo get default options from *.txt file\r
-            return;\r
+\r
+    /**\r
+     * This method initializes jScrollPane2 \r
+     *  \r
+     * @return javax.swing.JScrollPane  \r
+     */\r
+    private JScrollPane getJScrollPaneAntTasks() {\r
+        if (jScrollPaneAntTasks == null) {\r
+            jScrollPaneAntTasks = new JScrollPane();\r
+            jScrollPaneAntTasks.setPreferredSize(new java.awt.Dimension(600, 400));\r
+            jScrollPaneAntTasks.setViewportView(getJTableAntTasks());\r
         }\r
-        String[][] saa = new String[ffc.getBuildOptionsOptCount()][6];\r
-        ffc.getBuildOptionsOpts(saa);\r
-        for (int i = 0; i < saa.length; ++i) {\r
-            optionsTableModel.addRow(saa[i]);\r
+        return jScrollPaneAntTasks;\r
+    }\r
+\r
+    /**\r
+     * This method initializes jTable2  \r
+     *  \r
+     * @return javax.swing.JTable   \r
+     */\r
+    private JTable getJTableAntTasks() {\r
+        if (jTableAntTasks == null) {\r
+            antTaskTableModel = new DefaultTableModel();\r
+            jTableAntTasks = new JTable(antTaskTableModel);\r
+            jTableAntTasks.setRowHeight(20);\r
+            antTaskTableModel.addColumn("ID");\r
+            antTaskTableModel.addColumn("Filename");\r
+            antTaskTableModel.addColumn("ANT Command Options");\r
+\r
+            jTableAntTasks.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
+            jTableAntTasks.getSelectionModel().addListSelectionListener(new ListSelectionListener() {\r
+                public void valueChanged(ListSelectionEvent e) {\r
+                    selectedRow = -1;\r
+                    if (e.getValueIsAdjusting()) {\r
+                        return;\r
+                    }\r
+                    ListSelectionModel lsm = (ListSelectionModel) e.getSource();\r
+                    if (lsm.isSelectionEmpty()) {\r
+                        return;\r
+                    } else {\r
+                        selectedRow = lsm.getMinSelectionIndex();\r
+                    }\r
+                }\r
+            });\r
+\r
+            jTableAntTasks.getModel().addTableModelListener(new TableModelListener() {\r
+                public void tableChanged(TableModelEvent arg0) {\r
+                    // TODO Auto-generated method stub\r
+                    int row = arg0.getFirstRow();\r
+                    TableModel m = (TableModel) arg0.getSource();\r
+                    if (arg0.getType() == TableModelEvent.UPDATE) {\r
+                        //ToDo Data Validition check.\r
+                        String id = m.getValueAt(row, 0) + "";\r
+                        String file = m.getValueAt(row, 1) + "";\r
+                        String execOrder = m.getValueAt(row, 2) + "";\r
+                        if (id.length() == 0) {\r
+                            return;\r
+                        }\r
+                        if (file.length() == 0 && execOrder.length() == 0) {\r
+                            return;\r
+                        }\r
+                        if (file.length() == 0) {\r
+                            file = null;\r
+                        }\r
+                        if (execOrder.length() == 0) {\r
+                            execOrder = null;\r
+                        }\r
+                        ffc.updateBuildOptionsUserDefAntTask(row, id, file, execOrder);\r
+\r
+                    }\r
+                }\r
+            });\r
         }\r
+        return jTableAntTasks;\r
     }\r
-    \r
+\r
     private void initAntTaskTable() {\r
         if (ffc.getBuildOptionsUserDefAntTaskCount() == 0) {\r
             return;\r
@@ -1429,33 +2166,5 @@ public class FpdBuildOptions extends IInternalFrame {
             antTaskTableModel.addRow(saa[i]);\r
         }\r
     }\r
-    /**\r
-     * This method initializes this\r
-     * \r
-     * @return void\r
-     */\r
-    private void initialize() {\r
-        this.setSize(722, 439);\r
-        this.setTitle("FPD Build Options");\r
-        this.setContentPane(getJContentPane());\r
-    }\r
-\r
-    /**\r
-     * This method initializes jContentPane\r
-     * \r
-     * @return javax.swing.JPanel\r
-     */\r
-    private JPanel getJContentPane() {\r
-        if (jContentPane == null) {\r
-            jContentPane = new JPanel();\r
-            jContentPane.setLayout(new BorderLayout());\r
-            jContentPane.add(getJPanel(), java.awt.BorderLayout.SOUTH);\r
-            jContentPane.add(getJPanel1(), java.awt.BorderLayout.NORTH);\r
-            jContentPane.add(getJPanel2(), java.awt.BorderLayout.WEST);\r
-            jContentPane.add(getJPanel3(), java.awt.BorderLayout.EAST);\r
-            jContentPane.add(getJTabbedPane(), java.awt.BorderLayout.CENTER);\r
-        }\r
-        return jContentPane;\r
-    }\r
 \r
-}  //  @jve:decl-index=0:visual-constraint="10,10"\r
+} //  @jve:decl-index=0:visual-constraint="10,10"\r