]> git.proxmox.com Git - mirror_edk2.git/blobdiff - Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java
Coding style changes
[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / platform / ui / FpdFlash.java
index 19849d0277f2f6b74e722c5d3f1f374f19d6f7f8..690291bd506ff019613f2734589f91e05f6cacf1 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
+                    Object[] row = {imageName, jComboBoxFvParaType.getSelectedItem()};\r
                     fvImageParaTableModel.addRow(row); \r
                 }\r
             });\r
         }\r
-        return jButton4;\r
+        return jButtonAddFvImage;\r
     }\r
 \r
 \r
@@ -819,13 +785,13 @@ public class FpdFlash 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(480,150));\r
-            jScrollPane3.setViewportView(getJTable2());\r
+    private JScrollPane getJScrollPaneFvInfo() {\r
+        if (jScrollPaneFvInfo == null) {\r
+            jScrollPaneFvInfo = new JScrollPane();\r
+            jScrollPaneFvInfo.setPreferredSize(new java.awt.Dimension(480,150));\r
+            jScrollPaneFvInfo.setViewportView(getJTableFvInfo());\r
         }\r
-        return jScrollPane3;\r
+        return jScrollPaneFvInfo;\r
     }\r
 \r
 \r
@@ -834,15 +800,15 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JTable      \r
      */\r
-    private JTable getJTable2() {\r
-        if (jTable2 == null) {\r
+    private JTable getJTableFvInfo() {\r
+        if (jTableFvInfo == null) {\r
             fvImageParaTableModel = new ImageParaTableModel();\r
-            jTable2 = new JTable(fvImageParaTableModel);\r
+            jTableFvInfo = new JTable(fvImageParaTableModel);\r
             fvImageParaTableModel.addColumn("FvImageNames");\r
             fvImageParaTableModel.addColumn("Type");\r
             \r
             \r
-            TableColumn typeCol = jTable2.getColumnModel().getColumn(1);\r
+            TableColumn typeCol = jTableFvInfo.getColumnModel().getColumn(1);\r
             JComboBox cb = new JComboBox();\r
             cb.addItem("ValidImageNames");\r
             cb.addItem("Attributes");\r
@@ -850,8 +816,8 @@ public class FpdFlash extends IInternalFrame {
             cb.addItem("Components");\r
             typeCol.setCellEditor(new DefaultCellEditor(cb));\r
             \r
-            jTable2.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
-            jTable2.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
+            jTableFvInfo.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
+            jTableFvInfo.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
                 public void valueChanged(ListSelectionEvent e) {\r
                     if (e.getValueIsAdjusting()){\r
                         return;\r
@@ -883,7 +849,7 @@ public class FpdFlash extends IInternalFrame {
             \r
             \r
         }\r
-        return jTable2;\r
+        return jTableFvInfo;\r
     }\r
 \r
 \r
@@ -892,13 +858,13 @@ public class FpdFlash 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(120,20));\r
+    private JButton getJButtonDelFvImage() {\r
+        if (jButtonDelFvImage == null) {\r
+            jButtonDelFvImage = new JButton();\r
+            jButtonDelFvImage.setPreferredSize(new java.awt.Dimension(120,20));\r
 //            jButton6.setEnabled(false);\r
-            jButton6.setText("Delete Row");\r
-            jButton6.addActionListener(new AbstractAction() {\r
+            jButtonDelFvImage.setText("Delete Row");\r
+            jButtonDelFvImage.addActionListener(new AbstractAction() {\r
                 /**\r
                  * \r
                  */\r
@@ -906,16 +872,16 @@ public class FpdFlash extends IInternalFrame {
 \r
                 public void actionPerformed(ActionEvent arg0) {\r
                     // TODO Auto-generated method stub\r
-                    if (jTable2.getSelectedRow() >= 0 ) {\r
-                        ffc.removeFvImagesFvImage(jTable2.getSelectedRow());\r
-                        fvImageParaTableModel.removeRow(jTable2.getSelectedRow());\r
+                    if (jTableFvInfo.getSelectedRow() >= 0 ) {\r
+                        ffc.removeFvImagesFvImage(jTableFvInfo.getSelectedRow());\r
+                        fvImageParaTableModel.removeRow(jTableFvInfo.getSelectedRow());\r
                         docConsole.setSaved(false);\r
                     }\r
                 }\r
                 \r
             });\r
         }\r
-        return jButton6;\r
+        return jButtonDelFvImage;\r
     }\r
 \r
 \r
@@ -924,17 +890,17 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JCheckBox   \r
      */\r
-    private JCheckBox getJCheckBox3() {\r
-        if (jCheckBox3 == null) {\r
-            jCheckBox3 = new JCheckBox();\r
-            jCheckBox3.setText("FV Image Options");\r
-            jCheckBox3.addItemListener(new ItemListener(){\r
+    private JCheckBox getJCheckBoxFvImageOpts() {\r
+        if (jCheckBoxFvImageOpts == null) {\r
+            jCheckBoxFvImageOpts = new JCheckBox();\r
+            jCheckBoxFvImageOpts.setText("FV Image Options");\r
+            jCheckBoxFvImageOpts.addItemListener(new ItemListener(){\r
 \r
                 public void itemStateChanged(ItemEvent arg0) {\r
                     // TODO Auto-generated method stub\r
 //                    boolean selected = jCheckBox3.isSelected();\r
                     \r
-                        if (!jCheckBox2.isSelected() || jComboBox.getSelectedIndex() == 0) {\r
+                        if (!jCheckBoxFvImagePara.isSelected() || jComboBoxFvParaType.getSelectedIndex() == 0) {\r
                             return;\r
                         }\r
                         \r
@@ -949,7 +915,7 @@ public class FpdFlash extends IInternalFrame {
                 \r
             });\r
         }\r
-        return jCheckBox3;\r
+        return jCheckBoxFvImageOpts;\r
     }\r
 \r
 \r
@@ -958,25 +924,25 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel6() {\r
-        if (jPanel6 == null) {\r
+    private JPanel getJPanelFvImagePara() {\r
+        if (jPanelFvImagePara == null) {\r
             StarLabel starLabel = new StarLabel();\r
             starLabel.setVisible(false);\r
-            jPanel6 = new JPanel();\r
-            jPanel6.setPreferredSize(new java.awt.Dimension(480,120));\r
-            jPanel6.setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.RAISED));\r
-            jPanel6.add(getJCheckBox2(), null);\r
-            jPanel6.add(jLabel2, null);\r
-            jPanel6.add(getJComboBox(), null);\r
-            jPanel6.add(new StarLabel(), null);\r
-            jPanel6.add(jLabel3, null);\r
-            jPanel6.add(jLabel4, null);\r
-            jPanel6.add(getJTextField2(), null);\r
-            jPanel6.add(getJButton2(), null);\r
-            jPanel6.add(getJScrollPane2(), null);\r
-            jPanel6.add(getJButton3(), null);\r
+            jPanelFvImagePara = new JPanel();\r
+            jPanelFvImagePara.setPreferredSize(new java.awt.Dimension(480,120));\r
+            jPanelFvImagePara.setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.RAISED));\r
+            jPanelFvImagePara.add(getJCheckBoxFvImagePara(), null);\r
+            jPanelFvImagePara.add(jLabelFvParaType, null);\r
+            jPanelFvImagePara.add(getJComboBoxFvParaType(), null);\r
+            jPanelFvImagePara.add(new StarLabel(), null);\r
+            jPanelFvImagePara.add(jLabelFvImageNames, null);\r
+            jPanelFvImagePara.add(jLabelFvParaName, null);\r
+            jPanelFvImagePara.add(getJTextFieldFvParaName(), null);\r
+            jPanelFvImagePara.add(getJButtonFvParaAdd(), null);\r
+            jPanelFvImagePara.add(getJScrollPaneFvImageNames(), null);\r
+            jPanelFvImagePara.add(getJButtonFvParaDel(), null);\r
         }\r
-        return jPanel6;\r
+        return jPanelFvImagePara;\r
     }\r
 \r
     /**\r
@@ -984,29 +950,29 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel7() {\r
-        if (jPanel7 == null) {\r
+    private JPanel getJPanelFdf() {\r
+        if (jPanelFdf == null) {\r
             FlowLayout flowLayout1 = new FlowLayout();\r
             flowLayout1.setAlignment(FlowLayout.LEFT);\r
-            jPanel7 = new JPanel();\r
-            jPanel7.setLayout(flowLayout1);\r
-            jPanel7.add(getJCheckBox(), null);\r
-            jPanel7.add(getJTextField3(), null);\r
-            jPanel7.add(getJButton5(), null);\r
-            jPanel7.addComponentListener(new ComponentAdapter(){\r
+            jPanelFdf = new JPanel();\r
+            jPanelFdf.setLayout(flowLayout1);\r
+            jPanelFdf.add(getJCheckBoxFdf(), null);\r
+            jPanelFdf.add(getJTextFieldFdf(), null);\r
+            jPanelFdf.add(getJButtonFdfBrowse(), null);\r
+            jPanelFdf.addComponentListener(new ComponentAdapter(){\r
                 public void componentShown(ComponentEvent e) {\r
                     if (ffc.getFlashDefinitionFile() != null) {\r
-                        jTextField3.setText(ffc.getFlashDefinitionFile());\r
+                        jTextFieldFdf.setText(ffc.getFlashDefinitionFile());\r
                     }\r
                 }\r
                 public void componentHidden(ComponentEvent e) {\r
-                    if (jCheckBox.isSelected()) {\r
-                        ffc.genFlashDefinitionFile(jTextField3.getText());\r
+                    if (jCheckBoxFdf.isSelected()) {\r
+                        ffc.genFlashDefinitionFile(jTextFieldFdf.getText());\r
                     }\r
                 }\r
             });\r
         }\r
-        return jPanel7;\r
+        return jPanelFdf;\r
     }\r
 \r
     /**\r
@@ -1014,27 +980,27 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JCheckBox   \r
      */\r
-    private JCheckBox getJCheckBox() {\r
-        if (jCheckBox == null) {\r
-            jCheckBox = new JCheckBox();\r
-            jCheckBox.setText("Flash Definition File");\r
-            jCheckBox.addItemListener(new ItemListener() {\r
+    private JCheckBox getJCheckBoxFdf() {\r
+        if (jCheckBoxFdf == null) {\r
+            jCheckBoxFdf = new JCheckBox();\r
+            jCheckBoxFdf.setText("Flash Definition File");\r
+            jCheckBoxFdf.addItemListener(new ItemListener() {\r
 \r
                 public void itemStateChanged(ItemEvent arg0) {\r
                     // TODO Auto-generated method stub\r
-                    if (jCheckBox.isSelected()){\r
-                        jTextField3.setEnabled(true);\r
-                        jButton5.setEnabled(true);\r
+                    if (jCheckBoxFdf.isSelected()){\r
+                        jTextFieldFdf.setEnabled(true);\r
+                        jButtonFdfBrowse.setEnabled(true);\r
                     }\r
                     else {\r
                         \r
-                        jTextField3.setEnabled(false);\r
-                        jButton5.setEnabled(false);\r
+                        jTextFieldFdf.setEnabled(false);\r
+                        jButtonFdfBrowse.setEnabled(false);\r
                     }\r
                 }\r
             });\r
         }\r
-        return jCheckBox;\r
+        return jCheckBoxFdf;\r
     }\r
 \r
     /**\r
@@ -1042,18 +1008,18 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JTextField  \r
      */\r
-    private JTextField getJTextField3() {\r
-        if (jTextField3 == null) {\r
-            jTextField3 = new JTextField();\r
-            jTextField3.setEnabled(false);\r
-            jTextField3.setPreferredSize(new Dimension(300, 20));\r
-            jTextField3.addFocusListener(new java.awt.event.FocusAdapter() {\r
+    private JTextField getJTextFieldFdf() {\r
+        if (jTextFieldFdf == null) {\r
+            jTextFieldFdf = new JTextField();\r
+            jTextFieldFdf.setEnabled(false);\r
+            jTextFieldFdf.setPreferredSize(new Dimension(300, 20));\r
+            jTextFieldFdf.addFocusListener(new java.awt.event.FocusAdapter() {\r
                 public void focusLost(java.awt.event.FocusEvent e) {\r
-                    ffc.genFlashDefinitionFile(jTextField3.getText());\r
+                    ffc.genFlashDefinitionFile(jTextFieldFdf.getText());\r
                 }\r
             });\r
         }\r
-        return jTextField3;\r
+        return jTextFieldFdf;\r
     }\r
 \r
     /**\r
@@ -1061,13 +1027,13 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JButton     \r
      */\r
-    private JButton getJButton5() {\r
-        if (jButton5 == null) {\r
-            jButton5 = new JButton();\r
-            jButton5.setEnabled(false);\r
-            jButton5.setText("Browse");\r
-            jButton5.setPreferredSize(new Dimension(78, 20));\r
-            jButton5.addActionListener(new AbstractAction(){\r
+    private JButton getJButtonFdfBrowse() {\r
+        if (jButtonFdfBrowse == null) {\r
+            jButtonFdfBrowse = new JButton();\r
+            jButtonFdfBrowse.setEnabled(false);\r
+            jButtonFdfBrowse.setText("Browse");\r
+            jButtonFdfBrowse.setPreferredSize(new Dimension(78, 20));\r
+            jButtonFdfBrowse.addActionListener(new AbstractAction(){\r
                 /**\r
                  * \r
                  */\r
@@ -1088,13 +1054,13 @@ public class FpdFlash extends IInternalFrame {
                             JOptionPane.showMessageDialog(frame, "You can only select files in current WORKSPACE.");\r
                             return;\r
                         }\r
-                        jTextField3.setText(filePath.substring(wsDir.length() + 1).replace('\\', '/'));\r
+                        jTextFieldFdf.setText(filePath.substring(wsDir.length() + 1).replace('\\', '/'));\r
                     }\r
                 }\r
                 \r
             });\r
         }\r
-        return jButton5;\r
+        return jButtonFdfBrowse;\r
     }\r
 \r
     /**\r
@@ -1102,13 +1068,13 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JTextField  \r
      */\r
-    private JTextField getJTextField4() {\r
-        if (jTextField4 == null) {\r
-            jTextField4 = new JTextField();\r
-            jTextField4.setEnabled(true);\r
-            jTextField4.setPreferredSize(new Dimension(100, 20));\r
+    private JTextField getJTextFieldFvImageOptName() {\r
+        if (jTextFieldFvImageOptName == null) {\r
+            jTextFieldFvImageOptName = new JTextField();\r
+            jTextFieldFvImageOptName.setEnabled(true);\r
+            jTextFieldFvImageOptName.setPreferredSize(new Dimension(100, 20));\r
         }\r
-        return jTextField4;\r
+        return jTextFieldFvImageOptName;\r
     }\r
 \r
     /**\r
@@ -1116,13 +1082,13 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JTextField  \r
      */\r
-    private JTextField getJTextField5() {\r
-        if (jTextField5 == null) {\r
-            jTextField5 = new JTextField();\r
-            jTextField5.setEnabled(true);\r
-            jTextField5.setPreferredSize(new Dimension(100, 20));\r
+    private JTextField getJTextFieldFvImageOptValue() {\r
+        if (jTextFieldFvImageOptValue == null) {\r
+            jTextFieldFvImageOptValue = new JTextField();\r
+            jTextFieldFvImageOptValue.setEnabled(true);\r
+            jTextFieldFvImageOptValue.setPreferredSize(new Dimension(100, 20));\r
         }\r
-        return jTextField5;\r
+        return jTextFieldFvImageOptValue;\r
     }\r
 \r
     /**\r
@@ -1130,14 +1096,14 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JPanel      \r
      */\r
-    private JPanel getJPanel8() {\r
-        if (jPanel8 == null) {\r
-            jPanel8 = new JPanel();\r
-            jPanel8.setPreferredSize(new Dimension(80, 55));\r
-            jPanel8.add(getJButton7(), null);\r
-            jPanel8.add(getJButton8(), null);\r
+    private JPanel getJPanelFvImageOptsButtonGroup() {\r
+        if (jPanelFvImageOptsButtonGroup == null) {\r
+            jPanelFvImageOptsButtonGroup = new JPanel();\r
+            jPanelFvImageOptsButtonGroup.setPreferredSize(new Dimension(80, 55));\r
+            jPanelFvImageOptsButtonGroup.add(getJButtonFvImageOptAdd(), null);\r
+            jPanelFvImageOptsButtonGroup.add(getJButtonFvImageOptDel(), null);\r
         }\r
-        return jPanel8;\r
+        return jPanelFvImageOptsButtonGroup;\r
     }\r
 \r
     /**\r
@@ -1145,27 +1111,27 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JButton     \r
      */\r
-    private JButton getJButton7() {\r
-        if (jButton7 == null) {\r
-            jButton7 = new JButton();\r
-            jButton7.setEnabled(true);\r
-            jButton7.setText("Add");\r
-            jButton7.setPreferredSize(new Dimension(80, 20));\r
-            jButton7.addActionListener(new AbstractAction() {\r
+    private JButton getJButtonFvImageOptAdd() {\r
+        if (jButtonFvImageOptAdd == null) {\r
+            jButtonFvImageOptAdd = new JButton();\r
+            jButtonFvImageOptAdd.setEnabled(true);\r
+            jButtonFvImageOptAdd.setText("Add");\r
+            jButtonFvImageOptAdd.setPreferredSize(new Dimension(80, 20));\r
+            jButtonFvImageOptAdd.addActionListener(new AbstractAction() {\r
                 /**\r
                  * \r
                  */\r
                 private static final long serialVersionUID = 1L;\r
 \r
                 public void actionPerformed(ActionEvent e) {\r
-                    if (jTextField4.getText().length() > 0 && jTextField5.getText().length() > 0){\r
-                        String[] row = {jTextField4.getText(), jTextField5.getText()};                        \r
+                    if (jTextFieldFvImageOptName.getText().length() > 0 && jTextFieldFvImageOptValue.getText().length() > 0){\r
+                        String[] row = {jTextFieldFvImageOptName.getText(), jTextFieldFvImageOptValue.getText()};                        \r
                         fvOptionTableModel.addRow(row);\r
                     }\r
                 }\r
             });\r
         }\r
-        return jButton7;\r
+        return jButtonFvImageOptAdd;\r
     }\r
 \r
     /**\r
@@ -1173,26 +1139,26 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JButton     \r
      */\r
-    private JButton getJButton8() {\r
-        if (jButton8 == null) {\r
-            jButton8 = new JButton();\r
-            jButton8.setEnabled(true);\r
-            jButton8.setText("Delete");\r
-            jButton8.setPreferredSize(new Dimension(80, 20));\r
-            jButton8.addActionListener(new AbstractAction() {\r
+    private JButton getJButtonFvImageOptDel() {\r
+        if (jButtonFvImageOptDel == null) {\r
+            jButtonFvImageOptDel = new JButton();\r
+            jButtonFvImageOptDel.setEnabled(true);\r
+            jButtonFvImageOptDel.setText("Delete");\r
+            jButtonFvImageOptDel.setPreferredSize(new Dimension(80, 20));\r
+            jButtonFvImageOptDel.addActionListener(new AbstractAction() {\r
                 /**\r
                  * \r
                  */\r
                 private static final long serialVersionUID = 1L;\r
 \r
                 public void actionPerformed(ActionEvent e) {\r
-                    if (jTable3.getSelectedRow() >= 0){\r
-                        fvOptionTableModel.removeRow(jTable.getSelectedRow());\r
+                    if (jTableFvImageOpts.getSelectedRow() >= 0){\r
+                        fvOptionTableModel.removeRow(jTableFvProp.getSelectedRow());\r
                     }\r
                 }\r
             });\r
         }\r
-        return jButton8;\r
+        return jButtonFvImageOptDel;\r
     }\r
 \r
     /**\r
@@ -1204,7 +1170,7 @@ public class FpdFlash extends IInternalFrame {
         if (jScrollPane == null) {\r
             jScrollPane = new JScrollPane();\r
             jScrollPane.setPreferredSize(new java.awt.Dimension(350,80));\r
-            jScrollPane.setViewportView(getJTable3());\r
+            jScrollPane.setViewportView(getJTableFvImageOpts());\r
         }\r
         return jScrollPane;\r
     }\r
@@ -1214,18 +1180,18 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JTable      \r
      */\r
-    private JTable getJTable3() {\r
-        if (jTable3 == null) {\r
+    private JTable getJTableFvImageOpts() {\r
+        if (jTableFvImageOpts == null) {\r
             fvOptionTableModel = new DefaultTableModel();\r
             fvOptionTableModel.addColumn("Name");\r
             fvOptionTableModel.addColumn("Value");\r
-            jTable3 = new JTable(fvOptionTableModel);\r
+            jTableFvImageOpts = new JTable(fvOptionTableModel);\r
 \r
-            jTable3.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
-            jTable3.setRowHeight(20);\r
+            jTableFvImageOpts.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
+            jTableFvImageOpts.setRowHeight(20);\r
             \r
         }\r
-        return jTable3;\r
+        return jTableFvImageOpts;\r
     }\r
 \r
     /**\r
@@ -1233,20 +1199,20 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return javax.swing.JButton     \r
      */\r
-    private JButton getJButton9() {\r
-        if (jButton9 == null) {\r
-            jButton9 = new JButton();\r
-            jButton9.setPreferredSize(new Dimension(120, 20));\r
-            jButton9.setActionCommand("Update");\r
-            jButton9.setText("Update FV");\r
-            jButton9.addActionListener(new java.awt.event.ActionListener() {\r
+    private JButton getJButtonUpdateFvImage() {\r
+        if (jButtonUpdateFvImage == null) {\r
+            jButtonUpdateFvImage = new JButton();\r
+            jButtonUpdateFvImage.setPreferredSize(new Dimension(120, 20));\r
+            jButtonUpdateFvImage.setActionCommand("Update");\r
+            jButtonUpdateFvImage.setText("Update FV");\r
+            jButtonUpdateFvImage.addActionListener(new java.awt.event.ActionListener() {\r
                 public void actionPerformed(java.awt.event.ActionEvent e) {\r
-                    int row = jTable2.getSelectedRow();\r
-                    if (jTable2.isEditing()) {\r
-                        jTable2.getCellEditor().stopCellEditing();\r
+                    int row = jTableFvInfo.getSelectedRow();\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
                     \r
                         //ToDo Check data validity before update\r
@@ -1262,7 +1228,7 @@ public class FpdFlash extends IInternalFrame {
                 }\r
             });\r
         }\r
-        return jButton9;\r
+        return jButtonUpdateFvImage;\r
     }\r
 \r
     /**\r
@@ -1285,14 +1251,14 @@ public class FpdFlash extends IInternalFrame {
         this.setTitle("FPD Flash Definitions");\r
         this.addInternalFrameListener(new InternalFrameAdapter(){\r
             public void internalFrameDeactivated(InternalFrameEvent e){\r
-                if (jTable.isEditing()) {\r
-                    jTable.getCellEditor().stopCellEditing();\r
+                if (jTableFvProp.isEditing()) {\r
+                    jTableFvProp.getCellEditor().stopCellEditing();\r
                 }\r
-                if (jTable1.isEditing()) {\r
-                    jTable1.getCellEditor().stopCellEditing();\r
+                if (jTableFvImageNames.isEditing()) {\r
+                    jTableFvImageNames.getCellEditor().stopCellEditing();\r
                 }\r
-                if (jTable2.isEditing()) {\r
-                    jTable2.getCellEditor().stopCellEditing();\r
+                if (jTableFvInfo.isEditing()) {\r
+                    jTableFvInfo.getCellEditor().stopCellEditing();\r
                 }\r
             }\r
         });\r
@@ -1325,7 +1291,7 @@ public class FpdFlash extends IInternalFrame {
     }\r
     \r
     private void getOptionNameValue(Map<String, String> m){\r
-        for (int i = 0; i < jTable3.getRowCount(); ++i) {\r
+        for (int i = 0; i < jTableFvImageOpts.getRowCount(); ++i) {\r
             m.put(fvOptionTableModel.getValueAt(i, 0)+"", fvOptionTableModel.getValueAt(i, 1)+"");\r
         }\r
     }\r
@@ -1338,10 +1304,10 @@ public class FpdFlash extends IInternalFrame {
         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.SOUTH);\r
-            jContentPane.add(getJPanel2(), java.awt.BorderLayout.WEST);\r
-            jContentPane.add(getJPanel3(), java.awt.BorderLayout.NORTH);\r
+            jContentPane.add(getJPanelContentEast(), java.awt.BorderLayout.EAST);\r
+            jContentPane.add(getJPanelContentSouth(), java.awt.BorderLayout.SOUTH);\r
+            jContentPane.add(getJPanelContentWest(), java.awt.BorderLayout.WEST);\r
+            jContentPane.add(getJPanelContentNorth(), java.awt.BorderLayout.NORTH);\r
             jContentPane.add(getJTabbedPane(), java.awt.BorderLayout.CENTER);\r
         }\r
         return jContentPane;\r