Coding style changes
authorjlin16 <jlin16@6f19259b-4bc3-4df7-8a09-765794883524>
Mon, 31 Jul 2006 11:20:16 +0000 (11:20 +0000)
committerjlin16 <jlin16@6f19259b-4bc3-4df7-8a09-765794883524>
Mon, 31 Jul 2006 11:20:16 +0000 (11:20 +0000)
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1156 6f19259b-4bc3-4df7-8a09-765794883524

16 files changed:
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/GenGuidDialog.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdMsaFiles.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageDefinitions.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageHeaders.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdDynamicPcdBuildDefinitions.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/GenListDialog.java

index dfa1922..9c0674e 100644 (file)
@@ -53,26 +53,23 @@ public class GenGuidDialog extends JDialog implements ActionListener{
     \r
     static private JFrame frame;\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
-    private JPanel jPanel4 = null;\r
+    private JPanel jPanelEast = null;\r
+    private JPanel jPanelCenter = null;\r
     private JTextField jTextField = null;\r
     private JLabel jLabel = null;\r
     private JRadioButton jRadioButton = null;\r
-    private JRadioButton jRadioButton1 = null;\r
-    private JButton jButton = null;\r
-    private JButton jButton1 = null;\r
-    private JButton jButton2 = null;\r
+    private JRadioButton jRadioButtonReg = null;\r
+    private JButton jButtonCancel = null;\r
+    private JButton jButtonNew = null;\r
+    private JButton jButtonOk = null;\r
     \r
 //    private String guid = null;\r
 \r
     public void actionPerformed(ActionEvent arg0) {\r
         // TODO Auto-generated method stub\r
-        if (arg0.getSource() == jButton1){\r
+        if (arg0.getSource() == jButtonNew){\r
             String uuid = Tools.generateUuidString();\r
-            if (jRadioButton1.isSelected()) {\r
+            if (jRadioButtonReg.isSelected()) {\r
                 jTextField.setText(uuid);\r
             }\r
             else {\r
@@ -86,7 +83,7 @@ public class GenGuidDialog extends JDialog implements ActionListener{
             }\r
         }\r
         \r
-        if (arg0.getSource() == jRadioButton1){\r
+        if (arg0.getSource() == jRadioButtonReg){\r
             \r
             //ToDo: check text field value against RegExp and transform if needed\r
             if (jTextField.getText().matches(GenGuidDialog.guidRegistryPat)){\r
@@ -116,7 +113,7 @@ public class GenGuidDialog extends JDialog implements ActionListener{
             \r
         }\r
         \r
-        if (arg0.getSource() == jButton2){\r
+        if (arg0.getSource() == jButtonOk){\r
 //            if (jTextField.getText().matches(Tools.guidArrayPat) \r
 //                            || jTextField.getText().matches(Tools.guidRegistryPat)){\r
 //                this.setVisible(false);\r
@@ -127,7 +124,7 @@ public class GenGuidDialog extends JDialog implements ActionListener{
             this.dispose();\r
         }\r
         \r
-        if (arg0.getSource() == jButton){\r
+        if (arg0.getSource() == jButtonCancel){\r
             this.dispose();\r
         }\r
     }\r
@@ -137,54 +134,18 @@ public class GenGuidDialog extends JDialog implements ActionListener{
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel() {\r
-        if (jPanel == null) {\r
+    private JPanel getJPanelEast() {\r
+        if (jPanelEast == null) {\r
             FlowLayout flowLayout = new FlowLayout();\r
             flowLayout.setVgap(10);\r
-            jPanel = new JPanel();\r
-            jPanel.setLayout(flowLayout);\r
-            jPanel.setPreferredSize(new java.awt.Dimension(100,30));\r
-            jPanel.add(getJButton1(), null);\r
-            jPanel.add(getJButton2(), null);\r
-            jPanel.add(getJButton(), null);\r
+            jPanelEast = new JPanel();\r
+            jPanelEast.setLayout(flowLayout);\r
+            jPanelEast.setPreferredSize(new java.awt.Dimension(100,30));\r
+            jPanelEast.add(getJButtonNew(), null);\r
+            jPanelEast.add(getJButtonOk(), null);\r
+            jPanelEast.add(getJButtonCancel(), null);\r
         }\r
-        return jPanel;\r
-    }\r
-\r
-    /**\r
-     * This method initializes jPanel1 \r
-     *         \r
-     * @return javax.swing.JPanel      \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
-     */\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
-     */\r
-    private JPanel getJPanel3() {\r
-        if (jPanel3 == null) {\r
-            jPanel3 = new JPanel();\r
-        }\r
-        return jPanel3;\r
+        return jPanelEast;\r
     }\r
 \r
     /**\r
@@ -192,23 +153,23 @@ public class GenGuidDialog extends JDialog implements ActionListener{
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel4() {\r
-        if (jPanel4 == null) {\r
+    private JPanel getJPanelCenter() {\r
+        if (jPanelCenter == null) {\r
             jLabel = new JLabel();\r
             jLabel.setText("GUID Value");\r
             GridLayout gridLayout = new GridLayout();\r
             gridLayout.setRows(4);\r
-            jPanel4 = new JPanel();\r
-            jPanel4.setLayout(gridLayout);\r
-            jPanel4.add(getJRadioButton1(), null);\r
-            jPanel4.add(getJRadioButton(), null);\r
-            jPanel4.add(jLabel, null);\r
-            jPanel4.add(getJTextField(), null);\r
+            jPanelCenter = new JPanel();\r
+            jPanelCenter.setLayout(gridLayout);\r
+            jPanelCenter.add(getJRadioButtonReg(), null);\r
+            jPanelCenter.add(getJRadioButton(), null);\r
+            jPanelCenter.add(jLabel, null);\r
+            jPanelCenter.add(getJTextField(), null);\r
             ButtonGroup bg = new ButtonGroup();\r
-            bg.add(jRadioButton1);\r
+            bg.add(jRadioButtonReg);\r
             bg.add(jRadioButton);\r
         }\r
-        return jPanel4;\r
+        return jPanelCenter;\r
     }\r
 \r
     /**\r
@@ -245,14 +206,14 @@ public class GenGuidDialog extends JDialog implements ActionListener{
      *         \r
      * @return javax.swing.JRadioButton        \r
      */\r
-    private JRadioButton getJRadioButton1() {\r
-        if (jRadioButton1 == null) {\r
-            jRadioButton1 = new JRadioButton();\r
-            jRadioButton1.setText("Registry Format");\r
-            jRadioButton1.setSelected(true);\r
-            jRadioButton1.addActionListener(this);\r
+    private JRadioButton getJRadioButtonReg() {\r
+        if (jRadioButtonReg == null) {\r
+            jRadioButtonReg = new JRadioButton();\r
+            jRadioButtonReg.setText("Registry Format");\r
+            jRadioButtonReg.setSelected(true);\r
+            jRadioButtonReg.addActionListener(this);\r
         }\r
-        return jRadioButton1;\r
+        return jRadioButtonReg;\r
     }\r
 \r
     /**\r
@@ -260,14 +221,14 @@ public class GenGuidDialog extends JDialog implements ActionListener{
      *         \r
      * @return javax.swing.JButton     \r
      */\r
-    private JButton getJButton() {\r
-        if (jButton == null) {\r
-            jButton = new JButton();\r
-            jButton.setPreferredSize(new java.awt.Dimension(80,20));\r
-            jButton.setText("Cancel");\r
-            jButton.addActionListener(this);\r
+    private JButton getJButtonCancel() {\r
+        if (jButtonCancel == null) {\r
+            jButtonCancel = new JButton();\r
+            jButtonCancel.setPreferredSize(new java.awt.Dimension(80,20));\r
+            jButtonCancel.setText("Cancel");\r
+            jButtonCancel.addActionListener(this);\r
         }\r
-        return jButton;\r
+        return jButtonCancel;\r
     }\r
 \r
     /**\r
@@ -275,15 +236,15 @@ public class GenGuidDialog extends JDialog implements ActionListener{
      *         \r
      * @return javax.swing.JButton     \r
      */\r
-    private JButton getJButton1() {\r
-        if (jButton1 == null) {\r
-            jButton1 = new JButton();\r
-            jButton1.setPreferredSize(new java.awt.Dimension(80,20));\r
-            jButton1.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING);\r
-            jButton1.setText("New");\r
-            jButton1.addActionListener(this);\r
+    private JButton getJButtonNew() {\r
+        if (jButtonNew == null) {\r
+            jButtonNew = new JButton();\r
+            jButtonNew.setPreferredSize(new java.awt.Dimension(80,20));\r
+            jButtonNew.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING);\r
+            jButtonNew.setText("New");\r
+            jButtonNew.addActionListener(this);\r
         }\r
-        return jButton1;\r
+        return jButtonNew;\r
     }\r
 \r
     /**\r
@@ -291,15 +252,15 @@ public class GenGuidDialog extends JDialog implements ActionListener{
      *         \r
      * @return javax.swing.JButton     \r
      */\r
-    private JButton getJButton2() {\r
-        if (jButton2 == null) {\r
-            jButton2 = new JButton();\r
-            jButton2.setPreferredSize(new java.awt.Dimension(80,20));\r
-            jButton2.setText("Ok");\r
-            jButton2.setActionCommand("GenGuidValue");\r
-            jButton2.addActionListener(this);\r
+    private JButton getJButtonOk() {\r
+        if (jButtonOk == null) {\r
+            jButtonOk = new JButton();\r
+            jButtonOk.setPreferredSize(new java.awt.Dimension(80,20));\r
+            jButtonOk.setText("Ok");\r
+            jButtonOk.setActionCommand("GenGuidValue");\r
+            jButtonOk.addActionListener(this);\r
         }\r
-        return jButton2;\r
+        return jButtonOk;\r
     }\r
 \r
     /**\r
@@ -329,14 +290,14 @@ public class GenGuidDialog extends JDialog implements ActionListener{
     public GenGuidDialog(ActionListener i){\r
         super();\r
         initialize();\r
-        jButton2.addActionListener(i);\r
+        jButtonOk.addActionListener(i);\r
         this.addWindowListener(new WindowAdapter(){\r
 \r
             @Override\r
             public void windowActivated(WindowEvent arg0) {\r
                 // TODO Auto-generated method stub\r
                 super.windowActivated(arg0);\r
-                if ((jRadioButton1.isSelected() && jTextField.getText().matches(GenGuidDialog.guidArrayPat))\r
+                if ((jRadioButtonReg.isSelected() && jTextField.getText().matches(GenGuidDialog.guidArrayPat))\r
                                 || (jRadioButton.isSelected() && jTextField.getText().matches(GenGuidDialog.guidRegistryPat))) {\r
                     jTextField.setText(GenGuidDialog.formatGuidString(jTextField.getText()));\r
                 }\r
@@ -373,11 +334,8 @@ public class GenGuidDialog extends JDialog implements ActionListener{
         if (jContentPane == null) {\r
             jContentPane = new JPanel();\r
             jContentPane.setLayout(new BorderLayout());\r
-            jContentPane.add(getJPanel(), java.awt.BorderLayout.EAST);\r
-            jContentPane.add(getJPanel1(), java.awt.BorderLayout.WEST);\r
-            jContentPane.add(getJPanel2(), java.awt.BorderLayout.NORTH);\r
-            jContentPane.add(getJPanel3(), java.awt.BorderLayout.SOUTH);\r
-            jContentPane.add(getJPanel4(), java.awt.BorderLayout.CENTER);\r
+            jContentPane.add(getJPanelEast(), java.awt.BorderLayout.EAST);\r
+            jContentPane.add(getJPanelCenter(), java.awt.BorderLayout.CENTER);\r
         }\r
         return jContentPane;\r
     }\r
index 120c528..9ffefec 100644 (file)
@@ -113,21 +113,21 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
 \r
     private JTextField jTextFieldVersion = null;\r
 \r
-    private JLabel jLabel = null;\r
+    private JLabel jLabelHelp = null;\r
 \r
-    private JTextField jTextField = null;\r
+    private JTextField jTextFieldHelp = null;\r
 \r
-    private JLabel jLabel1 = null;\r
+    private JLabel jLabelSupMod = null;\r
 \r
-    private JLabel jLabel2 = null;\r
+    private JLabel jLabelSupArch = null;\r
 \r
-    private ICheckBoxList iCheckBoxList = null;\r
+    private ICheckBoxList iCheckBoxListArch = null;\r
 \r
-    private ICheckBoxList iCheckBoxList1 = null;\r
+    private ICheckBoxList iCheckBoxListGuid = null;\r
 \r
-    private ICheckBoxList iCheckBoxList2 = null;\r
+    private ICheckBoxList iCheckBoxListMod = null;\r
 \r
-    private JLabel jLabel3 = null;\r
+    private JLabel jLabelGuidType = null;\r
 \r
     protected String[][] saa = null;\r
 \r
@@ -450,22 +450,22 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
      **/\r
     protected JPanel getJContentPane1() {\r
         if (jContentPane == null) {\r
-            jLabel3 = new JLabel();\r
-            jLabel3.setBounds(new java.awt.Rectangle(400,122,103,16));\r
-            jLabel3.setText("GUID Type List");\r
-            jLabel3.setEnabled(true);\r
-            jLabel2 = new JLabel();\r
-            jLabel2.setBounds(new java.awt.Rectangle(197,122,108,16));\r
-            jLabel2.setText("Supported Arch");\r
-            jLabel2.setEnabled(true);\r
-            jLabel1 = new JLabel();\r
-            jLabel1.setBounds(new java.awt.Rectangle(14,120,110,16));\r
-            jLabel1.setText("Supported Module");\r
-            jLabel1.setEnabled(true);\r
-            jLabel = new JLabel();\r
-            jLabel.setText("HelpText");\r
-            jLabel.setSize(new java.awt.Dimension(109,20));\r
-            jLabel.setLocation(new java.awt.Point(14,85));\r
+            jLabelGuidType = new JLabel();\r
+            jLabelGuidType.setBounds(new java.awt.Rectangle(400,122,103,16));\r
+            jLabelGuidType.setText("GUID Type List");\r
+            jLabelGuidType.setEnabled(true);\r
+            jLabelSupArch = new JLabel();\r
+            jLabelSupArch.setBounds(new java.awt.Rectangle(197,122,108,16));\r
+            jLabelSupArch.setText("Supported Arch");\r
+            jLabelSupArch.setEnabled(true);\r
+            jLabelSupMod = new JLabel();\r
+            jLabelSupMod.setBounds(new java.awt.Rectangle(14,120,110,16));\r
+            jLabelSupMod.setText("Supported Module");\r
+            jLabelSupMod.setEnabled(true);\r
+            jLabelHelp = new JLabel();\r
+            jLabelHelp.setText("HelpText");\r
+            jLabelHelp.setSize(new java.awt.Dimension(109,20));\r
+            jLabelHelp.setLocation(new java.awt.Point(14,85));\r
             jLabelVer = new JLabel();\r
             jLabelVer.setBounds(new java.awt.Rectangle(14,60,111,20));\r
             jLabelVer.setText("C_Name");\r
@@ -505,14 +505,14 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
             jContentPane.add(jLabelName, null);\r
             jContentPane.add(getJTextFieldName(), null);\r
             jContentPane.add(jLabelGuid, null);\r
-            jContentPane.add(jLabel, null);\r
-            jContentPane.add(getJTextField(), null);\r
-            jContentPane.add(jLabel1, null);\r
-            jContentPane.add(jLabel2, null);\r
+            jContentPane.add(jLabelHelp, null);\r
+            jContentPane.add(getJTextFieldHelp(), null);\r
+            jContentPane.add(jLabelSupMod, null);\r
+            jContentPane.add(jLabelSupArch, null);\r
             jContentPane.add(getJScrollPaneArch(), null);\r
             jContentPane.add(getJScrollPaneGuid(), null);\r
             jContentPane.add(getJScrollPaneModule(), null);\r
-            jContentPane.add(jLabel3, null);\r
+            jContentPane.add(jLabelGuidType, null);\r
         }\r
         return jContentPane;\r
     }\r
@@ -544,19 +544,19 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
             \r
             //ToDo: check before add\r
             String[] row = {"", "", "", "", "", "", ""};\r
-            row[3] = jTextField.getText();\r
+            row[3] = jTextFieldHelp.getText();\r
             row[2] = jTextFieldAdd.getText();\r
             row[1] = jTextFieldVersion.getText();\r
             row[0] = jTextFieldName.getText();\r
-            row[4] = vectorToString(iCheckBoxList.getAllCheckedItemsString());\r
+            row[4] = vectorToString(iCheckBoxListArch.getAllCheckedItemsString());\r
             if (row[4].length() == 0) {\r
                 row[4] = null;\r
             }\r
-            row[5] = vectorToString(iCheckBoxList2.getAllCheckedItemsString());\r
+            row[5] = vectorToString(iCheckBoxListMod.getAllCheckedItemsString());\r
             if (row[5].length() == 0) {\r
                 row[5] = null;\r
             }\r
-            row[6] = vectorToString(iCheckBoxList1.getAllCheckedItemsString());\r
+            row[6] = vectorToString(iCheckBoxListGuid.getAllCheckedItemsString());\r
             if (row[6].length() == 0) {\r
                 row[6] = null;\r
             }\r
@@ -622,15 +622,15 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
     }\r
     \r
     protected void addRow(String[] row) {\r
-        Vector<String> vArch = iCheckBoxList.getAllCheckedItemsString();\r
+        Vector<String> vArch = iCheckBoxListArch.getAllCheckedItemsString();\r
         if (vArch.size() == 0) {\r
             vArch = null;\r
         }\r
-        Vector<String> vModType = iCheckBoxList2.getAllCheckedItemsString();\r
+        Vector<String> vModType = iCheckBoxListMod.getAllCheckedItemsString();\r
         if (vModType.size() == 0) {\r
             vModType = null;\r
         }\r
-        Vector<String> vguidType = iCheckBoxList1.getAllCheckedItemsString();\r
+        Vector<String> vguidType = iCheckBoxListGuid.getAllCheckedItemsString();\r
         if (vguidType.size() == 0) {\r
             vguidType = null;\r
         }\r
@@ -711,7 +711,7 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
         resizeComponentWidth(this.jTextFieldName, this.getWidth(), intPreferredWidth);\r
         resizeComponentWidth(this.jTextFieldAdd, this.getWidth(), intPreferredWidth);\r
         resizeComponentWidth(this.jTextFieldVersion, this.getWidth(), intPreferredWidth);\r
-        resizeComponentWidth(this.jTextField, this.getWidth(), intPreferredWidth);\r
+        resizeComponentWidth(this.jTextFieldHelp, this.getWidth(), intPreferredWidth);\r
         resizeComponentWidth(this.jScrollPane, this.getWidth(), intPreferredWidth);\r
         relocateComponentX(this.jButtonGen, this.getWidth(), this.getPreferredSize().width, 40);\r
         \r
@@ -722,13 +722,13 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
      *         \r
      * @return javax.swing.JTextField  \r
      */\r
-    private JTextField getJTextField() {\r
-        if (jTextField == null) {\r
-            jTextField = new JTextField();\r
-            jTextField.setBounds(new java.awt.Rectangle(136,85,337,20));\r
-            jTextField.setPreferredSize(new Dimension(335, 20));\r
+    private JTextField getJTextFieldHelp() {\r
+        if (jTextFieldHelp == null) {\r
+            jTextFieldHelp = new JTextField();\r
+            jTextFieldHelp.setBounds(new java.awt.Rectangle(136,85,337,20));\r
+            jTextFieldHelp.setPreferredSize(new Dimension(335, 20));\r
         }\r
-        return jTextField;\r
+        return jTextFieldHelp;\r
     }\r
 \r
     private JScrollPane getJScrollPaneArch() {\r
@@ -736,7 +736,7 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
             jScrollPaneArch = new JScrollPane();\r
             jScrollPaneArch.setBounds(new java.awt.Rectangle(197,142,188,74));\r
             jScrollPaneArch.setPreferredSize(new java.awt.Dimension(188, 74));\r
-            jScrollPaneArch.setViewportView(getICheckBoxList());\r
+            jScrollPaneArch.setViewportView(getICheckBoxListArch());\r
         }\r
         return jScrollPaneArch;\r
     }\r
@@ -745,10 +745,10 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
      *         \r
      * @return org.tianocore.frameworkwizard.common.ui.iCheckBoxList.ICheckBoxList     \r
      */\r
-    private ICheckBoxList getICheckBoxList() {\r
-        if (iCheckBoxList == null) {\r
-            iCheckBoxList = new ICheckBoxList();\r
-            iCheckBoxList.setBounds(new java.awt.Rectangle(197,142,188,74));\r
+    private ICheckBoxList getICheckBoxListArch() {\r
+        if (iCheckBoxListArch == null) {\r
+            iCheckBoxListArch = new ICheckBoxList();\r
+            iCheckBoxListArch.setBounds(new java.awt.Rectangle(197,142,188,74));\r
             Vector<String> v = new Vector<String>();\r
             v.add("IA32");\r
             v.add("X64");\r
@@ -756,9 +756,9 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
             v.add("EBC");\r
             v.add("ARM");\r
             v.add("PPC");\r
-            iCheckBoxList.setAllItems(v);\r
+            iCheckBoxListArch.setAllItems(v);\r
         }\r
-        return iCheckBoxList;\r
+        return iCheckBoxListArch;\r
     }\r
 \r
     protected JScrollPane getJScrollPaneGuid() {\r
@@ -767,7 +767,7 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
             jScrollPaneGuid.setPreferredSize(new java.awt.Dimension(190,74));\r
             jScrollPaneGuid.setLocation(new java.awt.Point(400,142));\r
             jScrollPaneGuid.setSize(new java.awt.Dimension(260,74));\r
-            jScrollPaneGuid.setViewportView(getICheckBoxList1());\r
+            jScrollPaneGuid.setViewportView(getICheckBoxListGuid());\r
         }\r
         return jScrollPaneGuid;\r
     }\r
@@ -776,10 +776,10 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
      *         \r
      * @return org.tianocore.frameworkwizard.common.ui.iCheckBoxList.ICheckBoxList     \r
      */\r
-    private ICheckBoxList getICheckBoxList1() {\r
-        if (iCheckBoxList1 == null) {\r
-            iCheckBoxList1 = new ICheckBoxList();\r
-            iCheckBoxList1.setBounds(new java.awt.Rectangle(400,142,177,74));\r
+    private ICheckBoxList getICheckBoxListGuid() {\r
+        if (iCheckBoxListGuid == null) {\r
+            iCheckBoxListGuid = new ICheckBoxList();\r
+            iCheckBoxListGuid.setBounds(new java.awt.Rectangle(400,142,177,74));\r
             Vector<String> v = new Vector<String>();\r
             v.add("DATA_HUB_RECORD");\r
             v.add("EFI_EVENT");\r
@@ -790,9 +790,9 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
             v.add("HOB");\r
             v.add("TOKEN_SPACE_GUID");\r
           \r
-            iCheckBoxList1.setAllItems(v);\r
+            iCheckBoxListGuid.setAllItems(v);\r
         }\r
-        return iCheckBoxList1;\r
+        return iCheckBoxListGuid;\r
     }\r
 \r
     private JScrollPane getJScrollPaneModule() {\r
@@ -800,7 +800,7 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
             jScrollPaneModule = new JScrollPane();\r
             jScrollPaneModule.setBounds(new java.awt.Rectangle(14,142,170,74));\r
             jScrollPaneModule.setPreferredSize(new java.awt.Dimension(170, 74));\r
-            jScrollPaneModule.setViewportView(getICheckBoxList2());\r
+            jScrollPaneModule.setViewportView(getICheckBoxListMod());\r
         }\r
         return jScrollPaneModule;\r
     }\r
@@ -809,10 +809,10 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
      *         \r
      * @return org.tianocore.frameworkwizard.common.ui.iCheckBoxList.ICheckBoxList     \r
      */\r
-    private ICheckBoxList getICheckBoxList2() {\r
-        if (iCheckBoxList2 == null) {\r
-            iCheckBoxList2 = new ICheckBoxList();\r
-            iCheckBoxList2.setBounds(new java.awt.Rectangle(14,142,170,74));\r
+    private ICheckBoxList getICheckBoxListMod() {\r
+        if (iCheckBoxListMod == null) {\r
+            iCheckBoxListMod = new ICheckBoxList();\r
+            iCheckBoxListMod.setBounds(new java.awt.Rectangle(14,142,170,74));\r
             Vector<String> v = new Vector<String>();\r
             v.add("BASE");\r
             v.add("SEC");\r
@@ -826,9 +826,9 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
             v.add("UEFI_DRIVER");\r
             v.add("UEFI_APPLICATION");\r
             v.add("USER_DEFINED");\r
-            iCheckBoxList2.setAllItems(v);\r
+            iCheckBoxListMod.setAllItems(v);\r
         }\r
-        return iCheckBoxList2;\r
+        return iCheckBoxListMod;\r
     }\r
 \r
     public static void main(String[] args){\r
@@ -864,8 +864,8 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
         return v;\r
     }\r
 \r
-    protected JLabel getJLabel3() {\r
-        return jLabel3;\r
+    protected JLabel getJLabelGuidType() {\r
+        return jLabelGuidType;\r
     }\r
 }\r
 \r
index 5399dce..83679ea 100644 (file)
@@ -124,7 +124,7 @@ public class SpdHeader extends IInternalFrame {
 \r
     private JLabel jLabel = null;\r
 \r
-    private JTextField jTextField = null;\r
+    private JTextField jTextFieldUrl = null;\r
 \r
     /**\r
      This method initializes jTextFieldBaseName \r
@@ -430,26 +430,26 @@ public class SpdHeader extends IInternalFrame {
      *         \r
      * @return javax.swing.JTextField  \r
      */\r
-    private JTextField getJTextField() {\r
-        if (jTextField == null) {\r
-            jTextField = new JTextField();\r
-            jTextField.setBounds(new java.awt.Rectangle(161,195,320,20));\r
-            jTextField.setPreferredSize(new java.awt.Dimension(320, 20));\r
-            jTextField.addFocusListener(new FocusAdapter(){\r
+    private JTextField getJTextFieldUrl() {\r
+        if (jTextFieldUrl == null) {\r
+            jTextFieldUrl = new JTextField();\r
+            jTextFieldUrl.setBounds(new java.awt.Rectangle(161,195,320,20));\r
+            jTextFieldUrl.setPreferredSize(new java.awt.Dimension(320, 20));\r
+            jTextFieldUrl.addFocusListener(new FocusAdapter(){\r
                public void focusLost(FocusEvent e){\r
-                   if (jTextField.getText().length() == 0 && sfc.getSpdHdrUrl() == null) {\r
+                   if (jTextFieldUrl.getText().length() == 0 && sfc.getSpdHdrUrl() == null) {\r
                        return;\r
                    }\r
-                   if (jTextField.getText().equals(sfc.getSpdHdrUrl())) {\r
+                   if (jTextFieldUrl.getText().equals(sfc.getSpdHdrUrl())) {\r
                        return;\r
                    }\r
                    sfc.setSpdHdrLicense(jTextAreaLicense.getText());\r
-                   sfc.setSpdHdrUrl(jTextField.getText());\r
+                   sfc.setSpdHdrUrl(jTextFieldUrl.getText());\r
                    docConsole.setSaved(false);\r
                } \r
             });\r
         }\r
-        return jTextField;\r
+        return jTextFieldUrl;\r
     }\r
 \r
     public static void main(String[] args) {\r
@@ -513,7 +513,7 @@ public class SpdHeader extends IInternalFrame {
                 jTextAreaLicense.setText(sfc.getSpdHdrLicense());\r
             }\r
             if (sfc.getSpdHdrUrl() != null) {\r
-                jTextField.setText(sfc.getSpdHdrUrl());\r
+                jTextFieldUrl.setText(sfc.getSpdHdrUrl());\r
             }\r
             if (sfc.getSpdHdrCopyright() != null) {\r
                 jTextFieldCopyright.setText(sfc.getSpdHdrCopyright());\r
@@ -624,7 +624,7 @@ public class SpdHeader extends IInternalFrame {
             jContentPane.add(getJTextFieldCopyright(), null);\r
 \r
             jContentPane.add(jLabel, null);\r
-            jContentPane.add(getJTextField(), null);\r
+            jContentPane.add(getJTextFieldUrl(), null);\r
         }\r
         return jContentPane;\r
     }\r
@@ -665,7 +665,7 @@ public class SpdHeader extends IInternalFrame {
                resizeComponentWidth(this.jTextFieldBaseName, intCurrentWidth,intPreferredWidth);\r
                resizeComponentWidth(this.jTextFieldGuid, intCurrentWidth,intPreferredWidth);\r
                resizeComponentWidth(this.jTextFieldVersion, intCurrentWidth,intPreferredWidth);\r
-        resizeComponentWidth(this.jTextField, intCurrentWidth,intPreferredWidth);\r
+        resizeComponentWidth(this.jTextFieldUrl, intCurrentWidth,intPreferredWidth);\r
                resizeComponentWidth(this.jScrollPaneLicense, intCurrentWidth,intPreferredWidth);\r
                resizeComponentWidth(this.jTextFieldCopyright, intCurrentWidth,intPreferredWidth);\r
                resizeComponentWidth(this.jScrollPaneDescription, intCurrentWidth,intPreferredWidth);\r
index 33c7889..5c3260d 100644 (file)
@@ -77,7 +77,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
 \r
     private JPanel jContentPane = null;\r
 \r
-    private JTextField jTextFieldAdd = null;\r
+    private JTextField jTextFieldClass = null;\r
 \r
     private JComboBox jComboBoxSelect = null;\r
 \r
@@ -133,7 +133,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
     \r
     private ICheckBoxList iCheckBoxListModules = null;\r
 \r
-    private ICheckBoxList iCheckBoxList = null;\r
+    private ICheckBoxList iCheckBoxListArch = null;\r
 \r
     private JComboBox jComboBox = null;\r
 \r
@@ -163,14 +163,14 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
        \r
       @return javax.swing.JTextField   \r
      **/\r
-    private JTextField getJTextFieldAdd() {\r
-        if (jTextFieldAdd == null) {\r
-            jTextFieldAdd = new JTextField();\r
-            jTextFieldAdd.setBounds(new java.awt.Rectangle(122,6,390,20));\r
-            jTextFieldAdd.setPreferredSize(new java.awt.Dimension(260,20));\r
-            jTextFieldAdd.setEnabled(true);\r
+    private JTextField getJTextFieldClass() {\r
+        if (jTextFieldClass == null) {\r
+            jTextFieldClass = new JTextField();\r
+            jTextFieldClass.setBounds(new java.awt.Rectangle(122,6,390,20));\r
+            jTextFieldClass.setPreferredSize(new java.awt.Dimension(260,20));\r
+            jTextFieldClass.setEnabled(true);\r
         }\r
-        return jTextFieldAdd;\r
+        return jTextFieldClass;\r
     }\r
 \r
     /**\r
@@ -512,7 +512,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             jContentPane.add(jLabelHdr, null);\r
             jContentPane.add(jStarLabel1, null);\r
             jContentPane.add(jStarLabel2, null);\r
-            jContentPane.add(getJTextFieldAdd(), null);\r
+            jContentPane.add(getJTextFieldClass(), null);\r
             jContentPane.add(getJComboBoxSelect(), null);\r
             jContentPane.add(getJScrollPane(), null);\r
             jContentPane.add(getJButtonAdd(), null);\r
@@ -597,12 +597,12 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             //ToDo: check before add\r
             // LAH WAS String[] row = {null, null, null, jComboBox.getSelectedItem()+"", jTextField2RecInstVer.getText(), null, null};\r
             String[] row = {null, null, null, null, null, null, null};\r
-            row[cnClassName] = jTextFieldAdd.getText();\r
+            row[cnClassName] = jTextFieldClass.getText();\r
             row[cnHdrFile] = jTextFieldHdr.getText().replace('\\', '/');\r
             row[cnHelpText] = jTextFieldHelp.getText();\r
             row[cnRecInstName] = jComboBox.getSelectedItem()+"";\r
             row[cnRecInstVer] = jTextField2RecInstVer.getText();\r
-            row[cnSupArch] = vectorToString(iCheckBoxList.getAllCheckedItemsString());\r
+            row[cnSupArch] = vectorToString(iCheckBoxListArch.getAllCheckedItemsString());\r
             if (row[cnSupArch].length() == 0) {\r
                 row[cnSupArch] = null;\r
             }\r
@@ -755,7 +755,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
     public void componentResized(ComponentEvent arg0) {\r
         int intPreferredWidth = 500;\r
         \r
-        resizeComponentWidth(this.jTextFieldAdd, this.getWidth(), intPreferredWidth);\r
+        resizeComponentWidth(this.jTextFieldClass, this.getWidth(), intPreferredWidth);\r
         resizeComponentWidth(this.jTextFieldHelp, this.getWidth(), intPreferredWidth);\r
         resizeComponentWidth(this.jScrollPane, this.getWidth(), intPreferredWidth-10);\r
         \r
@@ -849,7 +849,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             jScrollPane1Arch = new JScrollPane();\r
             jScrollPane1Arch.setBounds(new java.awt.Rectangle(218,170,293,73));\r
             jScrollPane1Arch.setPreferredSize(new java.awt.Dimension(320, 80));\r
-            jScrollPane1Arch.setViewportView(getICheckBoxList());\r
+            jScrollPane1Arch.setViewportView(getICheckBoxListArch());\r
         }\r
         return jScrollPane1Arch;\r
     }\r
@@ -858,10 +858,10 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
      *         \r
      * @return org.tianocore.frameworkwizard.common.ui.iCheckBoxList.ICheckBoxList     \r
      */\r
-    private ICheckBoxList getICheckBoxList() {\r
-        if (iCheckBoxList == null) {\r
-            iCheckBoxList = new ICheckBoxList();\r
-            iCheckBoxList.setBounds(new java.awt.Rectangle(218,171,292,66));\r
+    private ICheckBoxList getICheckBoxListArch() {\r
+        if (iCheckBoxListArch == null) {\r
+            iCheckBoxListArch = new ICheckBoxList();\r
+            iCheckBoxListArch.setBounds(new java.awt.Rectangle(218,171,292,66));\r
             Vector<String> v = new Vector<String>();\r
             v.add("IA32");\r
             v.add("X64");\r
@@ -869,9 +869,9 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             v.add("EBC");\r
             v.add("ARM");\r
             v.add("PPC");\r
-            iCheckBoxList.setAllItems(v);\r
+            iCheckBoxListArch.setAllItems(v);\r
         }\r
-        return iCheckBoxList;\r
+        return iCheckBoxListArch;\r
     }\r
 \r
     /**\r
@@ -887,11 +887,11 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             jComboBox.setLocation(new java.awt.Point(218,111));\r
             jComboBox.addFocusListener(new java.awt.event.FocusAdapter() {\r
                 public void focusGained(java.awt.event.FocusEvent e) {\r
-                    if (jTextFieldAdd.getText().length() == 0) {\r
+                    if (jTextFieldClass.getText().length() == 0) {\r
                         return;\r
                     }\r
                     jComboBox.removeAllItems();\r
-                    getLibInstances(jTextFieldAdd.getText());\r
+                    getLibInstances(jTextFieldClass.getText());\r
                     Set<String> libNames = libNameGuidMap.keySet();\r
                     Iterator<String> si = libNames.iterator();\r
                     while(si.hasNext()) {\r
index a746583..9e25465 100644 (file)
@@ -64,7 +64,7 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{
 \r
     private JPanel jContentPane = null;\r
 \r
-    private JScrollPane jScrollPane1 = null;\r
+    private JScrollPane jScrollPaneMsa = null;\r
 \r
     private JButton jButtonAdd = null;\r
 \r
@@ -105,13 +105,13 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{
        \r
       @return javax.swing.JScrollPane  \r
      **/\r
-    private JScrollPane getJScrollPane1() {\r
-        if (jScrollPane1 == null) {\r
-            jScrollPane1 = new JScrollPane();\r
-            jScrollPane1.setBounds(new java.awt.Rectangle(13,177,461,421));\r
-            jScrollPane1.setViewportView(getJTable());\r
+    private JScrollPane getJScrollPaneMsa() {\r
+        if (jScrollPaneMsa == null) {\r
+            jScrollPaneMsa = new JScrollPane();\r
+            jScrollPaneMsa.setBounds(new java.awt.Rectangle(13,177,461,421));\r
+            jScrollPaneMsa.setViewportView(getJTable());\r
         }\r
-        return jScrollPane1;\r
+        return jScrollPaneMsa;\r
     }\r
 \r
     /**\r
@@ -308,7 +308,7 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{
             jContentPane.setLayout(null);\r
             jContentPane.add(jLabel, null);\r
             jContentPane.add(jStarLabel2, null);\r
-            jContentPane.add(getJScrollPane1(), null);\r
+            jContentPane.add(getJScrollPaneMsa(), null);\r
             jContentPane.add(getJButtonAdd(), null);\r
             jContentPane.add(getJButtonRemove(), null);\r
             jContentPane.add(getJButtonClearAll(), null);\r
@@ -485,7 +485,7 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{
     public void componentResized(ComponentEvent arg0) {\r
         int intPreferredWidth = 500;\r
         \r
-        resizeComponentWidth(this.jScrollPane1, this.getWidth(), intPreferredWidth);\r
+        resizeComponentWidth(this.jScrollPaneMsa, this.getWidth(), intPreferredWidth);\r
         resizeComponentWidth(this.jTextField, this.getWidth(), intPreferredWidth);\r
         relocateComponentX(this.jButtonBrowse, this.getWidth(), this.getPreferredSize().width, 25);\r
     }\r
index 56d00ae..3931381 100644 (file)
@@ -31,9 +31,9 @@ public class SpdPackageDefinitions extends IInternalFrame {
      */\r
     private static final long serialVersionUID = 1L;\r
     private JPanel jContentPane = null;\r
-    private JLabel jLabel = null;\r
+    private JLabel jLabelRdOnly = null;\r
     private JComboBox jComboBoxReadOnly = null;\r
-    private JLabel jLabel1 = null;\r
+    private JLabel jLabelRePkg = null;\r
     private JComboBox jComboBoxRePackage = null;\r
     private StarLabel starLabel = null;\r
     private StarLabel starLabel1 = null;\r
@@ -91,21 +91,21 @@ public class SpdPackageDefinitions extends IInternalFrame {
             starLabel1.setVisible(true);\r
             starLabel = new StarLabel();\r
             starLabel.setBounds(new java.awt.Rectangle(4,22,10,20));\r
-            jLabel1 = new JLabel();\r
-            jLabel1.setPreferredSize(new java.awt.Dimension(65,20));\r
-            jLabel1.setLocation(new java.awt.Point(22,62));\r
-            jLabel1.setSize(new java.awt.Dimension(65,20));\r
-            jLabel1.setText("RePackage");\r
-            jLabel = new JLabel();\r
-            jLabel.setPreferredSize(new java.awt.Dimension(57,20));\r
-            jLabel.setLocation(new java.awt.Point(22,22));\r
-            jLabel.setSize(new java.awt.Dimension(57,20));\r
-            jLabel.setText("Read Only");\r
+            jLabelRePkg = new JLabel();\r
+            jLabelRePkg.setPreferredSize(new java.awt.Dimension(65,20));\r
+            jLabelRePkg.setLocation(new java.awt.Point(22,62));\r
+            jLabelRePkg.setSize(new java.awt.Dimension(65,20));\r
+            jLabelRePkg.setText("RePackage");\r
+            jLabelRdOnly = new JLabel();\r
+            jLabelRdOnly.setPreferredSize(new java.awt.Dimension(57,20));\r
+            jLabelRdOnly.setLocation(new java.awt.Point(22,22));\r
+            jLabelRdOnly.setSize(new java.awt.Dimension(57,20));\r
+            jLabelRdOnly.setText("Read Only");\r
             jContentPane = new JPanel();\r
             jContentPane.setLayout(null);\r
-            jContentPane.add(jLabel, null);\r
+            jContentPane.add(jLabelRdOnly, null);\r
             jContentPane.add(getJComboBox(), null);\r
-            jContentPane.add(jLabel1, null);\r
+            jContentPane.add(jLabelRePkg, null);\r
             jContentPane.add(getJComboBox1(), null);\r
             jContentPane.add(starLabel, null);\r
             jContentPane.add(starLabel1, null);\r
index e490e28..8b14758 100644 (file)
@@ -94,7 +94,7 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe
 \r
     private JScrollPane jScrollPane = null;\r
 \r
-    private JScrollPane jScrollPane1 = null;\r
+    private JScrollPane jScrollPanePkgHdr = null;\r
 \r
     private int selectedRow = -1;\r
 \r
@@ -331,7 +331,7 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe
             \r
             jContentPane.add(getJTextField(), null);\r
             jContentPane.add(getJButtonBrowse(), null);\r
-            jContentPane.add(getJScrollPane1(), null);\r
+            jContentPane.add(getJScrollPanePkgHdr(), null);\r
         }\r
         return jContentPane;\r
     }\r
@@ -502,13 +502,13 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe
      *         \r
      * @return javax.swing.JScrollPane \r
      */\r
-    private JScrollPane getJScrollPane1() {\r
-        if (jScrollPane1 == null) {\r
-            jScrollPane1 = new JScrollPane();\r
-            jScrollPane1.setBounds(new java.awt.Rectangle(13,149,453,258));\r
-            jScrollPane1.setViewportView(getJTable());\r
+    private JScrollPane getJScrollPanePkgHdr() {\r
+        if (jScrollPanePkgHdr == null) {\r
+            jScrollPanePkgHdr = new JScrollPane();\r
+            jScrollPanePkgHdr.setBounds(new java.awt.Rectangle(13,149,453,258));\r
+            jScrollPanePkgHdr.setViewportView(getJTable());\r
         }\r
-        return jScrollPane1;\r
+        return jScrollPanePkgHdr;\r
     }\r
 \r
     /**\r
index 4b9924c..c3a71e8 100644 (file)
@@ -105,7 +105,7 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
 \r
     private JLabel jLabelVarVal = null;\r
 \r
-    private JTextField jTextField = null;\r
+    private JTextField jTextFieldHelp = null;\r
 \r
     private JLabel jLabelDefVal = null;\r
 \r
@@ -129,27 +129,27 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
 \r
     private StarLabel starLabel = null;\r
 \r
-    private JCheckBox jCheckBox = null;\r
+    private JCheckBox jCheckBoxFeatureFlag = null;\r
 \r
-    private JCheckBox jCheckBox1 = null;\r
+    private JCheckBox jCheckBoxFixedAtBuild = null;\r
 \r
-    private JCheckBox jCheckBox2 = null;\r
+    private JCheckBox jCheckBoxPatchInMod = null;\r
 \r
-    private JCheckBox jCheckBox3 = null;\r
+    private JCheckBox jCheckBoxDyn = null;\r
 \r
-    private JCheckBox jCheckBox4 = null;\r
+    private JCheckBox jCheckBoxDynEx = null;\r
 \r
-    private JScrollPane jScrollPane1 = null;\r
+    private JScrollPane jScrollPaneArch = null;\r
 \r
-    private ICheckBoxList iCheckBoxList = null;\r
+    private ICheckBoxList iCheckBoxListArch = null;\r
 \r
-    private JScrollPane jScrollPane2 = null;\r
+    private JScrollPane jScrollPaneMod = null;\r
 \r
-    private ICheckBoxList iCheckBoxList1 = null;\r
+    private ICheckBoxList iCheckBoxListMod = null;\r
 \r
-    private JLabel jLabel = null;\r
+    private JLabel jLabelSupMod = null;\r
 \r
-    private JLabel jLabel1 = null;\r
+    private JLabel jLabelSupArch = null;\r
 \r
     /**\r
      This method initializes this\r
@@ -338,14 +338,14 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
     private JPanel getJContentPane1() {\r
                if (jContentPane == null) {     \r
            \r
-            jLabel1 = new JLabel();\r
-            jLabel1.setBounds(new java.awt.Rectangle(241,192,89,16));\r
-            jLabel1.setText("Supported Arch");\r
-            jLabel1.setEnabled(true);\r
-            jLabel = new JLabel();\r
-            jLabel.setBounds(new java.awt.Rectangle(15,193,103,16));\r
-            jLabel.setText("Supported Module");\r
-            jLabel.setEnabled(true);\r
+            jLabelSupArch = new JLabel();\r
+            jLabelSupArch.setBounds(new java.awt.Rectangle(241,192,89,16));\r
+            jLabelSupArch.setText("Supported Arch");\r
+            jLabelSupArch.setEnabled(true);\r
+            jLabelSupMod = new JLabel();\r
+            jLabelSupMod.setBounds(new java.awt.Rectangle(15,193,103,16));\r
+            jLabelSupMod.setText("Supported Module");\r
+            jLabelSupMod.setEnabled(true);\r
             starLabel = new StarLabel();\r
             starLabel.setBounds(new java.awt.Rectangle(2,134,10,20));\r
             jLabelDefVal = new JLabel();\r
@@ -404,7 +404,7 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
             jContentPane.add(jStarLabel, null);\r
             jContentPane.add(jStarLabel1, null);\r
             jContentPane.add(jStarLabel4, null);\r
-            jContentPane.add(getJTextField(), null);\r
+            jContentPane.add(getJTextFieldHelp(), null);\r
             jContentPane.add(jLabelDefVal, null);\r
             jContentPane.add(getJTextFieldDefaultValue(), null);\r
             jContentPane.add(getJButtonAdd(), null);\r
@@ -412,15 +412,15 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
             jContentPane.add(getJButtonClearAll(), null);\r
             jContentPane.add(getJScrollPane(), null);\r
             jContentPane.add(starLabel, null);\r
-            jContentPane.add(getJCheckBox(), null);\r
-            jContentPane.add(getJCheckBox1(), null);\r
-            jContentPane.add(getJCheckBox2(), null);\r
-            jContentPane.add(getJCheckBox3(), null);\r
-            jContentPane.add(getJCheckBox4(), null);\r
-            jContentPane.add(getJScrollPane1(), null);\r
-            jContentPane.add(getJScrollPane2(), null);\r
-            jContentPane.add(jLabel, null);\r
-            jContentPane.add(jLabel1, null);\r
+            jContentPane.add(getJCheckBoxFeatureFlag(), null);\r
+            jContentPane.add(getJCheckBoxFixedAtBuild(), null);\r
+            jContentPane.add(getJCheckBoxPatchInMod(), null);\r
+            jContentPane.add(getJCheckBoxDyn(), null);\r
+            jContentPane.add(getJCheckBoxDynEx(), null);\r
+            jContentPane.add(getJScrollPaneArch(), null);\r
+            jContentPane.add(getJScrollPaneMod(), null);\r
+            jContentPane.add(jLabelSupMod, null);\r
+            jContentPane.add(jLabelSupArch, null);\r
         }\r
         return jContentPane;\r
     }\r
@@ -454,30 +454,30 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
 \r
             if (arg0.getSource() == jButtonAdd) {\r
                 //ToDo: check before add\r
-                boolean[] b = {jCheckBox.isSelected(), jCheckBox1.isSelected(), jCheckBox2.isSelected(), jCheckBox3.isSelected(), jCheckBox4.isSelected()};\r
+                boolean[] b = {jCheckBoxFeatureFlag.isSelected(), jCheckBoxFixedAtBuild.isSelected(), jCheckBoxPatchInMod.isSelected(), jCheckBoxDyn.isSelected(), jCheckBoxDynEx.isSelected()};\r
                 if (!checkValidUsage(b)) {\r
                     return;\r
                 }\r
-                String archList = vectorToString(iCheckBoxList.getAllCheckedItemsString());\r
+                String archList = vectorToString(iCheckBoxListArch.getAllCheckedItemsString());\r
                 if (archList.length() == 0) {\r
                     archList = null;\r
                 }\r
-                String modTypeList = vectorToString(iCheckBoxList1.getAllCheckedItemsString());\r
+                String modTypeList = vectorToString(iCheckBoxListMod.getAllCheckedItemsString());\r
                 if (modTypeList.length() == 0) {\r
                     modTypeList = null;\r
                 }\r
                 Object[] row = {jTextFieldC_Name.getText(), jTextFieldToken.getText(),\r
                                 jTextFieldTsGuid.getText(), jComboBoxDataType.getSelectedItem(), \r
-                                jTextFieldDefaultValue.getText(), jTextField.getText(),\r
-                                jCheckBox.isSelected(), jCheckBox1.isSelected(),\r
-                                jCheckBox2.isSelected(), jCheckBox3.isSelected(), jCheckBox4.isSelected(),\r
+                                jTextFieldDefaultValue.getText(), jTextFieldHelp.getText(),\r
+                                jCheckBoxFeatureFlag.isSelected(), jCheckBoxFixedAtBuild.isSelected(),\r
+                                jCheckBoxPatchInMod.isSelected(), jCheckBoxDyn.isSelected(), jCheckBoxDynEx.isSelected(),\r
                                 archList, modTypeList};\r
                 if (!dataValidation(row)) {\r
                     return;\r
                 }\r
                 model.addRow(row);\r
                 jTable.changeSelection(model.getRowCount()-1, 0, false, false);\r
-                String usage = getValidUsage(jCheckBox.isSelected(), jCheckBox1.isSelected(), jCheckBox2.isSelected(), jCheckBox3.isSelected(), jCheckBox4.isSelected());\r
+                String usage = getValidUsage(jCheckBoxFeatureFlag.isSelected(), jCheckBoxFixedAtBuild.isSelected(), jCheckBoxPatchInMod.isSelected(), jCheckBoxDyn.isSelected(), jCheckBoxDynEx.isSelected());\r
                 if (usage.length() == 0) {\r
                     usage = null;\r
                 }\r
@@ -531,13 +531,13 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
      *         \r
      * @return javax.swing.JTextField  \r
      */\r
-    private JTextField getJTextField() {\r
-        if (jTextField == null) {\r
-            jTextField = new JTextField();\r
-            jTextField.setBounds(new java.awt.Rectangle(156,108,317,20));\r
-            jTextField.setPreferredSize(new java.awt.Dimension(315,20));\r
+    private JTextField getJTextFieldHelp() {\r
+        if (jTextFieldHelp == null) {\r
+            jTextFieldHelp = new JTextField();\r
+            jTextFieldHelp.setBounds(new java.awt.Rectangle(156,108,317,20));\r
+            jTextFieldHelp.setPreferredSize(new java.awt.Dimension(315,20));\r
         }\r
-        return jTextField;\r
+        return jTextFieldHelp;\r
     }\r
 \r
     /**\r
@@ -610,7 +610,7 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
         resizeComponentWidth(this.jTextFieldToken, this.getWidth(), intPreferredWidth);\r
         resizeComponentWidth(this.jTextFieldTsGuid, this.getWidth(), intPreferredWidth);\r
         resizeComponentWidth(this.jTextFieldDefaultValue, this.getWidth(), intPreferredWidth);\r
-        resizeComponentWidth(this.jTextField, this.getWidth(), intPreferredWidth);\r
+        resizeComponentWidth(this.jTextFieldHelp, this.getWidth(), intPreferredWidth);\r
         resizeComponentWidth(this.jScrollPane, this.getWidth(), intPreferredWidth);\r
         \r
         resizeComponentWidth(this.jTextFieldDefaultValue, this.getWidth(), intPreferredWidth);\r
@@ -805,14 +805,14 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
      *         \r
      * @return javax.swing.JCheckBox   \r
      */\r
-    private JCheckBox getJCheckBox() {\r
-        if (jCheckBox == null) {\r
-            jCheckBox = new JCheckBox();\r
-            jCheckBox.setBounds(new java.awt.Rectangle(156,161,100,21));\r
-            jCheckBox.setText("Feature Flag");\r
-            jCheckBox.setPreferredSize(new java.awt.Dimension(21,20));\r
+    private JCheckBox getJCheckBoxFeatureFlag() {\r
+        if (jCheckBoxFeatureFlag == null) {\r
+            jCheckBoxFeatureFlag = new JCheckBox();\r
+            jCheckBoxFeatureFlag.setBounds(new java.awt.Rectangle(156,161,100,21));\r
+            jCheckBoxFeatureFlag.setText("Feature Flag");\r
+            jCheckBoxFeatureFlag.setPreferredSize(new java.awt.Dimension(21,20));\r
         }\r
-        return jCheckBox;\r
+        return jCheckBoxFeatureFlag;\r
     }\r
 \r
     /**\r
@@ -820,14 +820,14 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
      *         \r
      * @return javax.swing.JCheckBox   \r
      */\r
-    private JCheckBox getJCheckBox1() {\r
-        if (jCheckBox1 == null) {\r
-            jCheckBox1 = new JCheckBox();\r
-            jCheckBox1.setBounds(new java.awt.Rectangle(312,133,108,20));\r
-            jCheckBox1.setText("Fixed at Build");\r
-            jCheckBox1.setPreferredSize(new java.awt.Dimension(21,20));\r
+    private JCheckBox getJCheckBoxFixedAtBuild() {\r
+        if (jCheckBoxFixedAtBuild == null) {\r
+            jCheckBoxFixedAtBuild = new JCheckBox();\r
+            jCheckBoxFixedAtBuild.setBounds(new java.awt.Rectangle(312,133,108,20));\r
+            jCheckBoxFixedAtBuild.setText("Fixed at Build");\r
+            jCheckBoxFixedAtBuild.setPreferredSize(new java.awt.Dimension(21,20));\r
         }\r
-        return jCheckBox1;\r
+        return jCheckBoxFixedAtBuild;\r
     }\r
 \r
     /**\r
@@ -835,14 +835,14 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
      *         \r
      * @return javax.swing.JCheckBox   \r
      */\r
-    private JCheckBox getJCheckBox2() {\r
-        if (jCheckBox2 == null) {\r
-            jCheckBox2 = new JCheckBox();\r
-            jCheckBox2.setBounds(new java.awt.Rectangle(156,133,154,20));\r
-            jCheckBox2.setText("Patchable in Module");\r
-            jCheckBox2.setPreferredSize(new java.awt.Dimension(21,20));\r
+    private JCheckBox getJCheckBoxPatchInMod() {\r
+        if (jCheckBoxPatchInMod == null) {\r
+            jCheckBoxPatchInMod = new JCheckBox();\r
+            jCheckBoxPatchInMod.setBounds(new java.awt.Rectangle(156,133,154,20));\r
+            jCheckBoxPatchInMod.setText("Patchable in Module");\r
+            jCheckBoxPatchInMod.setPreferredSize(new java.awt.Dimension(21,20));\r
         }\r
-        return jCheckBox2;\r
+        return jCheckBoxPatchInMod;\r
     }\r
 \r
     /**\r
@@ -850,14 +850,14 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
      *         \r
      * @return javax.swing.JCheckBox   \r
      */\r
-    private JCheckBox getJCheckBox3() {\r
-        if (jCheckBox3 == null) {\r
-            jCheckBox3 = new JCheckBox();\r
-            jCheckBox3.setBounds(new java.awt.Rectangle(278,161,80,20));\r
-            jCheckBox3.setText("Dynamic");\r
-            jCheckBox3.setPreferredSize(new java.awt.Dimension(21,20));\r
+    private JCheckBox getJCheckBoxDyn() {\r
+        if (jCheckBoxDyn == null) {\r
+            jCheckBoxDyn = new JCheckBox();\r
+            jCheckBoxDyn.setBounds(new java.awt.Rectangle(278,161,80,20));\r
+            jCheckBoxDyn.setText("Dynamic");\r
+            jCheckBoxDyn.setPreferredSize(new java.awt.Dimension(21,20));\r
         }\r
-        return jCheckBox3;\r
+        return jCheckBoxDyn;\r
     }\r
 \r
     /**\r
@@ -865,14 +865,14 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
      *         \r
      * @return javax.swing.JCheckBox   \r
      */\r
-    private JCheckBox getJCheckBox4() {\r
-        if (jCheckBox4 == null) {\r
-            jCheckBox4 = new JCheckBox();\r
-            jCheckBox4.setBounds(new java.awt.Rectangle(371,161,99,20));\r
-            jCheckBox4.setText("DynamicEx");\r
-            jCheckBox4.setPreferredSize(new java.awt.Dimension(21,20));\r
+    private JCheckBox getJCheckBoxDynEx() {\r
+        if (jCheckBoxDynEx == null) {\r
+            jCheckBoxDynEx = new JCheckBox();\r
+            jCheckBoxDynEx.setBounds(new java.awt.Rectangle(371,161,99,20));\r
+            jCheckBoxDynEx.setText("DynamicEx");\r
+            jCheckBoxDynEx.setPreferredSize(new java.awt.Dimension(21,20));\r
         }\r
-        return jCheckBox4;\r
+        return jCheckBoxDynEx;\r
     }\r
     \r
     private String getValidUsage(boolean ff, boolean fab, boolean pim, boolean d, boolean de) {\r
@@ -930,14 +930,14 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
      *         \r
      * @return javax.swing.JScrollPane \r
      */\r
-    private JScrollPane getJScrollPane1() {\r
-        if (jScrollPane1 == null) {\r
-            jScrollPane1 = new JScrollPane();\r
-            jScrollPane1.setBounds(new java.awt.Rectangle(242,213,188,54));\r
-            jScrollPane1.setViewportView(getICheckBoxList());\r
-            jScrollPane1.setPreferredSize(new Dimension(188, 74));\r
+    private JScrollPane getJScrollPaneArch() {\r
+        if (jScrollPaneArch == null) {\r
+            jScrollPaneArch = new JScrollPane();\r
+            jScrollPaneArch.setBounds(new java.awt.Rectangle(242,213,188,54));\r
+            jScrollPaneArch.setViewportView(getICheckBoxListArch());\r
+            jScrollPaneArch.setPreferredSize(new Dimension(188, 74));\r
         }\r
-        return jScrollPane1;\r
+        return jScrollPaneArch;\r
     }\r
 \r
     /**\r
@@ -945,10 +945,10 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
      *         \r
      * @return org.tianocore.frameworkwizard.common.ui.iCheckBoxList.ICheckBoxList     \r
      */\r
-    private ICheckBoxList getICheckBoxList() {\r
-        if (iCheckBoxList == null) {\r
-            iCheckBoxList = new ICheckBoxList();\r
-            iCheckBoxList.setBounds(new Rectangle(197, 142, 188, 74));\r
+    private ICheckBoxList getICheckBoxListArch() {\r
+        if (iCheckBoxListArch == null) {\r
+            iCheckBoxListArch = new ICheckBoxList();\r
+            iCheckBoxListArch.setBounds(new Rectangle(197, 142, 188, 74));\r
             Vector<String> v = new Vector<String>();\r
             v.add("IA32");\r
             v.add("X64");\r
@@ -956,9 +956,9 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
             v.add("EBC");\r
             v.add("ARM");\r
             v.add("PPC");\r
-            iCheckBoxList.setAllItems(v);\r
+            iCheckBoxListArch.setAllItems(v);\r
         }\r
-        return iCheckBoxList;\r
+        return iCheckBoxListArch;\r
     }\r
 \r
     /**\r
@@ -966,14 +966,14 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
      *         \r
      * @return javax.swing.JScrollPane \r
      */\r
-    private JScrollPane getJScrollPane2() {\r
-        if (jScrollPane2 == null) {\r
-            jScrollPane2 = new JScrollPane();\r
-            jScrollPane2.setBounds(new java.awt.Rectangle(15,213,199,55));\r
-            jScrollPane2.setViewportView(getICheckBoxList1());\r
-            jScrollPane2.setPreferredSize(new Dimension(170, 74));\r
+    private JScrollPane getJScrollPaneMod() {\r
+        if (jScrollPaneMod == null) {\r
+            jScrollPaneMod = new JScrollPane();\r
+            jScrollPaneMod.setBounds(new java.awt.Rectangle(15,213,199,55));\r
+            jScrollPaneMod.setViewportView(getICheckBoxListMod());\r
+            jScrollPaneMod.setPreferredSize(new Dimension(170, 74));\r
         }\r
-        return jScrollPane2;\r
+        return jScrollPaneMod;\r
     }\r
 \r
     /**\r
@@ -981,10 +981,10 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
      *         \r
      * @return org.tianocore.frameworkwizard.common.ui.iCheckBoxList.ICheckBoxList     \r
      */\r
-    private ICheckBoxList getICheckBoxList1() {\r
-        if (iCheckBoxList1 == null) {\r
-            iCheckBoxList1 = new ICheckBoxList();\r
-            iCheckBoxList1.setBounds(new Rectangle(14, 142, 170, 74));\r
+    private ICheckBoxList getICheckBoxListMod() {\r
+        if (iCheckBoxListMod == null) {\r
+            iCheckBoxListMod = new ICheckBoxList();\r
+            iCheckBoxListMod.setBounds(new Rectangle(14, 142, 170, 74));\r
             Vector<String> v = new Vector<String>();\r
             v.add("BASE");\r
             v.add("SEC");\r
@@ -998,9 +998,9 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
             v.add("UEFI_DRIVER");\r
             v.add("UEFI_APPLICATION");\r
             v.add("USER_DEFINED");\r
-            iCheckBoxList1.setAllItems(v);\r
+            iCheckBoxListMod.setAllItems(v);\r
         }\r
-        return iCheckBoxList1;\r
+        return iCheckBoxListMod;\r
     }\r
     \r
     protected String vectorToString(Vector<String> v) {\r
index f273d8d..5e24dcd 100644 (file)
@@ -62,23 +62,22 @@ public class FpdBuildOptions extends IInternalFrame {
     private static final long serialVersionUID = 1L;\r
     static JFrame frame;\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
+    private JPanel jPanelContentSouth = null;\r
+    private JPanel jPanelContentNorth = null;\r
+    private JPanel jPanelContentWest = null;\r
+    private JPanel jPanelContentEast = null;\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 JPanel jPanelUserDef = null;\r
+    private JPanel jPanelUserDefNorth = null;\r
+    private JPanel jPanelUserDefCenter = null;\r
+    private JTextField jTextFieldAntTaskFile = null;\r
+    private JLabel jLabelAntTaskId = null;\r
+    private JTextField jTextFieldAntTaskId = null;\r
+    private JButton jButtonAntTaskAdd = null;\r
+    private JButton jButtonAntTaskDel = null;\r
+    private JTextField jTextFieldAntCmdOpts = null;\r
+    private JScrollPane jScrollPaneAntTasks = null;\r
+    private JTable jTableAntTasks = null;\r
     private DefaultTableModel ffsTableModel = null;\r
     private DefaultTableModel sectionsTableModel = null;\r
     private DefaultTableModel sectionTableModel = null;\r
@@ -86,80 +85,79 @@ public class FpdBuildOptions extends IInternalFrame {
     private DefaultTableModel antTaskTableModel = null;\r
     private DefaultTableModel ffsAttributesTableModel = null;\r
     private DefaultTableModel optionsTableModel = null;\r
-    private JPanel jPanel13 = null;\r
-    private JPanel jPanel18 = 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 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 JButton jButton17 = null;\r
-    private JButton jButton18 = null;\r
+    private JPanel jPanelFfsTab = null;\r
+    private JPanel jPanelFfsTabCenter = null;\r
+    private JPanel jPanelFfsTabCenterN = null;\r
+    private JPanel jPanelFfsTabCenterS = null;\r
+    private JPanel jPanelFfsTabCenterE = null;\r
+    private JLabel jLabelFfsKey = null;\r
+    private JTextField jTextFieldFfsKey = null;\r
+    private JButton jButtonFfsAdd = null;\r
+    private JButton jButtonFfsDel = null;\r
+    private JScrollPane jScrollPaneFfsAttribs = null;\r
+    private JTable jTableFfsAttribs = null;\r
+    private JPanel jPanelFfsTabCenterC = null;\r
+    private JPanel jPanelOptionsTab = null;\r
+    private JLabel jLabelOptionContents = null;\r
+    private JTextField jTextFieldOptionContents = null;\r
+    private JLabel jLabelToolChainFamily = null;\r
+    private JLabel jLabelSupArch = null;\r
+    private JLabel jLabelToolCmd = null;\r
+    private JTextField jTextFieldToolCmd = null;\r
+    private JScrollPane jScrollPaneOptions = null;\r
+    private JTable jTableOptions = null;\r
+    private JButton jButtonOptionsAdd = null;\r
+    private JButton jButtonOptionsDel = null;\r
+    private JButton jButtonFfsAttribNew = null;\r
+    private JButton jButtonFfsAttribRemove = null;\r
     private FpdFileContents ffc = null;\r
     private OpeningPlatformType docConsole = 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
+    private JCheckBox jCheckBoxIA32 = null;\r
+    private JCheckBox jCheckBoxIpf = null;\r
+    private JCheckBox jCheckBoxX64 = null;\r
+    private JCheckBox jCheckBoxEBC = null;\r
+    private JCheckBox jCheckBoxARM = null;\r
+    private JCheckBox jCheckBoxPPC = null;\r
+    private JLabel jLabelBuildTargets = null;\r
+    private JTextField jTextFieldBuildTargets = null;\r
+    private JTextField jTextFieldTagName = null;\r
+    private JLabel jLabelTagName = null;\r
     private int selectedRow = -1;\r
-    private JLabel jLabel = null;\r
-    private JLabel jLabel1 = null;\r
-    private JScrollPane jScrollPane = null;\r
-    private JTable jTable = null;\r
-    private JLabel jLabel2 = null;\r
-    private JScrollPane jScrollPane1 = null;\r
-    private JTable jTable1 = null;\r
-    private JLabel jLabel4 = null;\r
-    private JScrollPane jScrollPane3 = null;\r
-    private JTable jTable3 = null;\r
-    private JLabel jLabel5 = null;\r
-    private JTextField jTextField = null;\r
-    private JPanel jPanel4 = null;\r
-    private JLabel jLabel6 = null;\r
-    private JButton jButton = null;\r
-    private JButton jButton1 = null;\r
-    private JButton jButton2 = null;\r
-    private JButton jButton3 = null;\r
-    private JLabel jLabel8 = null;\r
-    private JButton jButton6 = null;\r
-    private JButton jButton7 = null;\r
-    private JScrollPane jScrollPane4 = null;\r
-    private JTable jTable6 = null;\r
-    private JButton jButton12 = null;\r
-    private JTextField jTextField1 = null;\r
+    private JLabel jLabelAntTaskFile = null;\r
+    private JLabel jLabelAntCmdOpts = null;\r
+    private JScrollPane jScrollPaneFfs = null;\r
+    private JTable jTableFfs = null;\r
+    private JLabel jLabelFfsSection = null;\r
+    private JScrollPane jScrollPaneFfsSection = null;\r
+    private JTable jTableFfsSection = null;\r
+    private JLabel jLabelFfsSubSections = null;\r
+    private JScrollPane jScrollPaneFfsSubSection = null;\r
+    private JTable jTableFfsSubSection = null;\r
+    private JLabel jLabelEncapType = null;\r
+    private JTextField jTextFieldEncapType = null;\r
+    private JPanel jPanelFfsAttribButtonGroup = null;\r
+    private JLabel jLabelFfsAttribs = null;\r
+    private JButton jButtonFfsSectionNew = null;\r
+    private JButton jButtonFfsSectionRemove = null;\r
+    private JButton jButtonFfsSubSectionNew = null;\r
+    private JButton jButtonFfsSubSectionRemove = null;\r
+    private JLabel jLabelFfsSections = null;\r
+    private JButton jButtonFfsSectionsNew = null;\r
+    private JButton jButtonFfsSectionsRemove = null;\r
+    private JScrollPane jScrollPaneFfsSections = null;\r
+    private JTable jTableFfsSections = null;\r
+    private JButton jButtonAntTaskFileBrowse = null;\r
+    private JTextField jTextFieldToolChainFamily = null;\r
     /**\r
      * This method initializes jPanel  \r
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel() {\r
-        if (jPanel == null) {\r
-            jPanel = new JPanel();\r
+    private JPanel getJPanelContentSouth() {\r
+        if (jPanelContentSouth == null) {\r
+            jPanelContentSouth = new JPanel();\r
         }\r
-        return jPanel;\r
+        return jPanelContentSouth;\r
     }\r
 \r
     /**\r
@@ -167,11 +165,11 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel1() {\r
-        if (jPanel1 == null) {\r
-            jPanel1 = new JPanel();\r
+    private JPanel getJPanelContentNorth() {\r
+        if (jPanelContentNorth == null) {\r
+            jPanelContentNorth = new JPanel();\r
         }\r
-        return jPanel1;\r
+        return jPanelContentNorth;\r
     }\r
 \r
     /**\r
@@ -179,11 +177,11 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel2() {\r
-        if (jPanel2 == null) {\r
-            jPanel2 = new JPanel();\r
+    private JPanel getJPanelContentWest() {\r
+        if (jPanelContentWest == null) {\r
+            jPanelContentWest = new JPanel();\r
         }\r
-        return jPanel2;\r
+        return jPanelContentWest;\r
     }\r
 \r
     /**\r
@@ -191,11 +189,11 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel3() {\r
-        if (jPanel3 == null) {\r
-            jPanel3 = new JPanel();\r
+    private JPanel getJPanelContentEast() {\r
+        if (jPanelContentEast == null) {\r
+            jPanelContentEast = new JPanel();\r
         }\r
-        return jPanel3;\r
+        return jPanelContentEast;\r
     }\r
 \r
     /**\r
@@ -206,9 +204,9 @@ 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("FFS", null, getJPanelFfsTab(), null);\r
+            jTabbedPane.addTab("Options", null, getJPanelOptionsTab(), null);\r
+            jTabbedPane.addTab("User Defined ANT Tasks", null, getJPanelUserDef(), null);\r
         }\r
         return jTabbedPane;\r
     }\r
@@ -219,16 +217,15 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JPanel      \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 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 jPanel8;\r
+        return jPanelUserDef;\r
     }\r
 \r
     /**\r
@@ -236,36 +233,24 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JPanel      \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
+    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.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(getJButton12(), null);\r
-            jPanel9.add(jLabel3, null);\r
-            jPanel9.add(getJTextField3(), null);\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 jPanel9;\r
-    }\r
-\r
-    /**\r
-     * This method initializes jPanel10        \r
-     *         \r
-     * @return javax.swing.JPanel      \r
-     */\r
-    private JPanel getJPanel10() {\r
-        if (jPanel10 == null) {\r
-            jPanel10 = new JPanel();\r
-        }\r
-        return jPanel10;\r
+        return jPanelUserDefNorth;\r
     }\r
 \r
     /**\r
@@ -273,23 +258,23 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \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
+    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
             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
+            jPanelUserDefCenter = new JPanel();\r
+            jPanelUserDefCenter.setLayout(flowLayout3);\r
+            jPanelUserDefCenter.add(jLabelAntCmdOpts, null);\r
+            jPanelUserDefCenter.add(getJTextField4(), null);\r
+            jPanelUserDefCenter.add(getJButtonAntTaskAdd(), null);\r
+            jPanelUserDefCenter.add(getJButtonAntTaskDel(), null);\r
+            jPanelUserDefCenter.add(getJScrollPaneAntTasks(), null);\r
         }\r
-        return jPanel11;\r
+        return jPanelUserDefCenter;\r
     }\r
 \r
     /**\r
@@ -297,12 +282,12 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JTextField  \r
      */\r
-    private JTextField getJTextField2() {\r
-        if (jTextField2 == null) {\r
-            jTextField2 = new JTextField();\r
-            jTextField2.setPreferredSize(new java.awt.Dimension(200,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 jTextField2;\r
+        return jTextFieldAntTaskFile;\r
     }\r
 \r
     /**\r
@@ -310,12 +295,12 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JTextField  \r
      */\r
-    private JTextField getJTextField3() {\r
-        if (jTextField3 == null) {\r
-            jTextField3 = new JTextField();\r
-            jTextField3.setPreferredSize(new java.awt.Dimension(100,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 jTextField3;\r
+        return jTextFieldAntTaskId;\r
     }\r
 \r
     /**\r
@@ -323,27 +308,27 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JButton     \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
+    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(jTextField3.getText()) || jTextField3.getText().length() != 8) {\r
+                    if (!DataValidation.isInt(jTextFieldAntTaskId.getText()) || jTextFieldAntTaskId.getText().length() != 8) {\r
                         JOptionPane.showMessageDialog(frame, "ID must be an 8-digit integer.");\r
                         return;\r
                     }\r
-                    Object[] o = {jTextField3.getText(), null, null};\r
-                        o[1] = jTextField2.getText();\r
-                        o[2] = jTextField4.getText();\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 jButton4;\r
+        return jButtonAntTaskAdd;\r
     }\r
 \r
     /**\r
@@ -351,12 +336,12 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \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
+    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
@@ -366,7 +351,7 @@ public class FpdBuildOptions extends IInternalFrame {
                 }\r
             });\r
         }\r
-        return jButton5;\r
+        return jButtonAntTaskDel;\r
     }\r
 \r
     /**\r
@@ -375,12 +360,12 @@ public class FpdBuildOptions extends IInternalFrame {
      * @return javax.swing.JTextField  \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
+        if (jTextFieldAntCmdOpts == null) {\r
+            jTextFieldAntCmdOpts = new JTextField();\r
+            jTextFieldAntCmdOpts.setPreferredSize(new java.awt.Dimension(270,20));\r
+            jTextFieldAntCmdOpts.setEnabled(true);\r
         }\r
-        return jTextField4;\r
+        return jTextFieldAntCmdOpts;\r
     }\r
 \r
     /**\r
@@ -388,13 +373,13 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \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 getJScrollPaneAntTasks() {\r
+        if (jScrollPaneAntTasks == null) {\r
+            jScrollPaneAntTasks = new JScrollPane();\r
+            jScrollPaneAntTasks.setPreferredSize(new java.awt.Dimension(600,100));\r
+            jScrollPaneAntTasks.setViewportView(getJTableAntTasks());\r
         }\r
-        return jScrollPane2;\r
+        return jScrollPaneAntTasks;\r
     }\r
 \r
     /**\r
@@ -402,17 +387,17 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JTable      \r
      */\r
-    private JTable getJTable2() {\r
-        if (jTable2 == null) {\r
+    private JTable getJTableAntTasks() {\r
+        if (jTableAntTasks == null) {\r
             antTaskTableModel = new DefaultTableModel();\r
-            jTable2 = new JTable(antTaskTableModel);\r
-            jTable2.setRowHeight(20);\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
-            jTable2.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
-            jTable2.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\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
@@ -428,7 +413,7 @@ public class FpdBuildOptions extends IInternalFrame {
                 }\r
             });\r
             \r
-            jTable2.getModel().addTableModelListener(new TableModelListener() {\r
+            jTableAntTasks.getModel().addTableModelListener(new TableModelListener() {\r
                 public void tableChanged(TableModelEvent arg0) {\r
                     // TODO Auto-generated method stub\r
                     int row = arg0.getFirstRow();\r
@@ -456,7 +441,7 @@ public class FpdBuildOptions extends IInternalFrame {
                 }\r
             });\r
         }\r
-        return jTable2;\r
+        return jTableAntTasks;\r
     }\r
 \r
     /**\r
@@ -464,14 +449,14 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \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(getJPanel18(), java.awt.BorderLayout.CENTER);\r
-            jPanel13.add(getJScrollPane(), java.awt.BorderLayout.WEST);\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 jPanel13;\r
+        return jPanelFfsTab;\r
     }\r
 \r
     /**\r
@@ -479,16 +464,16 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JPanel      \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 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(getJPanelFfsTabCenterE(), java.awt.BorderLayout.EAST);\r
+            jPanelFfsTabCenter.add(getJPanelFfsTabCenterC(), java.awt.BorderLayout.CENTER);\r
         }\r
-        return jPanel18;\r
+        return jPanelFfsTabCenter;\r
     }\r
 \r
     /**\r
@@ -496,24 +481,24 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel15() {\r
-        if (jPanel15 == null) {\r
-            jLabel5 = new JLabel();\r
-            jLabel5.setText("Encapsulation Type");\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
-            jLabel7 = new JLabel();\r
-            jLabel7.setText("FFS Key");\r
-            jPanel15 = new JPanel();\r
-            jPanel15.setLayout(flowLayout5);\r
-            jPanel15.add(jLabel7, null);\r
-            jPanel15.add(getJTextField6(), null);\r
-            jPanel15.add(jLabel5, null);\r
-            jPanel15.add(getJTextField(), null);\r
-            jPanel15.add(getJButton8(), null);\r
-            jPanel15.add(getJButton9(), null);\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 jPanel15;\r
+        return jPanelFfsTabCenterN;\r
     }\r
 \r
     /**\r
@@ -521,22 +506,22 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel16() {\r
-        if (jPanel16 == null) {\r
-            jLabel6 = new JLabel();\r
-            jLabel6.setText("Attributes");\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
-            jPanel16 = new JPanel();\r
-            jPanel16.setPreferredSize(new java.awt.Dimension(491,130));\r
-            jPanel16.setLayout(flowLayout6);\r
-            jPanel16.add(jLabel6, null);\r
-            jPanel16.add(getJScrollPane5(), null);\r
-            jPanel16.add(getJPanel4(), null);\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 jPanel16;\r
+        return jPanelFfsTabCenterS;\r
     }\r
 \r
     /**\r
@@ -544,11 +529,11 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel17() {\r
-        if (jPanel17 == null) {\r
-            jPanel17 = new JPanel();\r
+    private JPanel getJPanelFfsTabCenterE() {\r
+        if (jPanelFfsTabCenterE == null) {\r
+            jPanelFfsTabCenterE = new JPanel();\r
         }\r
-        return jPanel17;\r
+        return jPanelFfsTabCenterE;\r
     }\r
 \r
     /**\r
@@ -556,21 +541,21 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JTextField  \r
      */\r
-    private JTextField getJTextField6() {\r
-        if (jTextField6 == null) {\r
-            jTextField6 = new JTextField();\r
-            jTextField6.setPreferredSize(new java.awt.Dimension(100,20));\r
-            jTextField6.setEditable(true);\r
-            jTextField6.addFocusListener(new java.awt.event.FocusAdapter() {\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 (jTable.getSelectedRow() < 0) {\r
+                    if (jTableFfs.getSelectedRow() < 0) {\r
                         return;\r
                     }\r
 //                    ffc.updateBuildOptionsFfsKey(jTable.getSelectedRow(), jTextField6.getText());\r
                 }\r
             });\r
         }\r
-        return jTextField6;\r
+        return jTextFieldFfsKey;\r
     }\r
 \r
     /**\r
@@ -578,28 +563,28 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JButton     \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
+    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 (jTextField6.getText().length() > 0) {\r
-                        String[] row = {jTextField6.getText()};\r
+                    if (jTextFieldFfsKey.getText().length() > 0) {\r
+                        String[] row = {jTextFieldFfsKey.getText()};\r
                         ffsTableModel.addRow(row);\r
                         docConsole.setSaved(false);\r
-                        ffc.genBuildOptionsFfs(jTextField6.getText(), jTextField.getText());\r
+                        ffc.genBuildOptionsFfs(jTextFieldFfsKey.getText(), jTextFieldEncapType.getText());\r
                     }\r
                 }\r
             });\r
         }\r
-        return jButton8;\r
+        return jButtonFfsAdd;\r
     }\r
 \r
     /**\r
@@ -607,27 +592,27 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JButton     \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
+    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 (jTable.getSelectedRow() < 0) {\r
+                    if (jTableFfs.getSelectedRow() < 0) {\r
                         return;\r
                     }\r
                     docConsole.setSaved(false);\r
-                    ffc.removeBuildOptionsFfs(jTable.getSelectedRow());\r
+                    ffc.removeBuildOptionsFfs(jTableFfs.getSelectedRow());\r
                 }\r
             });\r
         }\r
-        return jButton9;\r
+        return jButtonFfsDel;\r
     }\r
 \r
     /**\r
@@ -635,13 +620,13 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JScrollPane \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 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 jScrollPane5;\r
+        return jScrollPaneFfsAttribs;\r
     }\r
 \r
     /**\r
@@ -649,17 +634,17 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JTable      \r
      */\r
-    private JTable getJTable4() {\r
-        if (jTable4 == null) {\r
+    private JTable getJTableFfsAttribs() {\r
+        if (jTableFfsAttribs == null) {\r
             ffsAttributesTableModel = new DefaultTableModel();\r
-            jTable4 = new JTable(ffsAttributesTableModel);\r
-            jTable4.setPreferredSize(new java.awt.Dimension(400,80));\r
-            jTable4.setRowHeight(20);\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
-            jTable4.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
-            jTable4.getModel().addTableModelListener(new TableModelListener() {\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
@@ -676,12 +661,12 @@ public class FpdBuildOptions extends IInternalFrame {
                             return;\r
                         }\r
                         docConsole.setSaved(false);\r
-                        ffc.updateBuildOptionsFfsAttribute(jTable.getSelectedRow(), row, name, value);\r
+                        ffc.updateBuildOptionsFfsAttribute(jTableFfs.getSelectedRow(), row, name, value);\r
                     }\r
                 }\r
             });\r
         }\r
-        return jTable4;\r
+        return jTableFfsAttribs;\r
     }\r
 \r
     /**\r
@@ -689,30 +674,30 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel19() {\r
-        if (jPanel19 == null) {\r
-            jLabel8 = new JLabel();\r
-            jLabel8.setText("Sections");\r
-            jLabel4 = new JLabel();\r
-            jLabel4.setText("Sub-Sections");\r
-            jLabel2 = new JLabel();\r
-            jLabel2.setText("Section");\r
-            jPanel19 = new JPanel();\r
-            jPanel19.setLayout(new FlowLayout());\r
-            jPanel19.add(jLabel2, null);\r
-            jPanel19.add(getJButton(), null);\r
-            jPanel19.add(getJButton1(), null);\r
-            jPanel19.add(getJScrollPane1(), null);\r
-            jPanel19.add(jLabel8, null);\r
-            jPanel19.add(getJButton6(), null);\r
-            jPanel19.add(getJButton7(), null);\r
-            jPanel19.add(getJScrollPane4(), null);\r
-            jPanel19.add(jLabel4, null);\r
-            jPanel19.add(getJButton2(), null);\r
-            jPanel19.add(getJButton3(), null);\r
-            jPanel19.add(getJScrollPane3(), null);\r
-        }\r
-        return jPanel19;\r
+    private JPanel getJPanelFfsTabCenterC() {\r
+        if (jPanelFfsTabCenterC == null) {\r
+            jLabelFfsSections = new JLabel();\r
+            jLabelFfsSections.setText("Sections");\r
+            jLabelFfsSubSections = new JLabel();\r
+            jLabelFfsSubSections.setText("Sub-Sections");\r
+            jLabelFfsSection = new JLabel();\r
+            jLabelFfsSection.setText("Section");\r
+            jPanelFfsTabCenterC = new JPanel();\r
+            jPanelFfsTabCenterC.setLayout(new FlowLayout());\r
+            jPanelFfsTabCenterC.add(jLabelFfsSection, null);\r
+            jPanelFfsTabCenterC.add(getJButtonFfsSectionNew(), null);\r
+            jPanelFfsTabCenterC.add(getJButtonFfsSectionRemove(), null);\r
+            jPanelFfsTabCenterC.add(getJScrollPaneFfsSection(), null);\r
+            jPanelFfsTabCenterC.add(jLabelFfsSections, null);\r
+            jPanelFfsTabCenterC.add(getJButtonFfsSectionsNew(), null);\r
+            jPanelFfsTabCenterC.add(getJButtonFfsSectionsRemove(), null);\r
+            jPanelFfsTabCenterC.add(getJScrollPaneFfsSections(), null);\r
+            jPanelFfsTabCenterC.add(jLabelFfsSubSections, null);\r
+            jPanelFfsTabCenterC.add(getJButtonFfsSubSectionNew(), null);\r
+            jPanelFfsTabCenterC.add(getJButtonFfsSubSectionRemove(), null);\r
+            jPanelFfsTabCenterC.add(getJScrollPaneFfsSubSection(), null);\r
+        }\r
+        return jPanelFfsTabCenterC;\r
     }\r
 \r
     /**\r
@@ -720,47 +705,46 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel20() {\r
-        if (jPanel20 == null) {\r
-            jLabel15 = new JLabel();\r
-            jLabel15.setText("Tag Name");\r
+    private JPanel getJPanelOptionsTab() {\r
+        if (jPanelOptionsTab == null) {\r
+            jLabelTagName = new JLabel();\r
+            jLabelTagName.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(getJTextField1(), 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(getJScrollPane6(), null);\r
-        }\r
-        return jPanel20;\r
+            jLabelBuildTargets = new JLabel();\r
+            jLabelBuildTargets.setText("Build Targets");\r
+            jLabelToolCmd = new JLabel();\r
+            jLabelToolCmd.setText("Tool Command");\r
+            jLabelSupArch = new JLabel();\r
+            jLabelSupArch.setText("Supported Arch");\r
+            jLabelToolChainFamily = new JLabel();\r
+            jLabelToolChainFamily.setText("Tool Chain Family");\r
+            jLabelOptionContents = new JLabel();\r
+            jLabelOptionContents.setText("Option Contents");\r
+            jPanelOptionsTab = new JPanel();\r
+            jPanelOptionsTab.setLayout(flowLayout9);\r
+            jPanelOptionsTab.add(jLabelBuildTargets, null);\r
+            jPanelOptionsTab.add(getJTextFieldBuildTargets(), null);\r
+            jPanelOptionsTab.add(jLabelToolChainFamily, null);\r
+            jPanelOptionsTab.add(getJTextFieldToolChainFamily(), null);\r
+            jPanelOptionsTab.add(jLabelToolCmd, null);\r
+            jPanelOptionsTab.add(getJTextFieldToolCmd(), null);\r
+            jPanelOptionsTab.add(jLabelSupArch, null);\r
+            jPanelOptionsTab.add(getJCheckBoxIA32(), null);\r
+            jPanelOptionsTab.add(getJCheckBoxIpf(), null);\r
+            jPanelOptionsTab.add(getJCheckBoxX64(), null);\r
+            jPanelOptionsTab.add(getJCheckBoxEBC(), null);\r
+            jPanelOptionsTab.add(getJCheckBoxARM(), null);\r
+            jPanelOptionsTab.add(getJCheckBoxPPC(), null);\r
+            jPanelOptionsTab.add(jLabelTagName, null);\r
+            jPanelOptionsTab.add(getJTextFieldTagName(), null);\r
+            jPanelOptionsTab.add(jLabelOptionContents, null);\r
+            jPanelOptionsTab.add(getJTextFieldOptionContents(), null);\r
+            jPanelOptionsTab.add(getJButtonOptionsAdd(), null);\r
+            jPanelOptionsTab.add(getJButtonOptionsDel(), null);\r
+            jPanelOptionsTab.add(getJScrollPaneOptions(), null);\r
+        }\r
+        return jPanelOptionsTab;\r
     }\r
 \r
     /**\r
@@ -768,31 +752,12 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \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
-        }\r
-        return jTextField7;\r
-    }\r
-\r
-    /**\r
-     * This method initializes jComboBox2      \r
-     *         \r
-     * @return javax.swing.JComboBox   \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
-            jComboBox2.setVisible(false);\r
+    private JTextField getJTextFieldOptionContents() {\r
+        if (jTextFieldOptionContents == null) {\r
+            jTextFieldOptionContents = new JTextField();\r
+            jTextFieldOptionContents.setPreferredSize(new java.awt.Dimension(300,20));\r
         }\r
-        return jComboBox2;\r
+        return jTextFieldOptionContents;\r
     }\r
 \r
     /**\r
@@ -800,12 +765,12 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JTextField  \r
      */\r
-    private JTextField getJTextField8() {\r
-        if (jTextField8 == null) {\r
-            jTextField8 = new JTextField();\r
-            jTextField8.setPreferredSize(new java.awt.Dimension(110,20));\r
+    private JTextField getJTextFieldToolCmd() {\r
+        if (jTextFieldToolCmd == null) {\r
+            jTextFieldToolCmd = new JTextField();\r
+            jTextFieldToolCmd.setPreferredSize(new java.awt.Dimension(110,20));\r
         }\r
-        return jTextField8;\r
+        return jTextFieldToolCmd;\r
     }\r
 \r
     /**\r
@@ -813,13 +778,13 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \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 getJScrollPaneOptions() {\r
+        if (jScrollPaneOptions == null) {\r
+            jScrollPaneOptions = new JScrollPane();\r
+            jScrollPaneOptions.setPreferredSize(new java.awt.Dimension(630,200));\r
+            jScrollPaneOptions.setViewportView(getJTableOptions());\r
         }\r
-        return jScrollPane6;\r
+        return jScrollPaneOptions;\r
     }\r
 \r
     /**\r
@@ -827,11 +792,11 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JTable      \r
      */\r
-    private JTable getJTable5() {\r
-        if (jTable5 == null) {\r
+    private JTable getJTableOptions() {\r
+        if (jTableOptions == null) {\r
             optionsTableModel = new DefaultTableModel();\r
-            jTable5 = new JTable(optionsTableModel);\r
-            jTable5.setRowHeight(20);\r
+            jTableOptions = new JTable(optionsTableModel);\r
+            jTableOptions.setRowHeight(20);\r
             optionsTableModel.addColumn("BuildTargets");\r
             optionsTableModel.addColumn("ToolChainFamily");\r
             optionsTableModel.addColumn("SupportedArch");\r
@@ -853,9 +818,9 @@ public class FpdBuildOptions extends IInternalFrame {
             vArch.add("EBC");\r
             vArch.add("ARM");\r
             vArch.add("PPC");\r
-            jTable5.getColumnModel().getColumn(2).setCellEditor(new ListEditor(vArch));\r
-            jTable5.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
-            jTable5.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
+            jTableOptions.getColumnModel().getColumn(2).setCellEditor(new ListEditor(vArch));\r
+            jTableOptions.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
+            jTableOptions.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
                 public void valueChanged(ListSelectionEvent e) {\r
                     selectedRow = -1;\r
                     if (e.getValueIsAdjusting()){\r
@@ -871,7 +836,7 @@ public class FpdBuildOptions extends IInternalFrame {
                 }\r
             });\r
             \r
-            jTable5.getModel().addTableModelListener(new TableModelListener() {\r
+            jTableOptions.getModel().addTableModelListener(new TableModelListener() {\r
                 public void tableChanged(TableModelEvent arg0) {\r
                     // TODO Auto-generated method stub\r
                     int row = arg0.getFirstRow();\r
@@ -904,7 +869,7 @@ public class FpdBuildOptions extends IInternalFrame {
                 }\r
             });\r
         }\r
-        return jTable5;\r
+        return jTableOptions;\r
     }\r
 \r
     /**\r
@@ -912,30 +877,30 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JButton     \r
      */\r
-    private JButton getJButton10() {\r
-        if (jButton10 == null) {\r
-            jButton10 = new JButton();\r
-            jButton10.setText("Add");\r
-            jButton10.setPreferredSize(new java.awt.Dimension(90,20));\r
-            jButton10.addActionListener(new AbstractAction() {\r
+    private JButton getJButtonOptionsAdd() {\r
+        if (jButtonOptionsAdd == null) {\r
+            jButtonOptionsAdd = new JButton();\r
+            jButtonOptionsAdd.setText("Add");\r
+            jButtonOptionsAdd.setPreferredSize(new java.awt.Dimension(90,20));\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 = {jCheckBox9.isSelected(),jCheckBox10.isSelected(),jCheckBox11.isSelected(),\r
-                                           jCheckBox12.isSelected(),jCheckBox13.isSelected(),jCheckBox14.isSelected()};\r
+                    boolean[] boolArray = {jCheckBoxIA32.isSelected(),jCheckBoxIpf.isSelected(),jCheckBoxX64.isSelected(),\r
+                                           jCheckBoxEBC.isSelected(),jCheckBoxARM.isSelected(),jCheckBoxPPC.isSelected()};\r
                     String s = boolToList(boolArray);\r
-                    Object[] o = {jTextField12.getText(), jTextField1.getText(), s,\r
-                                  jTextField8.getText(), jTextField13.getText(), jTextField7.getText()};\r
+                    Object[] o = {jTextFieldBuildTargets.getText(), jTextFieldToolChainFamily.getText(), s,\r
+                                  jTextFieldToolCmd.getText(), jTextFieldTagName.getText(), jTextFieldOptionContents.getText()};\r
                     optionsTableModel.addRow(o);\r
                     docConsole.setSaved(false);\r
-                    ffc.genBuildOptionsOpt(stringToVector(jTextField12.getText()), jTextField1.getText(), jTextField13.getText(), jTextField8.getText(),  stringToVector(s), jTextField7.getText());\r
+                    ffc.genBuildOptionsOpt(stringToVector(jTextFieldBuildTargets.getText()), jTextFieldToolChainFamily.getText(), jTextFieldTagName.getText(), jTextFieldToolCmd.getText(),  stringToVector(s), jTextFieldOptionContents.getText());\r
                 }\r
             });\r
         }\r
-        return jButton10;\r
+        return jButtonOptionsAdd;\r
     }\r
     \r
     private Vector<Object> stringToVector(String s) {\r
@@ -981,12 +946,12 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JButton     \r
      */\r
-    private JButton getJButton11() {\r
-        if (jButton11 == null) {\r
-            jButton11 = new JButton();\r
-            jButton11.setText("Delete");\r
-            jButton11.setPreferredSize(new java.awt.Dimension(90,20));\r
-            jButton11.addActionListener(new AbstractAction() {\r
+    private JButton getJButtonOptionsDel() {\r
+        if (jButtonOptionsDel == null) {\r
+            jButtonOptionsDel = new JButton();\r
+            jButtonOptionsDel.setText("Delete");\r
+            jButtonOptionsDel.setPreferredSize(new java.awt.Dimension(90,20));\r
+            jButtonOptionsDel.addActionListener(new AbstractAction() {\r
                 /**\r
                  * \r
                  */\r
@@ -1001,7 +966,7 @@ public class FpdBuildOptions extends IInternalFrame {
                 }\r
             });\r
         }\r
-        return jButton11;\r
+        return jButtonOptionsDel;\r
     }\r
 \r
     /**\r
@@ -1009,29 +974,29 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JButton     \r
      */\r
-    private JButton getJButton17() {\r
-        if (jButton17 == null) {\r
-            jButton17 = new JButton();\r
-            jButton17.setPreferredSize(new java.awt.Dimension(80,20));\r
-            jButton17.setText("New");\r
-            jButton17.addActionListener(new AbstractAction() {\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 (jTable.getSelectedRow() < 0) {\r
+                    if (jTableFfs.getSelectedRow() < 0) {\r
                         return;\r
                     }\r
                     Object[] o = {"", ""};\r
                     ffsAttributesTableModel.addRow(o);\r
                     docConsole.setSaved(false);\r
-                    ffc.genBuildOptionsFfsAttribute(jTable.getSelectedRow(), "", "");\r
+                    ffc.genBuildOptionsFfsAttribute(jTableFfs.getSelectedRow(), "", "");\r
                 }\r
             });\r
         }\r
-        return jButton17;\r
+        return jButtonFfsAttribNew;\r
     }\r
 \r
     /**\r
@@ -1039,30 +1004,30 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \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(80,20));\r
-            jButton18.setText("Remove");\r
-            jButton18.addActionListener(new AbstractAction(){\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 (jTable.getSelectedRow() < 0) {\r
+                    if (jTableFfs.getSelectedRow() < 0) {\r
                         return;\r
                     }\r
-                    if (jTable4.getSelectedRow() >= 0){\r
+                    if (jTableFfsAttribs.getSelectedRow() >= 0){\r
                         docConsole.setSaved(false);\r
-                        ffsAttributesTableModel.removeRow(jTable4.getSelectedRow());\r
-                        ffc.removeBuildOptionsFfsAttribute(jTable.getSelectedRow(), jTable4.getSelectedRow());\r
+                        ffsAttributesTableModel.removeRow(jTableFfsAttribs.getSelectedRow());\r
+                        ffc.removeBuildOptionsFfsAttribute(jTableFfs.getSelectedRow(), jTableFfsAttribs.getSelectedRow());\r
                     }\r
                 }\r
             });\r
         }\r
-        return jButton18;\r
+        return jButtonFfsAttribRemove;\r
     }\r
 \r
     /**\r
@@ -1070,13 +1035,13 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JCheckBox   \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 JCheckBox getJCheckBoxIA32() {\r
+        if (jCheckBoxIA32 == null) {\r
+            jCheckBoxIA32 = new JCheckBox();\r
+            jCheckBoxIA32.setPreferredSize(new java.awt.Dimension(50,20));\r
+            jCheckBoxIA32.setText("IA32");\r
         }\r
-        return jCheckBox9;\r
+        return jCheckBoxIA32;\r
     }\r
 \r
     /**\r
@@ -1084,13 +1049,13 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JCheckBox   \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 JCheckBox getJCheckBoxIpf() {\r
+        if (jCheckBoxIpf == null) {\r
+            jCheckBoxIpf = new JCheckBox();\r
+            jCheckBoxIpf.setPreferredSize(new java.awt.Dimension(50,20));\r
+            jCheckBoxIpf.setText("IPF");\r
         }\r
-        return jCheckBox10;\r
+        return jCheckBoxIpf;\r
     }\r
 \r
     /**\r
@@ -1098,13 +1063,13 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JCheckBox   \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 JCheckBox getJCheckBoxX64() {\r
+        if (jCheckBoxX64 == null) {\r
+            jCheckBoxX64 = new JCheckBox();\r
+            jCheckBoxX64.setText("X64");\r
+            jCheckBoxX64.setPreferredSize(new java.awt.Dimension(47,20));\r
         }\r
-        return jCheckBox11;\r
+        return jCheckBoxX64;\r
     }\r
 \r
     /**\r
@@ -1112,13 +1077,13 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JCheckBox   \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 JCheckBox getJCheckBoxEBC() {\r
+        if (jCheckBoxEBC == null) {\r
+            jCheckBoxEBC = new JCheckBox();\r
+            jCheckBoxEBC.setPreferredSize(new java.awt.Dimension(50,20));\r
+            jCheckBoxEBC.setText("EBC");\r
         }\r
-        return jCheckBox12;\r
+        return jCheckBoxEBC;\r
     }\r
 \r
     /**\r
@@ -1126,13 +1091,13 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JCheckBox   \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 JCheckBox getJCheckBoxARM() {\r
+        if (jCheckBoxARM == null) {\r
+            jCheckBoxARM = new JCheckBox();\r
+            jCheckBoxARM.setPreferredSize(new java.awt.Dimension(55,20));\r
+            jCheckBoxARM.setText("ARM");\r
         }\r
-        return jCheckBox13;\r
+        return jCheckBoxARM;\r
     }\r
 \r
     /**\r
@@ -1140,13 +1105,13 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JCheckBox   \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 JCheckBox getJCheckBoxPPC() {\r
+        if (jCheckBoxPPC == null) {\r
+            jCheckBoxPPC = new JCheckBox();\r
+            jCheckBoxPPC.setPreferredSize(new java.awt.Dimension(50,20));\r
+            jCheckBoxPPC.setText("PPC");\r
         }\r
-        return jCheckBox14;\r
+        return jCheckBoxPPC;\r
     }\r
 \r
     /**\r
@@ -1154,12 +1119,12 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \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 getJTextFieldBuildTargets() {\r
+        if (jTextFieldBuildTargets == null) {\r
+            jTextFieldBuildTargets = new JTextField();\r
+            jTextFieldBuildTargets.setPreferredSize(new java.awt.Dimension(150,20));\r
         }\r
-        return jTextField12;\r
+        return jTextFieldBuildTargets;\r
     }\r
 \r
     /**\r
@@ -1167,12 +1132,12 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \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 getJTextFieldTagName() {\r
+        if (jTextFieldTagName == null) {\r
+            jTextFieldTagName = new JTextField();\r
+            jTextFieldTagName.setPreferredSize(new java.awt.Dimension(140,20));\r
         }\r
-        return jTextField13;\r
+        return jTextFieldTagName;\r
     }\r
 \r
     /**\r
@@ -1180,13 +1145,13 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JScrollPane \r
      */\r
-    private JScrollPane getJScrollPane() {\r
-        if (jScrollPane == null) {\r
-            jScrollPane = new JScrollPane();\r
-            jScrollPane.setPreferredSize(new java.awt.Dimension(150,419));\r
-            jScrollPane.setViewportView(getJTable());\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 jScrollPane;\r
+        return jScrollPaneFfs;\r
     }\r
 \r
     /**\r
@@ -1194,16 +1159,16 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JTable      \r
      */\r
-    private JTable getJTable() {\r
-        if (jTable == null) {\r
+    private JTable getJTableFfs() {\r
+        if (jTableFfs == null) {\r
             ffsTableModel = new DefaultTableModel();\r
             ffsTableModel.addColumn("FFS Type");\r
-            jTable = new JTable(ffsTableModel);\r
-            jTable.setShowGrid(false);\r
-            jTable.setRowHeight(20);\r
+            jTableFfs = new JTable(ffsTableModel);\r
+            jTableFfs.setShowGrid(false);\r
+            jTableFfs.setRowHeight(20);\r
             \r
-            jTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
-            jTable.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
+            jTableFfs.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
+            jTableFfs.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
                 public void valueChanged(ListSelectionEvent e) {\r
                     \r
                     if (e.getValueIsAdjusting()){\r
@@ -1224,8 +1189,8 @@ public class FpdBuildOptions extends IInternalFrame {
                         ArrayList<String> alSections = new ArrayList<String>();\r
                         ArrayList<String> alSection = new ArrayList<String>();\r
                         ffc.getBuildOptionsFfs(row, sArray, lhm, alSections, alSection);\r
-                        jTextField6.setText(sArray[0]);\r
-                        jTextField.setText(sArray[1]);\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
@@ -1248,7 +1213,7 @@ public class FpdBuildOptions extends IInternalFrame {
                 }\r
             });\r
             \r
-            jTable.getModel().addTableModelListener(new TableModelListener() {\r
+            jTableFfs.getModel().addTableModelListener(new TableModelListener() {\r
                 public void tableChanged(TableModelEvent arg0) {\r
                     // TODO Auto-generated method stub\r
                     int row = arg0.getFirstRow();\r
@@ -1266,7 +1231,7 @@ public class FpdBuildOptions extends IInternalFrame {
                 }\r
             });\r
         }\r
-        return jTable;\r
+        return jTableFfs;\r
     }\r
 \r
     /**\r
@@ -1274,13 +1239,13 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JScrollPane \r
      */\r
-    private JScrollPane getJScrollPane1() {\r
-        if (jScrollPane1 == null) {\r
-            jScrollPane1 = new JScrollPane();\r
-            jScrollPane1.setPreferredSize(new java.awt.Dimension(500,80));\r
-            jScrollPane1.setViewportView(getJTable1());\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 jScrollPane1;\r
+        return jScrollPaneFfsSection;\r
     }\r
 \r
     /**\r
@@ -1288,13 +1253,13 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JTable      \r
      */\r
-    private JTable getJTable1() {\r
-        if (jTable1 == null) {\r
+    private JTable getJTableFfsSection() {\r
+        if (jTableFfsSection == null) {\r
             sectionTableModel = new DefaultTableModel();\r
             sectionTableModel.addColumn("SectionType");\r
             \r
-            jTable1 = new JTable(sectionTableModel);\r
-            jTable1.setRowHeight(20);\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
@@ -1309,14 +1274,14 @@ public class FpdBuildOptions extends IInternalFrame {
             cb.addItem("EFI_SECTION_GUID_DEFINED");\r
             cb.addItem("EFI_SECTION_COMPATIBILITY16");\r
             cb.addItem("EFI_SECTION_FIRMWARE_VOLUME_IMAGE");\r
-            jTable1.getColumnModel().getColumn(0).setCellEditor(new DefaultCellEditor(cb));\r
+            jTableFfsSection.getColumnModel().getColumn(0).setCellEditor(new DefaultCellEditor(cb));\r
             \r
-            jTable1.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
+            jTableFfsSection.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
             \r
-            jTable1.getModel().addTableModelListener(new TableModelListener() {\r
+            jTableFfsSection.getModel().addTableModelListener(new TableModelListener() {\r
                 public void tableChanged(TableModelEvent arg0) {\r
                     // TODO Auto-generated method stub\r
-                    if (jTable.getSelectedRow() < 0) {\r
+                    if (jTableFfs.getSelectedRow() < 0) {\r
                         return;\r
                     }\r
                     int row = arg0.getFirstRow();\r
@@ -1325,12 +1290,12 @@ public class FpdBuildOptions extends IInternalFrame {
                         //ToDo Data Validition check.\r
                         String type = m.getValueAt(row, 0) + "";\r
                         docConsole.setSaved(false);\r
-                       ffc.updateBuildOptionsFfsSectionsSection(jTable.getSelectedRow(), row, type);\r
+                       ffc.updateBuildOptionsFfsSectionsSection(jTableFfs.getSelectedRow(), row, type);\r
                     }\r
                 }\r
             });\r
         }\r
-        return jTable1;\r
+        return jTableFfsSection;\r
     }\r
 \r
     /**\r
@@ -1338,13 +1303,13 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JScrollPane \r
      */\r
-    private JScrollPane getJScrollPane3() {\r
-        if (jScrollPane3 == null) {\r
-            jScrollPane3 = new JScrollPane();\r
-            jScrollPane3.setPreferredSize(new java.awt.Dimension(500,90));\r
-            jScrollPane3.setViewportView(getJTable3());\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 jScrollPane3;\r
+        return jScrollPaneFfsSubSection;\r
     }\r
 \r
     /**\r
@@ -1352,12 +1317,12 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JTable      \r
      */\r
-    private JTable getJTable3() {\r
-        if (jTable3 == null) {\r
+    private JTable getJTableFfsSubSection() {\r
+        if (jTableFfsSubSection == null) {\r
             subsectionsTableModel = new DefaultTableModel();\r
             subsectionsTableModel.addColumn("SectionType");\r
-            jTable3 = new JTable(subsectionsTableModel);\r
-            jTable3.setRowHeight(20);\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
@@ -1372,13 +1337,13 @@ public class FpdBuildOptions extends IInternalFrame {
             cb.addItem("EFI_SECTION_GUID_DEFINED");\r
             cb.addItem("EFI_SECTION_COMPATIBILITY16");\r
             cb.addItem("EFI_SECTION_FIRMWARE_VOLUME_IMAGE");\r
-            jTable3.getColumnModel().getColumn(0).setCellEditor(new DefaultCellEditor(cb));\r
-            jTable3.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
+            jTableFfsSubSection.getColumnModel().getColumn(0).setCellEditor(new DefaultCellEditor(cb));\r
+            jTableFfsSubSection.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
             \r
-            jTable3.getModel().addTableModelListener(new TableModelListener() {\r
+            jTableFfsSubSection.getModel().addTableModelListener(new TableModelListener() {\r
                 public void tableChanged(TableModelEvent arg0) {\r
                     // TODO Auto-generated method stub\r
-                    if (jTable.getSelectedRow() < 0 || jTable6.getSelectedRow() < 0) {\r
+                    if (jTableFfs.getSelectedRow() < 0 || jTableFfsSections.getSelectedRow() < 0) {\r
                         return;\r
                     }\r
                     int row = arg0.getFirstRow();\r
@@ -1387,12 +1352,12 @@ public class FpdBuildOptions extends IInternalFrame {
                         //ToDo Data Validition check.\r
                         String type = m.getValueAt(row, 0) + "";\r
                         docConsole.setSaved(false);\r
-                        ffc.updateBuildOptionsFfsSectionsSectionsSection(jTable.getSelectedRow(), jTable6.getSelectedRow(), row, type);\r
+                        ffc.updateBuildOptionsFfsSectionsSectionsSection(jTableFfs.getSelectedRow(), jTableFfsSections.getSelectedRow(), row, type);\r
                     }\r
                 }\r
             });\r
         }\r
-        return jTable3;\r
+        return jTableFfsSubSection;\r
     }\r
 \r
     /**\r
@@ -1400,20 +1365,20 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JTextField  \r
      */\r
-    private JTextField getJTextField() {\r
-        if (jTextField == null) {\r
-            jTextField = new JTextField();\r
-            jTextField.setPreferredSize(new java.awt.Dimension(100,20));\r
-            jTextField.addFocusListener(new java.awt.event.FocusAdapter() {\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 (jTable.getSelectedRow() < 0) {\r
+                    if (jTableFfs.getSelectedRow() < 0) {\r
                         return;\r
                     }\r
-                    ffc.updateBuildOptionsFfsSectionsType(jTable.getSelectedRow(), jTextField.getText());\r
+                    ffc.updateBuildOptionsFfsSectionsType(jTableFfs.getSelectedRow(), jTextFieldEncapType.getText());\r
                 }\r
             });\r
         }\r
-        return jTextField;\r
+        return jTextFieldEncapType;\r
     }\r
 \r
     /**\r
@@ -1421,14 +1386,14 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel4() {\r
-        if (jPanel4 == null) {\r
-            jPanel4 = new JPanel();\r
-            jPanel4.setPreferredSize(new java.awt.Dimension(100,100));\r
-            jPanel4.add(getJButton17(), null);\r
-            jPanel4.add(getJButton18(), null);\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 jPanel4;\r
+        return jPanelFfsAttribButtonGroup;\r
     }\r
 \r
     /**\r
@@ -1436,24 +1401,24 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JButton     \r
      */\r
-    private JButton getJButton() {\r
-        if (jButton == null) {\r
-            jButton = new JButton();\r
-            jButton.setPreferredSize(new java.awt.Dimension(80,20));\r
-            jButton.setText("New");\r
-            jButton.addActionListener(new java.awt.event.ActionListener() {\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 (jTable.getSelectedRow() < 0) {\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(jTable.getSelectedRow(), row[0]);\r
+                    ffc.genBuildOptionsFfsSectionsSection(jTableFfs.getSelectedRow(), row[0]);\r
                 }\r
             });\r
         }\r
-        return jButton;\r
+        return jButtonFfsSectionNew;\r
     }\r
 \r
     /**\r
@@ -1461,24 +1426,24 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JButton     \r
      */\r
-    private JButton getJButton1() {\r
-        if (jButton1 == null) {\r
-            jButton1 = new JButton();\r
-            jButton1.setPreferredSize(new java.awt.Dimension(80,20));\r
-            jButton1.setText("Remove");\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
-            jButton1.addActionListener(new java.awt.event.ActionListener() {\r
+            jButtonFfsSectionRemove.addActionListener(new java.awt.event.ActionListener() {\r
                 public void actionPerformed(java.awt.event.ActionEvent e) {\r
-                    if (jTable.getSelectedRow() < 0 || jTable1.getSelectedRow() < 0) {\r
+                    if (jTableFfs.getSelectedRow() < 0 || jTableFfsSection.getSelectedRow() < 0) {\r
                         return;\r
                     }\r
                     docConsole.setSaved(false);\r
-                    sectionTableModel.removeRow(jTable1.getSelectedRow());\r
-                    ffc.removeBuildOptionsFfsSectionsSection(jTable.getSelectedRow(), jTable1.getSelectedRow());\r
+                    sectionTableModel.removeRow(jTableFfsSection.getSelectedRow());\r
+                    ffc.removeBuildOptionsFfsSectionsSection(jTableFfs.getSelectedRow(), jTableFfsSection.getSelectedRow());\r
                 }\r
             });\r
         }\r
-        return jButton1;\r
+        return jButtonFfsSectionRemove;\r
     }\r
 \r
     /**\r
@@ -1486,25 +1451,25 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JButton     \r
      */\r
-    private JButton getJButton2() {\r
-        if (jButton2 == null) {\r
-            jButton2 = new JButton();\r
-            jButton2.setPreferredSize(new java.awt.Dimension(80,20));\r
-            jButton2.setText("New");\r
-            jButton2.addActionListener(new java.awt.event.ActionListener() {\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 (jTable.getSelectedRow() < 0 || jTable6.getSelectedRow() < 0) {\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(jTable.getSelectedRow(), jTable6.getSelectedRow(), row[0]);\r
+                    ffc.genBuildOptionsFfsSectionsSectionsSection(jTableFfs.getSelectedRow(), jTableFfsSections.getSelectedRow(), row[0]);\r
                     \r
                 }\r
             });\r
         }\r
-        return jButton2;\r
+        return jButtonFfsSubSectionNew;\r
     }\r
 \r
     /**\r
@@ -1512,23 +1477,23 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JButton     \r
      */\r
-    private JButton getJButton3() {\r
-        if (jButton3 == null) {\r
-            jButton3 = new JButton();\r
-            jButton3.setPreferredSize(new java.awt.Dimension(80,20));\r
-            jButton3.setText("Remove");\r
-            jButton3.addActionListener(new java.awt.event.ActionListener() {\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 (jTable.getSelectedRow() < 0 || jTable6.getSelectedRow() < 0 || jTable3.getSelectedRow() < 0) {\r
+                    if (jTableFfs.getSelectedRow() < 0 || jTableFfsSections.getSelectedRow() < 0 || jTableFfsSubSection.getSelectedRow() < 0) {\r
                         return;\r
                     }\r
                     docConsole.setSaved(false);\r
-                    subsectionsTableModel.removeRow(jTable3.getSelectedRow());\r
-                    ffc.removeBuildOptionsFfsSectionsSectionsSection(jTable.getSelectedRow(), jTable6.getSelectedRow(), jTable3.getSelectedRow());\r
+                    subsectionsTableModel.removeRow(jTableFfsSubSection.getSelectedRow());\r
+                    ffc.removeBuildOptionsFfsSectionsSectionsSection(jTableFfs.getSelectedRow(), jTableFfsSections.getSelectedRow(), jTableFfsSubSection.getSelectedRow());\r
                 }\r
             });\r
         }\r
-        return jButton3;\r
+        return jButtonFfsSubSectionRemove;\r
     }\r
 \r
     /**\r
@@ -1536,24 +1501,24 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JButton     \r
      */\r
-    private JButton getJButton6() {\r
-        if (jButton6 == null) {\r
-            jButton6 = new JButton();\r
-            jButton6.setPreferredSize(new java.awt.Dimension(80,20));\r
-            jButton6.setText("New");\r
-            jButton6.addActionListener(new java.awt.event.ActionListener() {\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 (jTable.getSelectedRow() < 0) {\r
+                    if (jTableFfs.getSelectedRow() < 0) {\r
                         return;\r
                     }\r
                     docConsole.setSaved(false);\r
                     String[] row = {""};\r
                     sectionsTableModel.addRow(row);\r
-                    ffc.genBuildOptionsFfsSectionsSections(jTable.getSelectedRow(), "");\r
+                    ffc.genBuildOptionsFfsSectionsSections(jTableFfs.getSelectedRow(), "");\r
                 }\r
             });\r
         }\r
-        return jButton6;\r
+        return jButtonFfsSectionsNew;\r
     }\r
 \r
     /**\r
@@ -1561,23 +1526,23 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JButton     \r
      */\r
-    private JButton getJButton7() {\r
-        if (jButton7 == null) {\r
-            jButton7 = new JButton();\r
-            jButton7.setPreferredSize(new java.awt.Dimension(80,20));\r
-            jButton7.setText("Remove");\r
-            jButton7.addActionListener(new java.awt.event.ActionListener() {\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 (jTable.getSelectedRow() < 0 || jTable6.getSelectedRow() < 0) {\r
+                    if (jTableFfs.getSelectedRow() < 0 || jTableFfsSections.getSelectedRow() < 0) {\r
                         return;\r
                     }\r
                     docConsole.setSaved(false);\r
-                    sectionsTableModel.removeRow(jTable6.getSelectedRow());\r
-                    ffc.removeBuildOptionsFfsSectionsSections(jTable.getSelectedRow(), jTable6.getSelectedRow());\r
+                    sectionsTableModel.removeRow(jTableFfsSections.getSelectedRow());\r
+                    ffc.removeBuildOptionsFfsSectionsSections(jTableFfs.getSelectedRow(), jTableFfsSections.getSelectedRow());\r
                 }\r
             });\r
         }\r
-        return jButton7;\r
+        return jButtonFfsSectionsRemove;\r
     }\r
 \r
     /**\r
@@ -1585,13 +1550,13 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JScrollPane \r
      */\r
-    private JScrollPane getJScrollPane4() {\r
-        if (jScrollPane4 == null) {\r
-            jScrollPane4 = new JScrollPane();\r
-            jScrollPane4.setPreferredSize(new java.awt.Dimension(500,80));\r
-            jScrollPane4.setViewportView(getJTable6());\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 jScrollPane4;\r
+        return jScrollPaneFfsSections;\r
     }\r
 \r
     /**\r
@@ -1599,14 +1564,14 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JTable      \r
      */\r
-    private JTable getJTable6() {\r
-        if (jTable6 == null) {\r
+    private JTable getJTableFfsSections() {\r
+        if (jTableFfsSections == null) {\r
             sectionsTableModel = new DefaultTableModel();\r
             sectionsTableModel.addColumn("EncapsulationType");\r
-            jTable6 = new JTable(sectionsTableModel);\r
-            jTable6.setRowHeight(20);\r
-            jTable6.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
-            jTable6.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\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
                     if (e.getValueIsAdjusting()){\r
                         return;\r
@@ -1617,12 +1582,12 @@ public class FpdBuildOptions extends IInternalFrame {
                     }\r
                     else{\r
                         int sectionsRow = lsm.getMinSelectionIndex();\r
-                        if (jTable.getSelectedRow() < 0) {\r
+                        if (jTableFfs.getSelectedRow() < 0) {\r
                             return;\r
                         }\r
                         subsectionsTableModel.setRowCount(0);\r
                         ArrayList<String> al = new ArrayList<String>();\r
-                        ffc.getBuildOptionsFfsSectionsSectionsSection(jTable.getSelectedRow(), sectionsRow, al);\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
@@ -1631,7 +1596,7 @@ public class FpdBuildOptions extends IInternalFrame {
                 }\r
             });\r
             \r
-            jTable6.getModel().addTableModelListener(new TableModelListener() {\r
+            jTableFfsSections.getModel().addTableModelListener(new TableModelListener() {\r
                 public void tableChanged(TableModelEvent arg0) {\r
                     // TODO Auto-generated method stub\r
                     int row = arg0.getFirstRow();\r
@@ -1640,12 +1605,12 @@ public class FpdBuildOptions extends IInternalFrame {
                         //ToDo Data Validition check.\r
                         String encapType = m.getValueAt(row, 0) + "";\r
                         docConsole.setSaved(false);\r
-                        ffc.updateBuildOptionsFfsSectionsSections(jTable.getSelectedRow(), row, encapType);\r
+                        ffc.updateBuildOptionsFfsSectionsSections(jTableFfs.getSelectedRow(), row, encapType);\r
                     }\r
                 }\r
             });\r
         }\r
-        return jTable6;\r
+        return jTableFfsSections;\r
     }\r
 \r
     /**\r
@@ -1653,12 +1618,12 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JButton     \r
      */\r
-    private JButton getJButton12() {\r
-        if (jButton12 == null) {\r
-            jButton12 = new JButton();\r
-            jButton12.setPreferredSize(new Dimension(90, 20));\r
-            jButton12.setText("Browse");\r
-            jButton12.addActionListener(new AbstractAction() {\r
+    private JButton getJButtonAntTaskFileBrowse() {\r
+        if (jButtonAntTaskFileBrowse == null) {\r
+            jButtonAntTaskFileBrowse = new JButton();\r
+            jButtonAntTaskFileBrowse.setPreferredSize(new Dimension(90, 20));\r
+            jButtonAntTaskFileBrowse.setText("Browse");\r
+            jButtonAntTaskFileBrowse.addActionListener(new AbstractAction() {\r
                 private static final long serialVersionUID = 1L;\r
 \r
                 public void actionPerformed(ActionEvent arg0) {\r
@@ -1687,13 +1652,13 @@ public class FpdBuildOptions extends IInternalFrame {
                     }\r
                     \r
                     headerDest = theFile.getPath();\r
-                    jTextField2.setText(headerDest.substring(dirPrefix.length()).replace('\\', '/'));\r
+                    jTextFieldAntTaskFile.setText(headerDest.substring(dirPrefix.length()).replace('\\', '/'));\r
                \r
                 }\r
 \r
             });\r
         }\r
-        return jButton12;\r
+        return jButtonAntTaskFileBrowse;\r
     }\r
 \r
     /**\r
@@ -1701,12 +1666,12 @@ public class FpdBuildOptions extends IInternalFrame {
      *         \r
      * @return javax.swing.JTextField  \r
      */\r
-    private JTextField getJTextField1() {\r
-        if (jTextField1 == null) {\r
-            jTextField1 = new JTextField();\r
-            jTextField1.setPreferredSize(new java.awt.Dimension(85,20));\r
+    private JTextField getJTextFieldToolChainFamily() {\r
+        if (jTextFieldToolChainFamily == null) {\r
+            jTextFieldToolChainFamily = new JTextField();\r
+            jTextFieldToolChainFamily.setPreferredSize(new java.awt.Dimension(85,20));\r
         }\r
-        return jTextField1;\r
+        return jTextFieldToolChainFamily;\r
     }\r
 \r
     /**\r
@@ -1743,23 +1708,23 @@ public class FpdBuildOptions extends IInternalFrame {
         initFfsTable();\r
         this.addInternalFrameListener(new InternalFrameAdapter(){\r
             public void internalFrameDeactivated(InternalFrameEvent e){\r
-                if (jTable.isEditing()) {\r
-                    jTable.getCellEditor().stopCellEditing();\r
+                if (jTableFfs.isEditing()) {\r
+                    jTableFfs.getCellEditor().stopCellEditing();\r
                 }\r
-                if (jTable1.isEditing()) {\r
-                    jTable1.getCellEditor().stopCellEditing();\r
+                if (jTableFfsSection.isEditing()) {\r
+                    jTableFfsSection.getCellEditor().stopCellEditing();\r
                 }\r
-                if (jTable2.isEditing()) {\r
-                    jTable2.getCellEditor().stopCellEditing();\r
+                if (jTableAntTasks.isEditing()) {\r
+                    jTableAntTasks.getCellEditor().stopCellEditing();\r
                 }\r
-                if (jTable3.isEditing()) {\r
-                    jTable3.getCellEditor().stopCellEditing();\r
+                if (jTableFfsSubSection.isEditing()) {\r
+                    jTableFfsSubSection.getCellEditor().stopCellEditing();\r
                 }\r
-                if (jTable4.isEditing()) {\r
-                    jTable4.getCellEditor().stopCellEditing();\r
+                if (jTableFfsAttribs.isEditing()) {\r
+                    jTableFfsAttribs.getCellEditor().stopCellEditing();\r
                 }\r
-                if (jTable5.isEditing()) {\r
-                    jTable5.getCellEditor().stopCellEditing();\r
+                if (jTableOptions.isEditing()) {\r
+                    jTableOptions.getCellEditor().stopCellEditing();\r
                 }\r
             }\r
         });\r
@@ -1819,10 +1784,10 @@ public class FpdBuildOptions extends IInternalFrame {
         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(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 jContentPane;\r
index 0a96224..3fd3f9e 100644 (file)
@@ -28,38 +28,38 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
      */\r
     private static final long serialVersionUID = 1L;\r
     private JPanel jContentPane = null;\r
-    private JPanel jPanel = null;\r
-    private JPanel jPanel1 = null;\r
-    private JPanel jPanel2 = null;\r
-    private JScrollPane jScrollPane = null;\r
-    private JTable jTable = null;\r
-    private DynPcdTableModel model = null; \r
-    private DynPcdTableModel model1 = null;\r
+    private JPanel jPanelContentNorth = null;\r
+    private JPanel jPanelContentCenter = null;\r
+    private JPanel jPanelContentSouth = null;\r
+    private JScrollPane jScrollPaneDynPcd = null;\r
+    private JTable jTableDynPcd = null;\r
+    private DynPcdTableModel modelPcd = null; \r
+    private DynPcdTableModel modelSku = null;\r
     private FpdFileContents ffc = null;\r
     private OpeningPlatformType docConsole = null;\r
-    private JPanel jPanel3 = null;\r
-    private JCheckBox jCheckBox = null;\r
-    private JPanel jPanel4 = null;\r
-    private JRadioButton jRadioButton = null;\r
-    private JRadioButton jRadioButton1 = null;\r
-    private JScrollPane jScrollPane1 = null;\r
-    private JTable jTable1 = null;\r
-    private JButton jButton = null;\r
-    private JLabel jLabel = null;\r
-    private JTextField jTextField = null;\r
-    private JLabel jLabel1 = null;\r
-    private JTextField jTextField1 = null;\r
-    private JLabel jLabel2 = null;\r
-    private JLabel jLabel3 = null;\r
-    private JTextField jTextField2 = null;\r
-    private JLabel jLabel4 = null;\r
-    private JTextField jTextField3 = null;\r
-    private JTextField jTextField4 = null;\r
-    private JLabel jLabel5 = null;\r
-    private JTextField jTextField5 = null;\r
-    private JRadioButton jRadioButton2 = null;\r
+    private JPanel jPanelSkuInfo = null;\r
+    private JCheckBox jCheckBoxSkuEnable = null;\r
+    private JPanel jPanelDynPcdValue = null;\r
+    private JRadioButton jRadioButtonHii = null;\r
+    private JRadioButton jRadioButtonVpd = null;\r
+    private JScrollPane jScrollPaneSkuInfo = null;\r
+    private JTable jTableSkuInfo = null;\r
+    private JButton jButtonSkuInfoUpdate = null;\r
+    private JLabel jLabelVarName = null;\r
+    private JTextField jTextFieldVarName = null;\r
+    private JLabel jLabelVarGuid = null;\r
+    private JTextField jTextFieldVarGuid = null;\r
+    private JLabel jLabelPad = null;\r
+    private JLabel jLabelVarOffset = null;\r
+    private JTextField jTextFieldVarOffset = null;\r
+    private JLabel jLabelHiiDefaultValue = null;\r
+    private JTextField jTextFieldHiiDefaultValue = null;\r
+    private JTextField jTextFieldVpdOffset = null;\r
+    private JLabel jLabelVpdOffset = null;\r
+    private JTextField jTextFieldDefaultValue = null;\r
+    private JRadioButton jRadioButtonDefaultValue = null;\r
     private ButtonGroup bg = new ButtonGroup();\r
-    private JLabel jLabel6 = null;\r
+    private JLabel jLabelPadd = null;\r
     /**\r
      * This is the default constructor\r
      */\r
@@ -85,13 +85,13 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
         String[][] saa = new String[ffc.getDynamicPcdBuildDataCount()][5];\r
         ffc.getDynamicPcdBuildData(saa);\r
         for (int i = 0; i < saa.length; ++i) {\r
-            model.addRow(saa[i]);\r
+            modelPcd.addRow(saa[i]);\r
         }\r
         \r
         saa = new String[ffc.getPlatformDefsSkuInfoCount()][2];\r
         ffc.getPlatformDefsSkuInfos(saa);\r
         for (int i = 0; i < saa.length; ++i) {\r
-            model1.addRow(saa[i]);\r
+            modelSku.addRow(saa[i]);\r
         }\r
         \r
     }\r
@@ -116,9 +116,9 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
         if (jContentPane == null) {\r
             jContentPane = new JPanel();\r
             jContentPane.setLayout(new BorderLayout());\r
-            jContentPane.add(getJPanel(), java.awt.BorderLayout.NORTH);\r
-            jContentPane.add(getJPanel1(), java.awt.BorderLayout.CENTER);\r
-            jContentPane.add(getJPanel2(), java.awt.BorderLayout.SOUTH);\r
+            jContentPane.add(getJPanelContentNorth(), java.awt.BorderLayout.NORTH);\r
+            jContentPane.add(getJPanelContentCenter(), java.awt.BorderLayout.CENTER);\r
+            jContentPane.add(getJPanelContentSouth(), java.awt.BorderLayout.SOUTH);\r
         }\r
         return jContentPane;\r
     }\r
@@ -128,11 +128,11 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel() {\r
-        if (jPanel == null) {\r
-            jPanel = new JPanel();\r
+    private JPanel getJPanelContentNorth() {\r
+        if (jPanelContentNorth == null) {\r
+            jPanelContentNorth = new JPanel();\r
         }\r
-        return jPanel;\r
+        return jPanelContentNorth;\r
     }\r
 \r
     /**\r
@@ -140,14 +140,14 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel1() {\r
-        if (jPanel1 == null) {\r
-            jPanel1 = new JPanel();\r
-            jPanel1.add(getJScrollPane(), null);\r
-            jPanel1.add(getJPanel3(), null);\r
-            jPanel1.add(getJPanel4(), null);\r
-        }\r
-        return jPanel1;\r
+    private JPanel getJPanelContentCenter() {\r
+        if (jPanelContentCenter == null) {\r
+            jPanelContentCenter = new JPanel();\r
+            jPanelContentCenter.add(getJScrollPaneDynPcd(), null);\r
+            jPanelContentCenter.add(getJPanelSkuInfo(), null);\r
+            jPanelContentCenter.add(getJPanelDynPcdValue(), null);\r
+        }\r
+        return jPanelContentCenter;\r
     }\r
 \r
     /**\r
@@ -155,11 +155,11 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel2() {\r
-        if (jPanel2 == null) {\r
-            jPanel2 = new JPanel();\r
+    private JPanel getJPanelContentSouth() {\r
+        if (jPanelContentSouth == null) {\r
+            jPanelContentSouth = new JPanel();\r
         }\r
-        return jPanel2;\r
+        return jPanelContentSouth;\r
     }\r
 \r
     /**\r
@@ -167,13 +167,13 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
      *         \r
      * @return javax.swing.JScrollPane \r
      */\r
-    private JScrollPane getJScrollPane() {\r
-        if (jScrollPane == null) {\r
-            jScrollPane = new JScrollPane();\r
-            jScrollPane.setPreferredSize(new java.awt.Dimension(600,200));\r
-            jScrollPane.setViewportView(getJTable());\r
+    private JScrollPane getJScrollPaneDynPcd() {\r
+        if (jScrollPaneDynPcd == null) {\r
+            jScrollPaneDynPcd = new JScrollPane();\r
+            jScrollPaneDynPcd.setPreferredSize(new java.awt.Dimension(600,200));\r
+            jScrollPaneDynPcd.setViewportView(getJTableDynPcd());\r
         }\r
-        return jScrollPane;\r
+        return jScrollPaneDynPcd;\r
     }\r
 \r
     /**\r
@@ -181,18 +181,18 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
      *         \r
      * @return javax.swing.JTable      \r
      */\r
-    private JTable getJTable() {\r
-        if (jTable == null) {\r
-            model = new DynPcdTableModel();\r
-            model.addColumn("CName");\r
-            model.addColumn("Token");\r
-            model.addColumn("TokenSpaceGuid");\r
-            model.addColumn("MaxDatumSize");\r
-            model.addColumn("DatumType");\r
-            jTable = new JTable(model);\r
-            jTable.setRowHeight(20);\r
-            jTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
-            jTable.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
+    private JTable getJTableDynPcd() {\r
+        if (jTableDynPcd == null) {\r
+            modelPcd = new DynPcdTableModel();\r
+            modelPcd.addColumn("CName");\r
+            modelPcd.addColumn("Token");\r
+            modelPcd.addColumn("TokenSpaceGuid");\r
+            modelPcd.addColumn("MaxDatumSize");\r
+            modelPcd.addColumn("DatumType");\r
+            jTableDynPcd = new JTable(modelPcd);\r
+            jTableDynPcd.setRowHeight(20);\r
+            jTableDynPcd.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
+            jTableDynPcd.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
                 public void valueChanged(ListSelectionEvent e) {\r
                     if (e.getValueIsAdjusting()){\r
                         return;\r
@@ -209,57 +209,57 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
                 }\r
             });\r
         }\r
-        return jTable;\r
+        return jTableDynPcd;\r
     }\r
     //\r
     // should display default sku info here, as no selection event of table1 will be triggered when change selection of rows in table. \r
     //\r
     private void displayDetails(int i) {\r
-        jTable1.changeSelection(0, 1, false, false);\r
+        jTableSkuInfo.changeSelection(0, 1, false, false);\r
         int skuCount = ffc.getDynamicPcdSkuInfoCount(i);\r
         String defaultVal = ffc.getDynamicPcdBuildDataValue(i);\r
         if (defaultVal != null) {\r
-            jRadioButton2.setSelected(true);\r
-            jTextField5.setText(defaultVal);\r
+            jRadioButtonDefaultValue.setSelected(true);\r
+            jTextFieldDefaultValue.setText(defaultVal);\r
             if ( skuCount == 1) {\r
-                jCheckBox.setSelected(false);\r
+                jCheckBoxSkuEnable.setSelected(false);\r
             }\r
             else{\r
-                jCheckBox.setSelected(true);\r
+                jCheckBoxSkuEnable.setSelected(true);\r
             }\r
         }\r
         \r
         else if (ffc.getDynamicPcdBuildDataVpdOffset(i) != null) {\r
-            jRadioButton1.setSelected(true);\r
-            jTextField4.setText(ffc.getDynamicPcdBuildDataVpdOffset(i));\r
+            jRadioButtonVpd.setSelected(true);\r
+            jTextFieldVpdOffset.setText(ffc.getDynamicPcdBuildDataVpdOffset(i));\r
             if (skuCount ==1) {\r
-                jCheckBox.setSelected(false);\r
+                jCheckBoxSkuEnable.setSelected(false);\r
                 \r
             }\r
             else{\r
-                jCheckBox.setSelected(true);\r
+                jCheckBoxSkuEnable.setSelected(true);\r
             }\r
         }\r
         else {\r
-            jRadioButton.setSelected(true);\r
+            jRadioButtonHii.setSelected(true);\r
             String[][] saa = new String[ffc.getDynamicPcdSkuInfoCount(i)][7];\r
             ffc.getDynamicPcdSkuInfos(i, saa);\r
-            jTextField.setText(saa[0][1]);\r
-            jTextField1.setText(saa[0][2]);\r
-            jTextField2.setText(saa[0][3]);\r
-            jTextField3.setText(saa[0][4]);\r
+            jTextFieldVarName.setText(saa[0][1]);\r
+            jTextFieldVarGuid.setText(saa[0][2]);\r
+            jTextFieldVarOffset.setText(saa[0][3]);\r
+            jTextFieldHiiDefaultValue.setText(saa[0][4]);\r
             if (skuCount ==1) {\r
-                jCheckBox.setSelected(false);\r
+                jCheckBoxSkuEnable.setSelected(false);\r
             }\r
             else{\r
-                jCheckBox.setSelected(true);\r
+                jCheckBoxSkuEnable.setSelected(true);\r
             }\r
         }\r
         \r
     }\r
     \r
     private void displaySkuInfoDetails(int i) {\r
-        int pcdSelected = jTable.getSelectedRow();\r
+        int pcdSelected = jTableDynPcd.getSelectedRow();\r
         if (pcdSelected < 0) {\r
             return;\r
         }\r
@@ -268,21 +268,21 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
         ffc.getDynamicPcdSkuInfos(pcdSelected, saa);\r
         \r
         if (saa[i][5] != null){\r
-            jRadioButton1.setSelected(true);\r
-            jTextField4.setText(saa[i][5]);\r
+            jRadioButtonVpd.setSelected(true);\r
+            jTextFieldVpdOffset.setText(saa[i][5]);\r
         } \r
         \r
         else if (saa[i][1] != null) {\r
-            jRadioButton.setSelected(true);\r
-            jTextField.setText(saa[i][1]);\r
-            jTextField1.setText(saa[i][2]);\r
-            jTextField2.setText(saa[i][3]);\r
-            jTextField3.setText(saa[i][4]);\r
+            jRadioButtonHii.setSelected(true);\r
+            jTextFieldVarName.setText(saa[i][1]);\r
+            jTextFieldVarGuid.setText(saa[i][2]);\r
+            jTextFieldVarOffset.setText(saa[i][3]);\r
+            jTextFieldHiiDefaultValue.setText(saa[i][4]);\r
         }\r
         \r
         else{\r
-            jRadioButton2.setSelected(true);\r
-            jTextField5.setText(saa[i][6]);\r
+            jRadioButtonDefaultValue.setSelected(true);\r
+            jTextFieldDefaultValue.setText(saa[i][6]);\r
         }\r
         \r
     }\r
@@ -292,19 +292,19 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel3() {\r
-        if (jPanel3 == null) {\r
+    private JPanel getJPanelSkuInfo() {\r
+        if (jPanelSkuInfo == null) {\r
             FlowLayout flowLayout = new FlowLayout();\r
             flowLayout.setAlignment(java.awt.FlowLayout.LEFT);\r
-            jPanel3 = new JPanel();\r
-            jPanel3.setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.RAISED));\r
-            jPanel3.setLayout(flowLayout);\r
-            jPanel3.setPreferredSize(new java.awt.Dimension(600,100));\r
-            jPanel3.add(getJCheckBox(), null);\r
-            jPanel3.add(getJScrollPane1(), null);\r
-            jPanel3.add(getJButton(), null);\r
-        }\r
-        return jPanel3;\r
+            jPanelSkuInfo = new JPanel();\r
+            jPanelSkuInfo.setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.RAISED));\r
+            jPanelSkuInfo.setLayout(flowLayout);\r
+            jPanelSkuInfo.setPreferredSize(new java.awt.Dimension(600,100));\r
+            jPanelSkuInfo.add(getJCheckBoxSkuEnable(), null);\r
+            jPanelSkuInfo.add(getJScrollPaneSkuInfo(), null);\r
+            jPanelSkuInfo.add(getJButtonSkuInfoUpdate(), null);\r
+        }\r
+        return jPanelSkuInfo;\r
     }\r
 \r
     /**\r
@@ -312,17 +312,17 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
      *         \r
      * @return javax.swing.JCheckBox   \r
      */\r
-    private JCheckBox getJCheckBox() {\r
-        if (jCheckBox == null) {\r
-            jCheckBox = new JCheckBox();\r
-            jCheckBox.setText("SKU Enable");\r
-            jCheckBox.addItemListener(new java.awt.event.ItemListener() {\r
+    private JCheckBox getJCheckBoxSkuEnable() {\r
+        if (jCheckBoxSkuEnable == null) {\r
+            jCheckBoxSkuEnable = new JCheckBox();\r
+            jCheckBoxSkuEnable.setText("SKU Enable");\r
+            jCheckBoxSkuEnable.addItemListener(new java.awt.event.ItemListener() {\r
                 public void itemStateChanged(java.awt.event.ItemEvent e) {\r
-                    jTable1.setEnabled(jCheckBox.isSelected());\r
+                    jTableSkuInfo.setEnabled(jCheckBoxSkuEnable.isSelected());\r
                 }\r
             });\r
         }\r
-        return jCheckBox;\r
+        return jCheckBoxSkuEnable;\r
     }\r
 \r
                        \r
@@ -331,60 +331,60 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel4() {\r
-        if (jPanel4 == null) {\r
-            jLabel5 = new JLabel();\r
-            jLabel5.setPreferredSize(new java.awt.Dimension(80,20));\r
-            jLabel5.setText("VPD Offset");\r
-            jLabel4 = new JLabel();\r
-            jLabel4.setPreferredSize(new java.awt.Dimension(100,20));\r
-            jLabel4.setText("HII Default Value");\r
-            jLabel3 = new JLabel();\r
-            jLabel3.setText("Variable Offset");\r
-            jLabel3.setPreferredSize(new java.awt.Dimension(90,20));\r
-            jLabel2 = new JLabel();\r
-            jLabel2.setText("                           ");\r
-            jLabel1 = new JLabel();\r
-            jLabel1.setText("Variable GUID");\r
-            jLabel1.setPreferredSize(new java.awt.Dimension(100,20));\r
-            jLabel = new JLabel();\r
-            jLabel.setText("Variable Name");\r
-            jLabel.setToolTipText("");\r
-            jLabel.setPreferredSize(new java.awt.Dimension(90,20));\r
+    private JPanel getJPanelDynPcdValue() {\r
+        if (jPanelDynPcdValue == null) {\r
+            jLabelVpdOffset = new JLabel();\r
+            jLabelVpdOffset.setPreferredSize(new java.awt.Dimension(80,20));\r
+            jLabelVpdOffset.setText("VPD Offset");\r
+            jLabelHiiDefaultValue = new JLabel();\r
+            jLabelHiiDefaultValue.setPreferredSize(new java.awt.Dimension(100,20));\r
+            jLabelHiiDefaultValue.setText("HII Default Value");\r
+            jLabelVarOffset = new JLabel();\r
+            jLabelVarOffset.setText("Variable Offset");\r
+            jLabelVarOffset.setPreferredSize(new java.awt.Dimension(90,20));\r
+            jLabelPad = new JLabel();\r
+            jLabelPad.setText("                           ");\r
+            jLabelVarGuid = new JLabel();\r
+            jLabelVarGuid.setText("Variable GUID");\r
+            jLabelVarGuid.setPreferredSize(new java.awt.Dimension(100,20));\r
+            jLabelVarName = new JLabel();\r
+            jLabelVarName.setText("Variable Name");\r
+            jLabelVarName.setToolTipText("");\r
+            jLabelVarName.setPreferredSize(new java.awt.Dimension(90,20));\r
             FlowLayout flowLayout1 = new FlowLayout();\r
             flowLayout1.setAlignment(java.awt.FlowLayout.LEFT);\r
-            jPanel4 = new JPanel();\r
-            jPanel4.setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.LOWERED));\r
-            jPanel4.setLayout(flowLayout1);\r
-            jPanel4.setPreferredSize(new java.awt.Dimension(600,120));\r
-            jPanel4.add(getJRadioButton(), null);\r
-            jPanel4.add(jLabel, null);\r
-            jPanel4.add(getJTextField(), null);\r
-            jPanel4.add(jLabel1, null);\r
-            jPanel4.add(getJTextField1(), null);\r
-            jPanel4.add(jLabel2, null);\r
-            jPanel4.add(jLabel3, null);\r
-            jPanel4.add(getJTextField2(), null);\r
-            jPanel4.add(jLabel4, null);\r
-            jPanel4.add(getJTextField3(), null);\r
-            jPanel4.add(getJRadioButton1(), null);\r
-            jPanel4.add(jLabel5, null);\r
-            jPanel4.add(getJTextField4(), null);\r
-            jLabel6 = new JLabel();\r
-            jLabel6.setText("                           ");\r
-            jPanel4.add(jLabel6, null);\r
-                       jLabel.setEnabled(false);\r
-                       jLabel1.setEnabled(false);\r
-                       jLabel4.setEnabled(false);\r
-                       jLabel3.setEnabled(false);\r
-                       jLabel5.setEnabled(false);\r
-                       jPanel4.add(getJRadioButton2(), null);\r
-                       jPanel4.add(getJTextField5(), null);\r
-            bg.add(jRadioButton);\r
-            bg.add(jRadioButton1);\r
+            jPanelDynPcdValue = new JPanel();\r
+            jPanelDynPcdValue.setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.LOWERED));\r
+            jPanelDynPcdValue.setLayout(flowLayout1);\r
+            jPanelDynPcdValue.setPreferredSize(new java.awt.Dimension(600,120));\r
+            jPanelDynPcdValue.add(getJRadioButtonHii(), null);\r
+            jPanelDynPcdValue.add(jLabelVarName, null);\r
+            jPanelDynPcdValue.add(getJTextFieldVarName(), null);\r
+            jPanelDynPcdValue.add(jLabelVarGuid, null);\r
+            jPanelDynPcdValue.add(getJTextFieldVarGuid(), null);\r
+            jPanelDynPcdValue.add(jLabelPad, null);\r
+            jPanelDynPcdValue.add(jLabelVarOffset, null);\r
+            jPanelDynPcdValue.add(getJTextFieldVarOffset(), null);\r
+            jPanelDynPcdValue.add(jLabelHiiDefaultValue, null);\r
+            jPanelDynPcdValue.add(getJTextFieldHiiDefaultValue(), null);\r
+            jPanelDynPcdValue.add(getJRadioButtonVpd(), null);\r
+            jPanelDynPcdValue.add(jLabelVpdOffset, null);\r
+            jPanelDynPcdValue.add(getJTextFieldVpdOffset(), null);\r
+            jLabelPadd = new JLabel();\r
+            jLabelPadd.setText("                           ");\r
+            jPanelDynPcdValue.add(jLabelPadd, null);\r
+                       jLabelVarName.setEnabled(false);\r
+                       jLabelVarGuid.setEnabled(false);\r
+                       jLabelHiiDefaultValue.setEnabled(false);\r
+                       jLabelVarOffset.setEnabled(false);\r
+                       jLabelVpdOffset.setEnabled(false);\r
+                       jPanelDynPcdValue.add(getJRadioButtonDefaultValue(), null);\r
+                       jPanelDynPcdValue.add(getJTextFieldDefaultValue(), null);\r
+            bg.add(jRadioButtonHii);\r
+            bg.add(jRadioButtonVpd);\r
         }                      \r
 \r
-        return jPanel4;\r
+        return jPanelDynPcdValue;\r
     }\r
 \r
     /**\r
@@ -392,26 +392,26 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
      *         \r
      * @return javax.swing.JRadioButton        \r
      */\r
-    private JRadioButton getJRadioButton() {\r
-        if (jRadioButton == null) {\r
-            jRadioButton = new JRadioButton();\r
-            jRadioButton.setText("HII Enable");\r
-            jRadioButton.addItemListener(new java.awt.event.ItemListener() {\r
+    private JRadioButton getJRadioButtonHii() {\r
+        if (jRadioButtonHii == null) {\r
+            jRadioButtonHii = new JRadioButton();\r
+            jRadioButtonHii.setText("HII Enable");\r
+            jRadioButtonHii.addItemListener(new java.awt.event.ItemListener() {\r
                 public void itemStateChanged(java.awt.event.ItemEvent e) {\r
-                    boolean selected = jRadioButton.isSelected();\r
-                    jLabel.setEnabled(selected);\r
-                    jLabel1.setEnabled(selected);\r
-                    jLabel2.setEnabled(selected);\r
-                    jLabel3.setEnabled(selected);\r
-                    jLabel4.setEnabled(selected);\r
-                    jTextField.setEnabled(selected);\r
-                    jTextField1.setEnabled(selected);\r
-                    jTextField2.setEnabled(selected);\r
-                    jTextField3.setEnabled(selected);\r
+                    boolean selected = jRadioButtonHii.isSelected();\r
+                    jLabelVarName.setEnabled(selected);\r
+                    jLabelVarGuid.setEnabled(selected);\r
+                    jLabelPad.setEnabled(selected);\r
+                    jLabelVarOffset.setEnabled(selected);\r
+                    jLabelHiiDefaultValue.setEnabled(selected);\r
+                    jTextFieldVarName.setEnabled(selected);\r
+                    jTextFieldVarGuid.setEnabled(selected);\r
+                    jTextFieldVarOffset.setEnabled(selected);\r
+                    jTextFieldHiiDefaultValue.setEnabled(selected);\r
                 }\r
             });\r
         }\r
-        return jRadioButton;\r
+        return jRadioButtonHii;\r
     }\r
 \r
     /**\r
@@ -419,19 +419,19 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
      *         \r
      * @return javax.swing.JRadioButton        \r
      */\r
-    private JRadioButton getJRadioButton1() {\r
-        if (jRadioButton1 == null) {\r
-            jRadioButton1 = new JRadioButton();\r
-            jRadioButton1.setText("VPD Enable");\r
-            jRadioButton1.addItemListener(new java.awt.event.ItemListener() {\r
+    private JRadioButton getJRadioButtonVpd() {\r
+        if (jRadioButtonVpd == null) {\r
+            jRadioButtonVpd = new JRadioButton();\r
+            jRadioButtonVpd.setText("VPD Enable");\r
+            jRadioButtonVpd.addItemListener(new java.awt.event.ItemListener() {\r
                 public void itemStateChanged(java.awt.event.ItemEvent e) {\r
-                    boolean selected = jRadioButton1.isSelected();\r
-                    jTextField4.setEnabled(selected);\r
-                    jLabel5.setEnabled(selected);\r
+                    boolean selected = jRadioButtonVpd.isSelected();\r
+                    jTextFieldVpdOffset.setEnabled(selected);\r
+                    jLabelVpdOffset.setEnabled(selected);\r
                 }\r
             });\r
         }\r
-        return jRadioButton1;\r
+        return jRadioButtonVpd;\r
     }\r
 \r
     /**\r
@@ -439,13 +439,13 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
      *         \r
      * @return javax.swing.JScrollPane \r
      */\r
-    private JScrollPane getJScrollPane1() {\r
-        if (jScrollPane1 == null) {\r
-            jScrollPane1 = new JScrollPane();\r
-            jScrollPane1.setPreferredSize(new java.awt.Dimension(300,80));\r
-            jScrollPane1.setViewportView(getJTable1());\r
+    private JScrollPane getJScrollPaneSkuInfo() {\r
+        if (jScrollPaneSkuInfo == null) {\r
+            jScrollPaneSkuInfo = new JScrollPane();\r
+            jScrollPaneSkuInfo.setPreferredSize(new java.awt.Dimension(300,80));\r
+            jScrollPaneSkuInfo.setViewportView(getJTableSkuInfo());\r
         }\r
-        return jScrollPane1;\r
+        return jScrollPaneSkuInfo;\r
     }\r
 \r
     /**\r
@@ -453,17 +453,17 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
      *         \r
      * @return javax.swing.JTable      \r
      */\r
-    private JTable getJTable1() {\r
-        if (jTable1 == null) {\r
-            model1 = new DynPcdTableModel();\r
-            jTable1 = new JTable(model1);\r
-            model1.addColumn("SKU ID");\r
-            model1.addColumn("SKU Name");\r
+    private JTable getJTableSkuInfo() {\r
+        if (jTableSkuInfo == null) {\r
+            modelSku = new DynPcdTableModel();\r
+            jTableSkuInfo = new JTable(modelSku);\r
+            modelSku.addColumn("SKU ID");\r
+            modelSku.addColumn("SKU Name");\r
             \r
-            jTable1.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
-            jTable1.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
+            jTableSkuInfo.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
+            jTableSkuInfo.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
                 public void valueChanged(ListSelectionEvent e) {\r
-                    if (jTable.getSelectedRow() < 0) {\r
+                    if (jTableDynPcd.getSelectedRow() < 0) {\r
                         return;\r
                     }\r
                     if (e.getValueIsAdjusting()){\r
@@ -480,7 +480,7 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
                 }\r
             });\r
         }\r
-        return jTable1;\r
+        return jTableSkuInfo;\r
     }\r
 \r
     /**\r
@@ -488,14 +488,14 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
      *         \r
      * @return javax.swing.JButton     \r
      */\r
-    private JButton getJButton() {\r
-        if (jButton == null) {\r
-            jButton = new JButton();\r
-            jButton.setPreferredSize(new java.awt.Dimension(180,20));\r
-            jButton.setText(" Update SKU Information");\r
-            jButton.addActionListener(new java.awt.event.ActionListener() {\r
+    private JButton getJButtonSkuInfoUpdate() {\r
+        if (jButtonSkuInfoUpdate == null) {\r
+            jButtonSkuInfoUpdate = new JButton();\r
+            jButtonSkuInfoUpdate.setPreferredSize(new java.awt.Dimension(180,20));\r
+            jButtonSkuInfoUpdate.setText(" Update SKU Information");\r
+            jButtonSkuInfoUpdate.addActionListener(new java.awt.event.ActionListener() {\r
                 public void actionPerformed(java.awt.event.ActionEvent e) {\r
-                    int pcdSelected = jTable.getSelectedRow();\r
+                    int pcdSelected = jTableDynPcd.getSelectedRow();\r
                     if (pcdSelected < 0) {\r
                         return;\r
                     }\r
@@ -505,7 +505,7 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
                 }\r
             });\r
         }\r
-        return jButton;\r
+        return jButtonSkuInfoUpdate;\r
     }\r
 \r
     private void updateSkuInfo (int pcdSelected) {\r
@@ -517,28 +517,28 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
         String hiiDefault = null;\r
         String value = null;\r
         String vpdOffset = null;\r
-        if (jRadioButton.isSelected()) {\r
-            varName = jTextField.getText();\r
-            varGuid = jTextField1.getText();\r
-            varOffset = jTextField2.getText();\r
-            hiiDefault = jTextField3.getText();\r
+        if (jRadioButtonHii.isSelected()) {\r
+            varName = jTextFieldVarName.getText();\r
+            varGuid = jTextFieldVarGuid.getText();\r
+            varOffset = jTextFieldVarOffset.getText();\r
+            hiiDefault = jTextFieldHiiDefaultValue.getText();\r
         }\r
-        if (jRadioButton1.isSelected()) {\r
-            vpdOffset = jTextField4.getText();\r
+        if (jRadioButtonVpd.isSelected()) {\r
+            vpdOffset = jTextFieldVpdOffset.getText();\r
         }\r
-        if (jRadioButton2.isSelected()) {\r
-            value = jTextField5.getText();\r
+        if (jRadioButtonDefaultValue.isSelected()) {\r
+            value = jTextFieldDefaultValue.getText();\r
         }\r
         //\r
         // SKU disabled. only modify data for default SKU.\r
         //\r
-        if (!jCheckBox.isSelected()) {\r
+        if (!jCheckBoxSkuEnable.isSelected()) {\r
             if (true) {\r
                 ffc.removeDynamicPcdBuildDataSkuInfo(pcdSelected);\r
-                if (jRadioButton.isSelected()) {\r
+                if (jRadioButtonHii.isSelected()) {\r
                     ffc.genDynamicPcdBuildDataSkuInfo("0", varName, varGuid, varOffset, hiiDefault, null, null, pcdSelected);\r
                 }\r
-                else if (jRadioButton1.isSelected()){\r
+                else if (jRadioButtonVpd.isSelected()){\r
                     ffc.genDynamicPcdBuildDataSkuInfo("0", null, null, null, null, vpdOffset, null, pcdSelected);\r
                 }\r
                 else{\r
@@ -549,19 +549,19 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
         //\r
         // SKU Enabled, need add data to all SKUs.\r
         //\r
-        if (jCheckBox.isSelected()) {\r
+        if (jCheckBoxSkuEnable.isSelected()) {\r
             if (skuCount == 1) {\r
                 \r
-                for (int i = 1; i < jTable1.getRowCount(); ++i) {\r
-                    ffc.genDynamicPcdBuildDataSkuInfo(jTable1.getValueAt(i, 0)+"", varName, varGuid, varOffset, hiiDefault, vpdOffset, value, pcdSelected);\r
+                for (int i = 1; i < jTableSkuInfo.getRowCount(); ++i) {\r
+                    ffc.genDynamicPcdBuildDataSkuInfo(jTableSkuInfo.getValueAt(i, 0)+"", varName, varGuid, varOffset, hiiDefault, vpdOffset, value, pcdSelected);\r
                 }\r
             }\r
             else {\r
-                int row = jTable1.getSelectedRow();\r
+                int row = jTableSkuInfo.getSelectedRow();\r
                 if (row < 0) {\r
                     return;\r
                 }\r
-                ffc.updateDynamicPcdBuildDataSkuInfo(jTable1.getValueAt(row, 0)+"", varName, varGuid, varOffset, hiiDefault, vpdOffset, value, pcdSelected);\r
+                ffc.updateDynamicPcdBuildDataSkuInfo(jTableSkuInfo.getValueAt(row, 0)+"", varName, varGuid, varOffset, hiiDefault, vpdOffset, value, pcdSelected);\r
             }\r
         }\r
     }\r
@@ -570,13 +570,13 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
      *         \r
      * @return javax.swing.JTextField  \r
      */\r
-    private JTextField getJTextField() {\r
-        if (jTextField == null) {\r
-            jTextField = new JTextField();\r
-            jTextField.setPreferredSize(new java.awt.Dimension(150,20));\r
-            jTextField.setEnabled(false);\r
+    private JTextField getJTextFieldVarName() {\r
+        if (jTextFieldVarName == null) {\r
+            jTextFieldVarName = new JTextField();\r
+            jTextFieldVarName.setPreferredSize(new java.awt.Dimension(150,20));\r
+            jTextFieldVarName.setEnabled(false);\r
         }\r
-        return jTextField;\r
+        return jTextFieldVarName;\r
     }\r
 \r
     /**\r
@@ -584,13 +584,13 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
      *         \r
      * @return javax.swing.JTextField  \r
      */\r
-    private JTextField getJTextField1() {\r
-        if (jTextField1 == null) {\r
-            jTextField1 = new JTextField();\r
-            jTextField1.setPreferredSize(new java.awt.Dimension(150,20));\r
-            jTextField1.setEnabled(false);\r
+    private JTextField getJTextFieldVarGuid() {\r
+        if (jTextFieldVarGuid == null) {\r
+            jTextFieldVarGuid = new JTextField();\r
+            jTextFieldVarGuid.setPreferredSize(new java.awt.Dimension(150,20));\r
+            jTextFieldVarGuid.setEnabled(false);\r
         }\r
-        return jTextField1;\r
+        return jTextFieldVarGuid;\r
     }\r
 \r
     /**\r
@@ -598,13 +598,13 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
      *         \r
      * @return javax.swing.JTextField  \r
      */\r
-    private JTextField getJTextField2() {\r
-        if (jTextField2 == null) {\r
-            jTextField2 = new JTextField();\r
-            jTextField2.setPreferredSize(new java.awt.Dimension(150,20));\r
-            jTextField2.setEnabled(false);\r
+    private JTextField getJTextFieldVarOffset() {\r
+        if (jTextFieldVarOffset == null) {\r
+            jTextFieldVarOffset = new JTextField();\r
+            jTextFieldVarOffset.setPreferredSize(new java.awt.Dimension(150,20));\r
+            jTextFieldVarOffset.setEnabled(false);\r
         }\r
-        return jTextField2;\r
+        return jTextFieldVarOffset;\r
     }\r
 \r
     /**\r
@@ -612,13 +612,13 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
      *         \r
      * @return javax.swing.JTextField  \r
      */\r
-    private JTextField getJTextField3() {\r
-        if (jTextField3 == null) {\r
-            jTextField3 = new JTextField();\r
-            jTextField3.setPreferredSize(new java.awt.Dimension(150,20));\r
-            jTextField3.setEnabled(false);\r
+    private JTextField getJTextFieldHiiDefaultValue() {\r
+        if (jTextFieldHiiDefaultValue == null) {\r
+            jTextFieldHiiDefaultValue = new JTextField();\r
+            jTextFieldHiiDefaultValue.setPreferredSize(new java.awt.Dimension(150,20));\r
+            jTextFieldHiiDefaultValue.setEnabled(false);\r
         }\r
-        return jTextField3;\r
+        return jTextFieldHiiDefaultValue;\r
     }\r
 \r
     /**\r
@@ -626,13 +626,13 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
      *         \r
      * @return javax.swing.JTextField  \r
      */\r
-    private JTextField getJTextField4() {\r
-        if (jTextField4 == null) {\r
-            jTextField4 = new JTextField();\r
-            jTextField4.setPreferredSize(new java.awt.Dimension(150,20));\r
-            jTextField4.setEnabled(false);\r
+    private JTextField getJTextFieldVpdOffset() {\r
+        if (jTextFieldVpdOffset == null) {\r
+            jTextFieldVpdOffset = new JTextField();\r
+            jTextFieldVpdOffset.setPreferredSize(new java.awt.Dimension(150,20));\r
+            jTextFieldVpdOffset.setEnabled(false);\r
         }\r
-        return jTextField4;\r
+        return jTextFieldVpdOffset;\r
     }\r
 \r
     /**\r
@@ -640,12 +640,12 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
      *         \r
      * @return javax.swing.JTextField  \r
      */\r
-    private JTextField getJTextField5() {\r
-        if (jTextField5 == null) {\r
-            jTextField5 = new JTextField();\r
-            jTextField5.setPreferredSize(new java.awt.Dimension(150,20));\r
+    private JTextField getJTextFieldDefaultValue() {\r
+        if (jTextFieldDefaultValue == null) {\r
+            jTextFieldDefaultValue = new JTextField();\r
+            jTextFieldDefaultValue.setPreferredSize(new java.awt.Dimension(150,20));\r
         }\r
-        return jTextField5;\r
+        return jTextFieldDefaultValue;\r
     }\r
 \r
     /**\r
@@ -653,20 +653,20 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
      *         \r
      * @return javax.swing.JRadioButton        \r
      */\r
-    private JRadioButton getJRadioButton2() {\r
-        if (jRadioButton2 == null) {\r
-            jRadioButton2 = new JRadioButton();\r
-            jRadioButton2.setText("Default PCD Value");\r
-            jRadioButton2.setSelected(true);\r
-            jRadioButton2.setPreferredSize(new java.awt.Dimension(175,20));\r
-            jRadioButton2.addItemListener(new java.awt.event.ItemListener() {\r
+    private JRadioButton getJRadioButtonDefaultValue() {\r
+        if (jRadioButtonDefaultValue == null) {\r
+            jRadioButtonDefaultValue = new JRadioButton();\r
+            jRadioButtonDefaultValue.setText("Default PCD Value");\r
+            jRadioButtonDefaultValue.setSelected(true);\r
+            jRadioButtonDefaultValue.setPreferredSize(new java.awt.Dimension(175,20));\r
+            jRadioButtonDefaultValue.addItemListener(new java.awt.event.ItemListener() {\r
                 public void itemStateChanged(java.awt.event.ItemEvent e) {\r
-                    jTextField5.setEnabled(jRadioButton2.isSelected());\r
+                    jTextFieldDefaultValue.setEnabled(jRadioButtonDefaultValue.isSelected());\r
                 }\r
             });\r
-            bg.add(jRadioButton2);\r
+            bg.add(jRadioButtonDefaultValue);\r
         }\r
-        return jRadioButton2;\r
+        return jRadioButtonDefaultValue;\r
     }\r
 \r
 }  //  @jve:decl-index=0:visual-constraint="10,10"\r
index ce9682e..bcc1938 100644 (file)
@@ -2465,7 +2465,7 @@ class PcdItemTypeConflictException extends Exception {
     private String details = null;\r
     \r
     PcdItemTypeConflictException(String info){\r
-        details = info;\r
+        details = "ItemTypeConflict: " + info;\r
     }\r
     \r
     public String getMessage() {\r
@@ -2482,7 +2482,7 @@ class PcdDeclNotFound extends Exception {
     private String details = null;\r
     \r
     PcdDeclNotFound(String info) {\r
-        details = info;\r
+        details = "PcdDeclNotFound: " + info;\r
     }\r
     \r
     public String getMessage() {\r
@@ -2499,7 +2499,7 @@ class PcdValueMalFormed extends Exception {
     private String details = null;\r
     \r
     PcdValueMalFormed(String info) {\r
-        details = info;\r
+        details = "PcdValueMalFormed: " + info;\r
     }\r
     \r
     public String getMessage() {\r
index 19849d0..690291b 100644 (file)
@@ -68,64 +68,62 @@ public class FpdFlash extends IInternalFrame {
     private static final long serialVersionUID = 1L;\r
     static JFrame frame;\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
+    private JPanel jPanelContentEast = null;\r
+    private JPanel jPanelContentSouth = null;\r
+    private JPanel jPanelContentWest = null;\r
+    private JPanel jPanelContentNorth = null;\r
     private JTabbedPane jTabbedPane = null;\r
     private JPanel jPanelFvImages = null;\r
-    private JButton jButtonOk = null;\r
-    private JButton jButtonCancel = null;\r
     private JPanel jPanelFvImageN = null;\r
     private JPanel jPanelFvImageS = null;\r
-    private JCheckBox jCheckBox1 = null;\r
-    private JLabel jLabel = null;\r
-    private JTextField jTextField = null;\r
-    private JLabel jLabel1 = null;\r
-    private JTextField jTextField1 = null;\r
-    private JButton jButton = null;\r
-    private JScrollPane jScrollPane1 = null;\r
-    private JTable jTable = null;\r
-    private JPanel jPanel4 = null;\r
-    private JButton jButton1 = null;\r
+    private JCheckBox jCheckBoxFvProperty = null;\r
+    private JLabel jLabelFvPropName = null;\r
+    private JTextField jTextFieldFvPropName = null;\r
+    private JLabel jLabelFvPropValue = null;\r
+    private JTextField jTextFieldFvPropValue = null;\r
+    private JButton jButtonFvPropAdd = null;\r
+    private JScrollPane jScrollPaneFvProp = null;\r
+    private JTable jTableFvProp = null;\r
+    private JPanel jPanelFvPropButtonGroup = null;\r
+    private JButton jButtonFvPropDel = null;\r
     private DefaultTableModel fvPropertyTableModel = null;\r
     private DefaultTableModel fvImageNameTableModel = null;\r
     private ImageParaTableModel fvImageParaTableModel = null;\r
     private DefaultTableModel fvOptionTableModel = null;\r
     private JPanel jPanelFvImageC = null;\r
-    private JCheckBox jCheckBox2 = null;\r
-    private JLabel jLabel2 = null;\r
-    private JComboBox jComboBox = null;\r
-    private JLabel jLabel3 = null;\r
-    private JLabel jLabel4 = null;\r
-    private JTextField jTextField2 = null;\r
-    private JButton jButton2 = null;\r
-    private JScrollPane jScrollPane2 = null;\r
-    private JTable jTable1 = null;\r
-    private JButton jButton3 = null;\r
-    private JPanel jPanel5 = null;\r
-    private JButton jButton4 = null;\r
-    private JScrollPane jScrollPane3 = null;\r
-    private JTable jTable2 = null;\r
-    private JButton jButton6 = null;\r
-    private JCheckBox jCheckBox3 = null;\r
-    private JPanel jPanel6 = null;\r
+    private JCheckBox jCheckBoxFvImagePara = null;\r
+    private JLabel jLabelFvParaType = null;\r
+    private JComboBox jComboBoxFvParaType = null;\r
+    private JLabel jLabelFvImageNames = null;\r
+    private JLabel jLabelFvParaName = null;\r
+    private JTextField jTextFieldFvParaName = null;\r
+    private JButton jButtonFvParaAdd = null;\r
+    private JScrollPane jScrollPaneFvImageNames = null;\r
+    private JTable jTableFvImageNames = null;\r
+    private JButton jButtonFvParaDel = null;\r
+    private JPanel jPanelFvImageOpts = null;\r
+    private JButton jButtonAddFvImage = null;\r
+    private JScrollPane jScrollPaneFvInfo = null;\r
+    private JTable jTableFvInfo = null;\r
+    private JButton jButtonDelFvImage = null;\r
+    private JCheckBox jCheckBoxFvImageOpts = null;\r
+    private JPanel jPanelFvImagePara = null;\r
     private OpeningPlatformType docConsole = null;\r
     private FpdFileContents ffc = null;\r
-    private JPanel jPanel7 = null;\r
-    private JCheckBox jCheckBox = null;\r
-    private JTextField jTextField3 = null;\r
-    private JButton jButton5 = null;\r
-    private JLabel jLabel5 = null;\r
-    private JTextField jTextField4 = null;\r
-    private JLabel jLabel6 = null;\r
-    private JTextField jTextField5 = null;\r
-    private JPanel jPanel8 = null;\r
-    private JButton jButton7 = null;\r
-    private JButton jButton8 = null;\r
+    private JPanel jPanelFdf = null;\r
+    private JCheckBox jCheckBoxFdf = null;\r
+    private JTextField jTextFieldFdf = null;\r
+    private JButton jButtonFdfBrowse = null;\r
+    private JLabel jLabelFvImageOptName = null;\r
+    private JTextField jTextFieldFvImageOptName = null;\r
+    private JLabel jLabelFvImageOptValue = null;\r
+    private JTextField jTextFieldFvImageOptValue = null;\r
+    private JPanel jPanelFvImageOptsButtonGroup = null;\r
+    private JButton jButtonFvImageOptAdd = null;\r
+    private JButton jButtonFvImageOptDel = null;\r
     private JScrollPane jScrollPane = null;\r
-    private JTable jTable3 = null;\r
-    private JButton jButton9 = null;\r
+    private JTable jTableFvImageOpts = null;\r
+    private JButton jButtonUpdateFvImage = null;\r
     public FpdFlash() {\r
         super();\r
         // TODO Auto-generated constructor stub\r
@@ -151,11 +149,11 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel() {\r
-        if (jPanel == null) {\r
-            jPanel = new JPanel();\r
+    private JPanel getJPanelContentEast() {\r
+        if (jPanelContentEast == null) {\r
+            jPanelContentEast = new JPanel();\r
         }\r
-        return jPanel;\r
+        return jPanelContentEast;\r
     }\r
 \r
     /**\r
@@ -163,18 +161,16 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel1() {\r
-        if (jPanel1 == null) {\r
+    private JPanel getJPanelContentSouth() {\r
+        if (jPanelContentSouth == null) {\r
             FlowLayout flowLayout = new FlowLayout();\r
             flowLayout.setAlignment(java.awt.FlowLayout.RIGHT);\r
             flowLayout.setHgap(15);\r
-            jPanel1 = new JPanel();\r
-            jPanel1.setLayout(flowLayout);\r
-            jPanel1.setComponentOrientation(java.awt.ComponentOrientation.LEFT_TO_RIGHT);\r
-            jPanel1.add(getJButtonCancel(), null);\r
-            jPanel1.add(getJButtonOk(), null);\r
+            jPanelContentSouth = new JPanel();\r
+            jPanelContentSouth.setLayout(flowLayout);\r
+            jPanelContentSouth.setComponentOrientation(java.awt.ComponentOrientation.LEFT_TO_RIGHT);\r
         }\r
-        return jPanel1;\r
+        return jPanelContentSouth;\r
     }\r
 \r
     /**\r
@@ -182,11 +178,11 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel2() {\r
-        if (jPanel2 == null) {\r
-            jPanel2 = new JPanel();\r
+    private JPanel getJPanelContentWest() {\r
+        if (jPanelContentWest == null) {\r
+            jPanelContentWest = new JPanel();\r
         }\r
-        return jPanel2;\r
+        return jPanelContentWest;\r
     }\r
 \r
     /**\r
@@ -194,11 +190,11 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel3() {\r
-        if (jPanel3 == null) {\r
-            jPanel3 = new JPanel();\r
+    private JPanel getJPanelContentNorth() {\r
+        if (jPanelContentNorth == null) {\r
+            jPanelContentNorth = new JPanel();\r
         }\r
-        return jPanel3;\r
+        return jPanelContentNorth;\r
     }\r
 \r
     /**\r
@@ -210,7 +206,7 @@ public class FpdFlash extends IInternalFrame {
         if (jTabbedPane == null) {\r
             jTabbedPane = new JTabbedPane();\r
             jTabbedPane.addTab("FV Images", null, getJPanelFvImages(), null);\r
-            jTabbedPane.addTab("Flash Definition File", null, getJPanel7(), null);\r
+            jTabbedPane.addTab("Flash Definition File", null, getJPanelFdf(), null);\r
             \r
         }\r
         return jTabbedPane;\r
@@ -234,36 +230,6 @@ public class FpdFlash extends IInternalFrame {
         return jPanelFvImages;\r
     }\r
 \r
-    /**\r
-     * This method initializes jButtonOk       \r
-     *         \r
-     * @return javax.swing.JButton     \r
-     */\r
-    private JButton getJButtonOk() {\r
-        if (jButtonOk == null) {\r
-            jButtonOk = new JButton();\r
-            jButtonOk.setPreferredSize(new java.awt.Dimension(80,20));\r
-            jButtonOk.setText("Cancel");\r
-            jButtonOk.setVisible(false);\r
-        }\r
-        return jButtonOk;\r
-    }\r
-\r
-    /**\r
-     * This method initializes jButtonCancel   \r
-     *         \r
-     * @return javax.swing.JButton     \r
-     */\r
-    private JButton getJButtonCancel() {\r
-        if (jButtonCancel == null) {\r
-            jButtonCancel = new JButton();\r
-            jButtonCancel.setPreferredSize(new java.awt.Dimension(80,20));\r
-            jButtonCancel.setText("Ok");\r
-            jButtonCancel.setVisible(false);\r
-        }\r
-        return jButtonCancel;\r
-    }\r
-\r
     /**\r
      * This method initializes jPanelFvImageN  \r
      *         \r
@@ -271,14 +237,14 @@ public class FpdFlash extends IInternalFrame {
      */\r
     private JPanel getJPanelFvImageN() {\r
         if (jPanelFvImageN == null) {\r
-            jLabel1 = new JLabel();\r
-            jLabel1.setText("Value");\r
-            jLabel1.setEnabled(false);\r
-            jLabel1.setPreferredSize(new java.awt.Dimension(38,20));\r
-            jLabel = new JLabel();\r
-            jLabel.setText("Name");\r
-            jLabel.setEnabled(false);\r
-            jLabel.setPreferredSize(new java.awt.Dimension(38,20));\r
+            jLabelFvPropValue = new JLabel();\r
+            jLabelFvPropValue.setText("Value");\r
+            jLabelFvPropValue.setEnabled(false);\r
+            jLabelFvPropValue.setPreferredSize(new java.awt.Dimension(38,20));\r
+            jLabelFvPropName = new JLabel();\r
+            jLabelFvPropName.setText("Name");\r
+            jLabelFvPropName.setEnabled(false);\r
+            jLabelFvPropName.setPreferredSize(new java.awt.Dimension(38,20));\r
             FlowLayout flowLayout2 = new FlowLayout();\r
             flowLayout2.setAlignment(java.awt.FlowLayout.CENTER);\r
             flowLayout2.setHgap(15);\r
@@ -286,13 +252,13 @@ public class FpdFlash extends IInternalFrame {
             jPanelFvImageN.setPreferredSize(new java.awt.Dimension(576,100));\r
             jPanelFvImageN.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.RAISED));\r
             jPanelFvImageN.setLayout(flowLayout2);\r
-            jPanelFvImageN.add(getJCheckBox1(), null);\r
-            jPanelFvImageN.add(jLabel, null);\r
-            jPanelFvImageN.add(getJTextField(), null);\r
-            jPanelFvImageN.add(jLabel1, null);\r
-            jPanelFvImageN.add(getJTextField1(), null);\r
-            jPanelFvImageN.add(getJScrollPane1(), null);\r
-            jPanelFvImageN.add(getJPanel4(), null);\r
+            jPanelFvImageN.add(getJCheckBoxFvProperty(), null);\r
+            jPanelFvImageN.add(jLabelFvPropName, null);\r
+            jPanelFvImageN.add(getJTextFieldFvPropName(), null);\r
+            jPanelFvImageN.add(jLabelFvPropValue, null);\r
+            jPanelFvImageN.add(getJTextFieldFvPropValue(), null);\r
+            jPanelFvImageN.add(getJScrollPaneFvProp(), null);\r
+            jPanelFvImageN.add(getJPanelFvPropButtonGroup(), null);\r
         }\r
         return jPanelFvImageN;\r
     }\r
@@ -309,7 +275,7 @@ public class FpdFlash extends IInternalFrame {
             jPanelFvImageS = new JPanel();\r
             jPanelFvImageS.setPreferredSize(new java.awt.Dimension(480,190));\r
             jPanelFvImageS.setLayout(gridLayout2);\r
-            jPanelFvImageS.add(getJScrollPane3(), null);\r
+            jPanelFvImageS.add(getJScrollPaneFvInfo(), null);\r
         }\r
         return jPanelFvImageS;\r
     }\r
@@ -320,30 +286,30 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JCheckBox   \r
      */\r
-    private JCheckBox getJCheckBox1() {\r
-        if (jCheckBox1 == null) {\r
-            jCheckBox1 = new JCheckBox();\r
-            jCheckBox1.setText("FV Properties");\r
-            jCheckBox1.addItemListener(new ItemListener(){\r
+    private JCheckBox getJCheckBoxFvProperty() {\r
+        if (jCheckBoxFvProperty == null) {\r
+            jCheckBoxFvProperty = new JCheckBox();\r
+            jCheckBoxFvProperty.setText("FV Properties");\r
+            jCheckBoxFvProperty.addItemListener(new ItemListener(){\r
 \r
                 public void itemStateChanged(ItemEvent arg0) {\r
                     // TODO Auto-generated method stub\r
-                    boolean seleted = jCheckBox1.isSelected();\r
+                    boolean seleted = jCheckBoxFvProperty.isSelected();\r
                     \r
-                        jLabel.setEnabled(seleted);\r
-                        jTextField.setEnabled(seleted);\r
-                        jLabel1.setEnabled(seleted);\r
-                        jTextField1.setEnabled(seleted);\r
-                        jTable.setEnabled(seleted);\r
-                        jButton.setEnabled(seleted);\r
-                        jButton1.setEnabled(seleted);\r
+                        jLabelFvPropName.setEnabled(seleted);\r
+                        jTextFieldFvPropName.setEnabled(seleted);\r
+                        jLabelFvPropValue.setEnabled(seleted);\r
+                        jTextFieldFvPropValue.setEnabled(seleted);\r
+                        jTableFvProp.setEnabled(seleted);\r
+                        jButtonFvPropAdd.setEnabled(seleted);\r
+                        jButtonFvPropDel.setEnabled(seleted);\r
                     \r
                    \r
                 }\r
                 \r
             });\r
         }\r
-        return jCheckBox1;\r
+        return jCheckBoxFvProperty;\r
     }\r
 \r
 \r
@@ -352,13 +318,13 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JTextField  \r
      */\r
-    private JTextField getJTextField() {\r
-        if (jTextField == null) {\r
-            jTextField = new JTextField();\r
-            jTextField.setPreferredSize(new java.awt.Dimension(100,20));\r
-            jTextField.setEnabled(false);\r
+    private JTextField getJTextFieldFvPropName() {\r
+        if (jTextFieldFvPropName == null) {\r
+            jTextFieldFvPropName = new JTextField();\r
+            jTextFieldFvPropName.setPreferredSize(new java.awt.Dimension(100,20));\r
+            jTextFieldFvPropName.setEnabled(false);\r
         }\r
-        return jTextField;\r
+        return jTextFieldFvPropName;\r
     }\r
 \r
 \r
@@ -367,13 +333,13 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JTextField  \r
      */\r
-    private JTextField getJTextField1() {\r
-        if (jTextField1 == null) {\r
-            jTextField1 = new JTextField();\r
-            jTextField1.setPreferredSize(new java.awt.Dimension(100,20));\r
-            jTextField1.setEnabled(false);\r
+    private JTextField getJTextFieldFvPropValue() {\r
+        if (jTextFieldFvPropValue == null) {\r
+            jTextFieldFvPropValue = new JTextField();\r
+            jTextFieldFvPropValue.setPreferredSize(new java.awt.Dimension(100,20));\r
+            jTextFieldFvPropValue.setEnabled(false);\r
         }\r
-        return jTextField1;\r
+        return jTextFieldFvPropValue;\r
     }\r
 \r
 \r
@@ -382,21 +348,21 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JButton     \r
      */\r
-    private JButton getJButton() {\r
-        if (jButton == null) {\r
-            jButton = new JButton();\r
-            jButton.setPreferredSize(new java.awt.Dimension(80,20));\r
-            jButton.setEnabled(false);\r
-            jButton.setText("Add");\r
-            jButton.addActionListener(new AbstractAction() {\r
+    private JButton getJButtonFvPropAdd() {\r
+        if (jButtonFvPropAdd == null) {\r
+            jButtonFvPropAdd = new JButton();\r
+            jButtonFvPropAdd.setPreferredSize(new java.awt.Dimension(80,20));\r
+            jButtonFvPropAdd.setEnabled(false);\r
+            jButtonFvPropAdd.setText("Add");\r
+            jButtonFvPropAdd.addActionListener(new AbstractAction() {\r
                 /**\r
                  * \r
                  */\r
                 private static final long serialVersionUID = 1L;\r
 \r
                 public void actionPerformed(ActionEvent e) {\r
-                    if (jTextField.getText().length() > 0 && jTextField1.getText().length() > 0){\r
-                        String[] row = {jTextField.getText(), jTextField1.getText()};                        \r
+                    if (jTextFieldFvPropName.getText().length() > 0 && jTextFieldFvPropValue.getText().length() > 0){\r
+                        String[] row = {jTextFieldFvPropName.getText(), jTextFieldFvPropValue.getText()};                        \r
                         fvPropertyTableModel.addRow(row);\r
                         docConsole.setSaved(false);\r
                         ffc.genFvImagesNameValue(row[0], row[1]);\r
@@ -404,7 +370,7 @@ public class FpdFlash extends IInternalFrame {
                 }\r
             });\r
         }\r
-        return jButton;\r
+        return jButtonFvPropAdd;\r
     }\r
 \r
 \r
@@ -413,13 +379,13 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JScrollPane \r
      */\r
-    private JScrollPane getJScrollPane1() {\r
-        if (jScrollPane1 == null) {\r
-            jScrollPane1 = new JScrollPane();\r
-            jScrollPane1.setPreferredSize(new java.awt.Dimension(350,55));\r
-            jScrollPane1.setViewportView(getJTable());\r
+    private JScrollPane getJScrollPaneFvProp() {\r
+        if (jScrollPaneFvProp == null) {\r
+            jScrollPaneFvProp = new JScrollPane();\r
+            jScrollPaneFvProp.setPreferredSize(new java.awt.Dimension(350,55));\r
+            jScrollPaneFvProp.setViewportView(getJTableFvProp());\r
         }\r
-        return jScrollPane1;\r
+        return jScrollPaneFvProp;\r
     }\r
 \r
 \r
@@ -428,17 +394,17 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JTable      \r
      */\r
-    private JTable getJTable() {\r
-        if (jTable == null) {\r
+    private JTable getJTableFvProp() {\r
+        if (jTableFvProp == null) {\r
             fvPropertyTableModel = new DefaultTableModel();\r
-            jTable = new JTable(fvPropertyTableModel);\r
+            jTableFvProp = new JTable(fvPropertyTableModel);\r
             fvPropertyTableModel.addColumn("Name");\r
             fvPropertyTableModel.addColumn("Value");\r
-            jTable.setRowHeight(20);\r
-            jTable.setEnabled(false);\r
+            jTableFvProp.setRowHeight(20);\r
+            jTableFvProp.setEnabled(false);\r
             \r
-            jTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
-            jTable.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
+            jTableFvProp.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
+            jTableFvProp.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
                 public void valueChanged(ListSelectionEvent e) {\r
                     if (e.getValueIsAdjusting()){\r
                         return;\r
@@ -453,7 +419,7 @@ public class FpdFlash extends IInternalFrame {
                 }\r
             });\r
             \r
-            jTable.getModel().addTableModelListener(new TableModelListener(){\r
+            jTableFvProp.getModel().addTableModelListener(new TableModelListener(){\r
                 public void tableChanged(TableModelEvent arg0) {\r
                     // TODO Auto-generated method stub\r
                     int row = arg0.getFirstRow();\r
@@ -468,7 +434,7 @@ public class FpdFlash extends IInternalFrame {
                 }\r
             });\r
         }\r
-        return jTable;\r
+        return jTableFvProp;\r
     }\r
 \r
 \r
@@ -477,15 +443,15 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel4() {\r
-        if (jPanel4 == null) {\r
-            jPanel4 = new JPanel();\r
-            jPanel4.setPreferredSize(new java.awt.Dimension(80,55));\r
+    private JPanel getJPanelFvPropButtonGroup() {\r
+        if (jPanelFvPropButtonGroup == null) {\r
+            jPanelFvPropButtonGroup = new JPanel();\r
+            jPanelFvPropButtonGroup.setPreferredSize(new java.awt.Dimension(80,55));\r
             \r
-            jPanel4.add(getJButton(), null);\r
-            jPanel4.add(getJButton1(), null);\r
+            jPanelFvPropButtonGroup.add(getJButtonFvPropAdd(), null);\r
+            jPanelFvPropButtonGroup.add(getJButtonFvPropDel(), null);\r
         }\r
-        return jPanel4;\r
+        return jPanelFvPropButtonGroup;\r
     }\r
 \r
 \r
@@ -494,28 +460,28 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JButton     \r
      */\r
-    private JButton getJButton1() {\r
-        if (jButton1 == null) {\r
-            jButton1 = new JButton();\r
-            jButton1.setPreferredSize(new java.awt.Dimension(80,20));\r
-            jButton1.setEnabled(false);\r
-            jButton1.setText("Delete");\r
-            jButton1.addActionListener(new AbstractAction() {\r
+    private JButton getJButtonFvPropDel() {\r
+        if (jButtonFvPropDel == null) {\r
+            jButtonFvPropDel = new JButton();\r
+            jButtonFvPropDel.setPreferredSize(new java.awt.Dimension(80,20));\r
+            jButtonFvPropDel.setEnabled(false);\r
+            jButtonFvPropDel.setText("Delete");\r
+            jButtonFvPropDel.addActionListener(new AbstractAction() {\r
                 /**\r
                  * \r
                  */\r
                 private static final long serialVersionUID = 1L;\r
 \r
                 public void actionPerformed(ActionEvent e) {\r
-                    if (jTable.getSelectedRow() >= 0){\r
-                        fvPropertyTableModel.removeRow(jTable.getSelectedRow());\r
+                    if (jTableFvProp.getSelectedRow() >= 0){\r
+                        fvPropertyTableModel.removeRow(jTableFvProp.getSelectedRow());\r
                         docConsole.setSaved(false);\r
-                        ffc.removeFvImagesNameValue(jTable.getSelectedRow());\r
+                        ffc.removeFvImagesNameValue(jTableFvProp.getSelectedRow());\r
                     }\r
                 }\r
             });\r
         }\r
-        return jButton1;\r
+        return jButtonFvPropDel;\r
     }\r
 \r
 \r
@@ -526,26 +492,26 @@ public class FpdFlash extends IInternalFrame {
      */\r
     private JPanel getJPanelFvImageC() {\r
         if (jPanelFvImageC == null) {\r
-            jLabel4 = new JLabel();\r
-            jLabel4.setPreferredSize(new Dimension(38, 20));\r
-            jLabel4.setEnabled(false);\r
-            jLabel4.setText("Name");\r
-            jLabel3 = new JLabel();\r
-            jLabel3.setText("FV Image Names");\r
-            jLabel3.setEnabled(false);\r
-            jLabel3.setPreferredSize(new java.awt.Dimension(150,20));\r
-            jLabel2 = new JLabel();\r
-            jLabel2.setText("Type");\r
-            jLabel2.setEnabled(false);\r
-            jLabel2.setPreferredSize(new java.awt.Dimension(70,20));\r
+            jLabelFvParaName = new JLabel();\r
+            jLabelFvParaName.setPreferredSize(new Dimension(38, 20));\r
+            jLabelFvParaName.setEnabled(false);\r
+            jLabelFvParaName.setText("Name");\r
+            jLabelFvImageNames = new JLabel();\r
+            jLabelFvImageNames.setText("FV Image Names");\r
+            jLabelFvImageNames.setEnabled(false);\r
+            jLabelFvImageNames.setPreferredSize(new java.awt.Dimension(150,20));\r
+            jLabelFvParaType = new JLabel();\r
+            jLabelFvParaType.setText("Type");\r
+            jLabelFvParaType.setEnabled(false);\r
+            jLabelFvParaType.setPreferredSize(new java.awt.Dimension(70,20));\r
             FlowLayout flowLayout3 = new FlowLayout();\r
             flowLayout3.setAlignment(java.awt.FlowLayout.LEFT);\r
             flowLayout3.setHgap(5);\r
             jPanelFvImageC = new JPanel();\r
             jPanelFvImageC.setLayout(flowLayout3);\r
-            jPanelFvImageC.add(getJPanel6(), null);\r
+            jPanelFvImageC.add(getJPanelFvImagePara(), null);\r
             \r
-            jPanelFvImageC.add(getJPanel5(), null);\r
+            jPanelFvImageC.add(getJPanelFvImageOpts(), null);\r
             \r
         }\r
         return jPanelFvImageC;\r
@@ -557,33 +523,33 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JCheckBox   \r
      */\r
-    private JCheckBox getJCheckBox2() {\r
-        if (jCheckBox2 == null) {\r
-            jCheckBox2 = new JCheckBox();\r
-            jCheckBox2.setText("FV Image Parameters");\r
-            jCheckBox2.setPreferredSize(new java.awt.Dimension(200,20));\r
-            jCheckBox2.addItemListener(new ItemListener(){\r
+    private JCheckBox getJCheckBoxFvImagePara() {\r
+        if (jCheckBoxFvImagePara == null) {\r
+            jCheckBoxFvImagePara = new JCheckBox();\r
+            jCheckBoxFvImagePara.setText("FV Image Parameters");\r
+            jCheckBoxFvImagePara.setPreferredSize(new java.awt.Dimension(200,20));\r
+            jCheckBoxFvImagePara.addItemListener(new ItemListener(){\r
 \r
                 public void itemStateChanged(ItemEvent arg0) {\r
                     // TODO Auto-generated method stub\r
-                    boolean seleted = jCheckBox2.isSelected();\r
+                    boolean seleted = jCheckBoxFvImagePara.isSelected();\r
                     \r
-                        jLabel2.setEnabled(seleted);\r
-                        jLabel3.setEnabled(seleted);\r
-                        jLabel4.setEnabled(seleted);\r
-                        jComboBox.setEnabled(seleted);\r
-                        jTextField2.setEnabled(seleted);\r
+                        jLabelFvParaType.setEnabled(seleted);\r
+                        jLabelFvImageNames.setEnabled(seleted);\r
+                        jLabelFvParaName.setEnabled(seleted);\r
+                        jComboBoxFvParaType.setEnabled(seleted);\r
+                        jTextFieldFvParaName.setEnabled(seleted);\r
                         \r
-                        jTable1.setEnabled(seleted);\r
-                        jButton2.setEnabled(seleted);\r
-                        jButton3.setEnabled(seleted);\r
+                        jTableFvImageNames.setEnabled(seleted);\r
+                        jButtonFvParaAdd.setEnabled(seleted);\r
+                        jButtonFvParaDel.setEnabled(seleted);\r
                     \r
                    \r
                 }\r
                 \r
             });\r
         }\r
-        return jCheckBox2;\r
+        return jCheckBoxFvImagePara;\r
     }\r
 \r
 \r
@@ -592,16 +558,16 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JComboBox   \r
      */\r
-    private JComboBox getJComboBox() {\r
-        if (jComboBox == null) {\r
-            jComboBox = new JComboBox();\r
-            jComboBox.addItem("ImageName");\r
-            jComboBox.addItem("Attributes");\r
-            jComboBox.addItem("Options");\r
-            jComboBox.addItem("Components");\r
-            jComboBox.setPreferredSize(new java.awt.Dimension(180,20));\r
-            jComboBox.setEnabled(false);\r
-            jComboBox.addItemListener(new ItemListener() {\r
+    private JComboBox getJComboBoxFvParaType() {\r
+        if (jComboBoxFvParaType == null) {\r
+            jComboBoxFvParaType = new JComboBox();\r
+            jComboBoxFvParaType.addItem("ImageName");\r
+            jComboBoxFvParaType.addItem("Attributes");\r
+            jComboBoxFvParaType.addItem("Options");\r
+            jComboBoxFvParaType.addItem("Components");\r
+            jComboBoxFvParaType.setPreferredSize(new java.awt.Dimension(180,20));\r
+            jComboBoxFvParaType.setEnabled(false);\r
+            jComboBoxFvParaType.addItemListener(new ItemListener() {\r
 \r
                 public void itemStateChanged(ItemEvent arg0) {\r
                     // TODO disable attribute settings when ValidImageNames selected.\r
@@ -610,7 +576,7 @@ public class FpdFlash extends IInternalFrame {
                 \r
             });\r
         }\r
-        return jComboBox;\r
+        return jComboBoxFvParaType;\r
     }\r
 \r
 \r
@@ -619,13 +585,13 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JTextField  \r
      */\r
-    private JTextField getJTextField2() {\r
-        if (jTextField2 == null) {\r
-            jTextField2 = new JTextField();\r
-            jTextField2.setPreferredSize(new java.awt.Dimension(140,20));\r
-            jTextField2.setEnabled(false);\r
+    private JTextField getJTextFieldFvParaName() {\r
+        if (jTextFieldFvParaName == null) {\r
+            jTextFieldFvParaName = new JTextField();\r
+            jTextFieldFvParaName.setPreferredSize(new java.awt.Dimension(140,20));\r
+            jTextFieldFvParaName.setEnabled(false);\r
         }\r
-        return jTextField2;\r
+        return jTextFieldFvParaName;\r
     }\r
 \r
 \r
@@ -634,27 +600,27 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JButton     \r
      */\r
-    private JButton getJButton2() {\r
-        if (jButton2 == null) {\r
-            jButton2 = new JButton();\r
-            jButton2.setPreferredSize(new Dimension(80, 20));\r
-            jButton2.setEnabled(false);\r
-            jButton2.setText("Add");\r
-            jButton2.addActionListener(new AbstractAction() {\r
+    private JButton getJButtonFvParaAdd() {\r
+        if (jButtonFvParaAdd == null) {\r
+            jButtonFvParaAdd = new JButton();\r
+            jButtonFvParaAdd.setPreferredSize(new Dimension(80, 20));\r
+            jButtonFvParaAdd.setEnabled(false);\r
+            jButtonFvParaAdd.setText("Add");\r
+            jButtonFvParaAdd.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 (jTextField2.getText().length() > 0){\r
-                        String[] row = {jTextField2.getText()};                        \r
+                    if (jTextFieldFvParaName.getText().length() > 0){\r
+                        String[] row = {jTextFieldFvParaName.getText()};                        \r
                         fvImageNameTableModel.addRow(row);\r
                     }\r
                 }\r
             });\r
         }\r
-        return jButton2;\r
+        return jButtonFvParaAdd;\r
     }\r
 \r
 \r
@@ -663,13 +629,13 @@ public class FpdFlash extends IInternalFrame {
      *         \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(350,50));\r
-            jScrollPane2.setViewportView(getJTable1());\r
+    private JScrollPane getJScrollPaneFvImageNames() {\r
+        if (jScrollPaneFvImageNames == null) {\r
+            jScrollPaneFvImageNames = new JScrollPane();\r
+            jScrollPaneFvImageNames.setPreferredSize(new java.awt.Dimension(350,50));\r
+            jScrollPaneFvImageNames.setViewportView(getJTableFvImageNames());\r
         }\r
-        return jScrollPane2;\r
+        return jScrollPaneFvImageNames;\r
     }\r
 \r
 \r
@@ -678,14 +644,14 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JTable      \r
      */\r
-    private JTable getJTable1() {\r
-        if (jTable1 == null) {\r
+    private JTable getJTableFvImageNames() {\r
+        if (jTableFvImageNames == null) {\r
             fvImageNameTableModel = new DefaultTableModel();\r
-            jTable1 = new JTable(fvImageNameTableModel);\r
-            jTable1.setEnabled(false);\r
+            jTableFvImageNames = new JTable(fvImageNameTableModel);\r
+            jTableFvImageNames.setEnabled(false);\r
             fvImageNameTableModel.addColumn("FV Image Name");\r
         }\r
-        return jTable1;\r
+        return jTableFvImageNames;\r
     }\r
 \r
 \r
@@ -694,68 +660,68 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JButton     \r
      */\r
-    private JButton getJButton3() {\r
-        if (jButton3 == null) {\r
-            jButton3 = new JButton();\r
-            jButton3.setPreferredSize(new Dimension(80, 20));\r
-            jButton3.setEnabled(false);\r
-            jButton3.setText("Delete");\r
-            jButton3.addActionListener(new AbstractAction() {\r
+    private JButton getJButtonFvParaDel() {\r
+        if (jButtonFvParaDel == null) {\r
+            jButtonFvParaDel = new JButton();\r
+            jButtonFvParaDel.setPreferredSize(new Dimension(80, 20));\r
+            jButtonFvParaDel.setEnabled(false);\r
+            jButtonFvParaDel.setText("Delete");\r
+            jButtonFvParaDel.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 (jTable1.getSelectedRow() >= 0){\r
+                    if (jTableFvImageNames.getSelectedRow() >= 0){\r
                                    \r
-                        fvImageNameTableModel.removeRow(jTable1.getSelectedRow());\r
+                        fvImageNameTableModel.removeRow(jTableFvImageNames.getSelectedRow());\r
                     }\r
                 }\r
             });\r
         }\r
-        return jButton3;\r
+        return jButtonFvParaDel;\r
     }\r
 \r
 \r
 \r
                        \r
-  private JPanel getJPanel5() {\r
+  private JPanel getJPanelFvImageOpts() {\r
                                \r
 \r
- if (jPanel5 == null) {\r
+ if (jPanelFvImageOpts == null) {\r
      //ToDo add ButtonGroup for RadioButtons\r
-            jLabel6 = new JLabel();\r
-            jLabel6.setEnabled(true);\r
-            jLabel6.setText("Value");\r
-            jLabel6.setPreferredSize(new Dimension(38, 20));\r
-            jLabel5 = new JLabel();\r
-            jLabel5.setEnabled(true);\r
-            jLabel5.setText("Name");\r
-            jLabel5.setPreferredSize(new Dimension(38, 20));\r
-            jPanel5 = new JPanel();\r
-            jPanel5.setPreferredSize(new java.awt.Dimension(480,150));\r
+            jLabelFvImageOptValue = new JLabel();\r
+            jLabelFvImageOptValue.setEnabled(true);\r
+            jLabelFvImageOptValue.setText("Value");\r
+            jLabelFvImageOptValue.setPreferredSize(new Dimension(38, 20));\r
+            jLabelFvImageOptName = new JLabel();\r
+            jLabelFvImageOptName.setEnabled(true);\r
+            jLabelFvImageOptName.setText("Name");\r
+            jLabelFvImageOptName.setPreferredSize(new Dimension(38, 20));\r
+            jPanelFvImageOpts = new JPanel();\r
+            jPanelFvImageOpts.setPreferredSize(new java.awt.Dimension(480,150));\r
             \r
-            jPanel5.setLayout(new FlowLayout());\r
+            jPanelFvImageOpts.setLayout(new FlowLayout());\r
             \r
-                       jPanel5.setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.LOWERED));\r
-                       jPanel5.add(getJCheckBox3(), null);\r
-                       jPanel5.add(jLabel5, null);\r
-                       jPanel5.add(getJTextField4(), null);\r
-                       jPanel5.add(jLabel6, null);\r
-                       jPanel5.add(getJTextField5(), null);\r
-                       jPanel5.add(getJScrollPane(), null);\r
-                       jPanel5.add(getJPanel8(), null);\r
-                       jPanel5.add(getJButton4(), null);\r
-                       jPanel5.add(getJButton6(), null);\r
-                       jPanel5.add(getJButton9(), null);\r
+                       jPanelFvImageOpts.setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.LOWERED));\r
+                       jPanelFvImageOpts.add(getJCheckBoxFvImageOpts(), null);\r
+                       jPanelFvImageOpts.add(jLabelFvImageOptName, null);\r
+                       jPanelFvImageOpts.add(getJTextFieldFvImageOptName(), null);\r
+                       jPanelFvImageOpts.add(jLabelFvImageOptValue, null);\r
+                       jPanelFvImageOpts.add(getJTextFieldFvImageOptValue(), null);\r
+                       jPanelFvImageOpts.add(getJScrollPane(), null);\r
+                       jPanelFvImageOpts.add(getJPanelFvImageOptsButtonGroup(), null);\r
+                       jPanelFvImageOpts.add(getJButtonAddFvImage(), null);\r
+                       jPanelFvImageOpts.add(getJButtonDelFvImage(), null);\r
+                       jPanelFvImageOpts.add(getJButtonUpdateFvImage(), null);\r
             \r
             \r
                                \r
 \r
             \r
         }\r
-        return jPanel5;\r
+        return jPanelFvImageOpts;\r
     }\r
 \r
 \r
@@ -764,53 +730,53 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JButton     \r
      */\r
-    private JButton getJButton4() {\r
-        if (jButton4 == null) {\r
-            jButton4 = new JButton();\r
-            jButton4.setPreferredSize(new java.awt.Dimension(120,20));\r
+    private JButton getJButtonAddFvImage() {\r
+        if (jButtonAddFvImage == null) {\r
+            jButtonAddFvImage = new JButton();\r
+            jButtonAddFvImage.setPreferredSize(new java.awt.Dimension(120,20));\r
 //            jButton4.setEnabled(false);\r
-            jButton4.setText("Add FV Image");\r
-            jButton4.addActionListener(new AbstractAction() {\r
+            jButtonAddFvImage.setText("Add FV Image");\r
+            jButtonAddFvImage.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 (jTable2.isEditing()) {\r
-                        jTable2.getCellEditor().stopCellEditing();\r
+                    if (jTableFvInfo.isEditing()) {\r
+                        jTableFvInfo.getCellEditor().stopCellEditing();\r
                     }\r
-                    if (jTable3.isEditing()) {\r
-                        jTable3.getCellEditor().stopCellEditing();\r
+                    if (jTableFvImageOpts.isEditing()) {\r
+                        jTableFvImageOpts.getCellEditor().stopCellEditing();\r
                     }\r
-                    if (jTable1.getRowCount()== 0){\r
+                    if (jTableFvImageNames.getRowCount()== 0){\r
                         return;\r
                     }\r
                     String imageName = " ";\r
-                    for (int i = 0; i < jTable1.getRowCount(); ++i){\r
-                        imageName += (String)jTable1.getValueAt(i, 0);\r
+                    for (int i = 0; i < jTableFvImageNames.getRowCount(); ++i){\r
+                        imageName += (String)jTableFvImageNames.getValueAt(i, 0);\r
                         imageName += " ";\r
                     }\r
                     imageName = imageName.trim();\r
                     \r
-                    if (!jCheckBox3.isSelected() && jComboBox.getSelectedIndex() != 0){\r
+                    if (!jCheckBoxFvImageOpts.isSelected() && jComboBoxFvParaType.getSelectedIndex() != 0){\r
                         return;\r
                       \r
                     }\r
                     \r
                     LinkedHashMap<String, String> m = null;\r
-                    if (jCheckBox3.isSelected()) {\r
+                    if (jCheckBoxFvImageOpts.isSelected()) {\r
                         m = new LinkedHashMap<String, String>();\r
                         getOptionNameValue(m);\r
                     }\r
-                    ffc.genFvImagesFvImage(imageName.split(" "), jComboBox.getSelectedItem()+"", m);\r
+                    ffc.genFvImagesFvImage(imageName.split(" "), jComboBoxFvParaType.getSelectedItem()+"", m);\r
                     docConsole.setSaved(false);\r
-                    Object[] row = {imageName, jComboBox.getSelectedItem()};\r
+ &n