Flash UI add new FV feature. modify FvImageNames and FvBindings in fpd file if FV...

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
index 528bdfc50fbd5f505837d6b166a5649d7d4540be..12dd2fd4453ac086629e177aa64f16e21d7213ec 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
@@ -746,11 +746,15 @@ public class FpdFileContents {
     }\r
     \r
     public String getFvBinding(String moduleKey){\r
     }\r
     \r
     public String getFvBinding(String moduleKey){\r

-        ModuleSADocument.ModuleSA msa = getModuleSA(moduleKey);\r
-        if (msa == null || msa.getModuleSaBuildOptions() == null) {\r
+        ModuleSADocument.ModuleSA moduleSa = getModuleSA(moduleKey);\r
+        return getFvBinding (moduleSa);\r
+    }\r
+    \r
+    public String getFvBinding (ModuleSADocument.ModuleSA moduleSa) {\r
+        if (moduleSa == null || moduleSa.getModuleSaBuildOptions() == null) {\r

             return null;\r
         }\r
             return null;\r
         }\r

-        return msa.getModuleSaBuildOptions().getFvBinding();\r
+        return moduleSa.getModuleSaBuildOptions().getFvBinding();\r

     }\r
     \r
     public void setFvBinding(ModuleSADocument.ModuleSA moduleSa, String fvBinding) {\r
     }\r
     \r
     public void setFvBinding(ModuleSADocument.ModuleSA moduleSa, String fvBinding) {\r


@@ -776,6 +780,23 @@ public class FpdFileContents {
         setFvBinding (moduleSa, fvBinding);\r
     }\r
     \r
         setFvBinding (moduleSa, fvBinding);\r
     }\r
     \r

+    private int fvBindingForModuleSA (ModuleSADocument.ModuleSA moduleSa, String fvName) {\r
+        if (moduleSa == null || moduleSa.getModuleSaBuildOptions() == null || moduleSa.getModuleSaBuildOptions().getFvBinding() == null) {\r
+            return -1;\r
+        }\r
+        \r
+        String fvNameList = moduleSa.getModuleSaBuildOptions().getFvBinding();\r
+        String[] fvNamesArray = fvNameList.split(" ");\r
+        int occursAt = -1;\r
+        for (int i = 0; i < fvNamesArray.length; ++i) {\r
+            if (fvNamesArray[i].equals(fvName)) {\r
+                occursAt = i;\r
+                break;\r
+            }\r
+        }\r
+        return occursAt;\r
+    }\r
+    \r

     public void removeFvBinding (ModuleSADocument.ModuleSA moduleSa, String fvName) {\r
         if (moduleSa == null || moduleSa.getModuleSaBuildOptions() == null || moduleSa.getModuleSaBuildOptions().getFvBinding() == null) {\r
             return;\r
     public void removeFvBinding (ModuleSADocument.ModuleSA moduleSa, String fvName) {\r
         if (moduleSa == null || moduleSa.getModuleSaBuildOptions() == null || moduleSa.getModuleSaBuildOptions().getFvBinding() == null) {\r
             return;\r


@@ -821,6 +842,37 @@ public class FpdFileContents {
         }\r
     }\r
     \r
         }\r
     }\r
     \r

+    public void appendFvBindingAll (String fvName) {\r
+        if (getfpdFrameworkModules().getModuleSAList() == null || getfpdFrameworkModules().getModuleSAList().size() == 0){\r
+            removeElement(getfpdFrameworkModules());\r
+            fpdFrameworkModules = null;\r
+            return;\r
+        }\r
+        \r
+        Iterator<ModuleSADocument.ModuleSA> li = getfpdFrameworkModules().getModuleSAList().iterator();\r
+        while (li.hasNext()) {\r
+            ModuleSADocument.ModuleSA moduleSa = li.next();\r
+            appendFvBinding (moduleSa, fvName); \r
+        }\r
+    }\r
+    \r
+    public void appendFvBindingFor (String oldFvName, String newFvName) {\r
+        if (getfpdFrameworkModules().getModuleSAList() == null || getfpdFrameworkModules().getModuleSAList().size() == 0){\r
+            removeElement(getfpdFrameworkModules());\r
+            fpdFrameworkModules = null;\r
+            return;\r
+        }\r
+        \r
+        Iterator<ModuleSADocument.ModuleSA> li = getfpdFrameworkModules().getModuleSAList().iterator();\r
+        while (li.hasNext()) {\r
+            ModuleSADocument.ModuleSA moduleSa = li.next();\r
+            String fvBinding = getFvBinding (moduleSa);\r
+            if (fvBinding != null && fvBindingForModuleSA (moduleSa, oldFvName) >= 0) {\r
+                appendFvBinding (moduleSa, newFvName); \r
+            }\r
+        }\r
+    }\r
+    \r

     public void appendFvBinding (String moduleKey, String fvName) {\r
         ModuleSADocument.ModuleSA moduleSa = getModuleSA(moduleKey);\r
         appendFvBinding (moduleSa, fvName);\r
     public void appendFvBinding (String moduleKey, String fvName) {\r
         ModuleSADocument.ModuleSA moduleSa = getModuleSA(moduleKey);\r
         appendFvBinding (moduleSa, fvName);\r


@@ -1602,23 +1654,28 @@ public class FpdFileContents {
     }\r
     \r
     public void genBuildOptionsUserExtensions(String fvName, String outputFileName, Vector<String[]> includeModules) {\r
     }\r
     \r
     public void genBuildOptionsUserExtensions(String fvName, String outputFileName, Vector<String[]> includeModules) {\r

+        QName elementFvName = new QName (xmlNs, "FvName");\r
+        QName elementIncludeModules = new QName(xmlNs, "IncludeModules");\r
+        QName elementInfFileName = new QName(xmlNs, "InfFileName");\r
+        QName elementModule = new QName(xmlNs, "Module");\r
+        \r

         UserExtensionsDocument.UserExtensions userExts = getfpdBuildOpts().addNewUserExtensions();\r
         userExts.setUserID("IMAGES");\r
         userExts.setIdentifier(new BigInteger("1"));\r
         XmlCursor cursor = userExts.newCursor();\r
         cursor.toEndToken();\r
         \r
         UserExtensionsDocument.UserExtensions userExts = getfpdBuildOpts().addNewUserExtensions();\r
         userExts.setUserID("IMAGES");\r
         userExts.setIdentifier(new BigInteger("1"));\r
         XmlCursor cursor = userExts.newCursor();\r
         cursor.toEndToken();\r
         \r

-        cursor.beginElement("FvName");\r
+        cursor.beginElement(elementFvName);\r

         cursor.insertChars(fvName);\r
         cursor.toNextToken();\r
         \r
         cursor.insertChars(fvName);\r
         cursor.toNextToken();\r
         \r

-        cursor.beginElement("InfFileName");\r
+        cursor.beginElement(elementInfFileName);\r

         cursor.insertChars(fvName + ".inf");\r
         cursor.toNextToken();\r
         \r
         cursor.insertChars(fvName + ".inf");\r
         cursor.toNextToken();\r
         \r

-        cursor.beginElement("IncludeModules");\r
+        cursor.beginElement(elementIncludeModules);\r

         for (int i = 0; i < includeModules.size(); ++i) {\r
         for (int i = 0; i < includeModules.size(); ++i) {\r

-            cursor.beginElement("Module");\r
+            cursor.beginElement(elementModule);\r

             cursor.insertAttributeWithValue("ModuleGuid", includeModules.get(i)[0]);\r
             cursor.insertAttributeWithValue("BaseName", includeModules.get(i)[1]);\r
             cursor.toEndToken();\r
             cursor.insertAttributeWithValue("ModuleGuid", includeModules.get(i)[0]);\r
             cursor.insertAttributeWithValue("BaseName", includeModules.get(i)[1]);\r
             cursor.toEndToken();\r


@@ -1632,6 +1689,7 @@ public class FpdFileContents {
             return -1;\r
         }\r
         ListIterator<UserExtensionsDocument.UserExtensions> li = getfpdBuildOpts().getUserExtensionsList().listIterator();\r
             return -1;\r
         }\r
         ListIterator<UserExtensionsDocument.UserExtensions> li = getfpdBuildOpts().getUserExtensionsList().listIterator();\r

+        QName elementIncludeModules = new QName(xmlNs, "IncludeModules");\r

         while (li.hasNext()) {\r
             UserExtensionsDocument.UserExtensions ues = li.next();\r
             if (!ues.getUserID().equals("IMAGES")) {\r
         while (li.hasNext()) {\r
             UserExtensionsDocument.UserExtensions ues = li.next();\r
             if (!ues.getUserID().equals("IMAGES")) {\r


@@ -1641,7 +1699,7 @@ public class FpdFileContents {
             cursor.toFirstChild();\r
             String elementName = cursor.getTextValue();\r
             if (elementName.equals(fvName)) {\r
             cursor.toFirstChild();\r
             String elementName = cursor.getTextValue();\r
             if (elementName.equals(fvName)) {\r

-                cursor.toNextSibling(new QName("", "IncludeModules"));\r
+                cursor.toNextSibling(elementIncludeModules);\r

                 if (cursor.toFirstChild()) {\r
                     int i = 1;\r
                     for (i = 1; cursor.toNextSibling(); ++i);\r
                 if (cursor.toFirstChild()) {\r
                     int i = 1;\r
                     for (i = 1; cursor.toNextSibling(); ++i);\r


@@ -1660,6 +1718,45 @@ public class FpdFileContents {
         if (getfpdBuildOpts().getUserExtensionsList() == null) {\r
             return;\r
         }\r
         if (getfpdBuildOpts().getUserExtensionsList() == null) {\r
             return;\r
         }\r

+        \r
+        XmlCursor cursor = getfpdBuildOpts().newCursor();\r
+        QName elementUserExts = new QName (xmlNs, "UserExtensions");\r
+        QName attribUserId = new QName ("UserID");\r
+        QName elementFvName = new QName (xmlNs, "FvName");\r
+        QName elementIncludeModules = new QName(xmlNs, "IncludeModules");\r
+        QName attribModuleGuid = new QName("ModuleGuid");\r
+        QName attribBaseName = new QName("BaseName");\r
+        \r
+        if (cursor.toChild(elementUserExts)) {\r
+            do {\r
+                cursor.push();\r
+                if (cursor.getAttributeText(attribUserId).equals("IMAGES")) {\r
+                    cursor.toChild(elementFvName);\r
+                    String elementName = cursor.getTextValue();\r
+                    if (elementName.equals(fvName)) {\r
+                        cursor.toNextSibling(elementIncludeModules);\r
+                        if (cursor.toFirstChild()) {\r
+                            int i = 0;\r
+                            do {\r
+                                saa[i][0] = cursor.getAttributeText(attribModuleGuid);\r
+                                saa[i][1] = cursor.getAttributeText(attribBaseName);\r
+                                ++i;\r
+                            }while (cursor.toNextSibling());\r
+                        }\r
+                        break;\r
+                    }\r
+                }\r
+                cursor.pop();\r
+            }while (cursor.toNextSibling(elementUserExts));\r
+        }\r
+        cursor.dispose();\r
+        \r
+    }\r
+    \r
+    public void updateBuildOptionsUserExtensions (String oldFvName, String newFvName) {\r
+        if (getfpdBuildOpts().getUserExtensionsList() == null) {\r
+            return;\r
+        }\r

         ListIterator<UserExtensionsDocument.UserExtensions> li = getfpdBuildOpts().getUserExtensionsList().listIterator();\r
         while (li.hasNext()) {\r
             UserExtensionsDocument.UserExtensions ues = li.next();\r
         ListIterator<UserExtensionsDocument.UserExtensions> li = getfpdBuildOpts().getUserExtensionsList().listIterator();\r
         while (li.hasNext()) {\r
             UserExtensionsDocument.UserExtensions ues = li.next();\r


@@ -1669,18 +1766,8 @@ public class FpdFileContents {
             XmlCursor cursor = ues.newCursor();\r
             cursor.toFirstChild();\r
             String elementName = cursor.getTextValue();\r
             XmlCursor cursor = ues.newCursor();\r
             cursor.toFirstChild();\r
             String elementName = cursor.getTextValue();\r

-            if (elementName.equals(fvName)) {\r
-                cursor.toNextSibling(new QName("", "IncludeModules"));\r
-                if (cursor.toFirstChild()) {\r
-                    int i = 0;\r
-                    do {\r
-                        saa[i][0] = cursor.getAttributeText(new QName("ModuleGuid"));\r
-                        saa[i][1] = cursor.getAttributeText(new QName("BaseName"));\r
-                        ++i;\r
-                    }while (cursor.toNextSibling());\r
-                }\r
-                cursor.dispose();\r
-                return;\r
+            if (elementName.equals(oldFvName)) {\r
+                cursor.setTextValue(newFvName);\r

             }\r
             cursor.dispose();\r
         }\r
             }\r
             cursor.dispose();\r
         }\r


@@ -2501,6 +2588,31 @@ public class FpdFileContents {
         }\r
     }\r
     \r
         }\r
     }\r
     \r

+    public void getFvImagesFvImageFvImageNames (Vector<String> vImageNames) {\r
+        \r
+    }\r
+    \r
+    public void AddFvImageFvImageNames (String[] fvNames) {\r
+        FvImagesDocument.FvImages fis = getfpdFlash().getFvImages();\r
+        if (fis == null || fis.getFvImageList() == null) {\r
+            genFvImagesFvImage (fvNames, "ImageName", null);\r
+            return;\r
+        }\r
+        \r
+        ListIterator<FvImagesDocument.FvImages.FvImage> li = fis.getFvImageList().listIterator();\r
+        while (li.hasNext()) {\r
+            FvImagesDocument.FvImages.FvImage fi = li.next();\r
+            if (fi.getType().toString().equals("ImageName")) {\r
+                for (int i = 0; i < fvNames.length; ++i) {\r
+                    fi.addFvImageNames(fvNames[i]);\r
+                }\r
+                return;\r
+            }\r
+        }\r
+        genFvImagesFvImage (fvNames, "ImageName", null);\r
+        \r
+    }\r
+    \r

     public void genFvImagesFvImage(String[] names, String types, Map<String, String> options) {\r
       \r
         FvImagesDocument.FvImages fis = null;\r
     public void genFvImagesFvImage(String[] names, String types, Map<String, String> options) {\r
       \r
         FvImagesDocument.FvImages fis = null;\r


@@ -2560,6 +2672,32 @@ public class FpdFileContents {
         cursor.dispose();\r
     }\r
     \r
         cursor.dispose();\r
     }\r
     \r

+    public void updateFvImageNameAll (String oldFvName, String newFvName) {\r
+        if (getfpdFlash().getFvImages() == null || getfpdFlash().getFvImages().getFvImageList() == null) {\r
+            return;\r
+        }\r
+        ListIterator<FvImagesDocument.FvImages.FvImage> li = getfpdFlash().getFvImages().getFvImageList().listIterator();\r
+        while (li.hasNext()) {\r
+            FvImagesDocument.FvImages.FvImage fi = li.next();\r
+            updateFvImageNamesInFvImage (fi, oldFvName, newFvName);\r
+        }\r
+    }\r
+    \r
+    public void updateFvImageNamesInFvImage (FvImagesDocument.FvImages.FvImage fi, String oldFvName, String newFvName) {\r
+        QName qFvImageNames = new QName(xmlNs, "FvImageNames");\r
+        XmlCursor cursor = fi.newCursor();\r
+        \r
+        if (cursor.toChild(qFvImageNames)) {\r
+            do {\r
+                if (cursor.getTextValue().equals(oldFvName)){\r
+                    cursor.setTextValue(newFvName);\r
+                }\r
+            }while (cursor.toNextSibling(qFvImageNames));\r
+        }\r
+        \r
+        cursor.dispose();\r
+    }\r
+    \r

     public void updateFvImagesFvImage(int i, String[] names, String types, Map<String, String> options){\r
            \r
         XmlObject o = getfpdFlash().getFvImages();\r
     public void updateFvImagesFvImage(int i, String[] names, String types, Map<String, String> options){\r
            \r
         XmlObject o = getfpdFlash().getFvImages();\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java
index 8c61e9ff6bbd6eceb1c80e9876350fd1ec6f4387..a8d70e2ca39acb49b2ad096560402688e8d6272f 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java
@@ -75,6 +75,7 @@ public class FpdFlash extends IInternalFrame {
      * \r
      */\r
     private static final long serialVersionUID = 1L;\r
      * \r
      */\r
     private static final long serialVersionUID = 1L;\r

+    private final int startIndexOfDynamicTab = 2;\r

     static JFrame frame;\r
     private JPanel jContentPane = null;\r
     private JPanel jPanelContentEast = null;\r
     static JFrame frame;\r
     private JPanel jContentPane = null;\r
     private JPanel jPanelContentEast = null;\r


@@ -155,6 +156,9 @@ public class FpdFlash extends IInternalFrame {
     private JButton jButtonAddFv = null;\r
     private JButton jButtonDelFv = null;\r
     private JButton jButtonAddFvOptions = null;\r
     private JButton jButtonAddFv = null;\r
     private JButton jButtonDelFv = null;\r
     private JButton jButtonAddFvOptions = null;\r

+    private int tabIndexForFv = -1;\r
+    private int selectedRowInFvAdditionalTable = -1;\r
+    private String oldFvName = null;\r

     \r
     \r
     public FpdFlash() {\r
     \r
     \r
     public FpdFlash() {\r


@@ -258,6 +262,30 @@ public class FpdFlash extends IInternalFrame {
 //            jPanelFvImages.add(getJPanelFvImageW(), java.awt.BorderLayout.WEST);\r
             jPanelFvImages.add(getJPanelFvImageS(), java.awt.BorderLayout.SOUTH);\r
             jPanelFvImages.add(getJPanelFvImageC(), java.awt.BorderLayout.CENTER);\r
 //            jPanelFvImages.add(getJPanelFvImageW(), java.awt.BorderLayout.WEST);\r
             jPanelFvImages.add(getJPanelFvImageS(), java.awt.BorderLayout.SOUTH);\r
             jPanelFvImages.add(getJPanelFvImageC(), java.awt.BorderLayout.CENTER);\r

+            jPanelFvImages.addComponentListener(new java.awt.event.ComponentAdapter() {\r
+                public void componentShown(java.awt.event.ComponentEvent e) {\r
+                    fvImageParaTableModel.setRowCount(0);\r
+                    fvPropertyTableModel.setRowCount(0);\r
+                    \r
+                    if (ffc.getFvImagesFvImageCount() == 0) {\r
+                        return;\r
+                    }\r
+                    String[][] saa = new String[ffc.getFvImagesFvImageCount()][2];\r
+                    ffc.getFvImagesFvImages(saa);\r
+                   \r
+                    int i = 0;\r
+                    while (i < saa.length) {\r
+                        fvImageParaTableModel.addRow(saa[i]);\r
+                        ++i;\r
+                    }\r
+                    \r
+                    saa = new String[ffc.getFvImagesNameValueCount()][2];\r
+                    ffc.getFvImagesNameValues(saa);\r
+                    for (int m = 0; m < saa.length; ++m) {\r
+                        fvPropertyTableModel.addRow(saa[m]);\r
+                    }\r
+                }\r
+            });\r

             \r
         }\r
         return jPanelFvImages;\r
             \r
         }\r
         return jPanelFvImages;\r


@@ -1101,6 +1129,10 @@ public class FpdFlash extends IInternalFrame {
         }\r
         return jButtonFdfBrowse;\r
     }\r
         }\r
         return jButtonFdfBrowse;\r
     }\r

+    \r
+    private void initFvAdditionalTable() {\r
+        \r
+    }\r

 \r
     private void initFvInFdfTable(String fdfPath){\r
         Vector<FvInfoFromFdf> vFvInfo = new Vector<FvInfoFromFdf>();\r
 \r
     private void initFvInFdfTable(String fdfPath){\r
         Vector<FvInfoFromFdf> vFvInfo = new Vector<FvInfoFromFdf>();\r


@@ -1121,10 +1153,9 @@ public class FpdFlash extends IInternalFrame {
     private void addTabForFv (FvInfoFromFdf fvInfo) {\r
         String fvName = fvInfo.getFvName();\r
         String outputFile = fvInfo.getEfiFileName();\r
     private void addTabForFv (FvInfoFromFdf fvInfo) {\r
         String fvName = fvInfo.getFvName();\r
         String outputFile = fvInfo.getEfiFileName();\r

-        for (int i = 2; i < jTabbedPane.getTabCount(); ++i) {\r
-            if (jTabbedPane.getTitleAt(i).equals(fvName)) {\r
-                return;\r
-            }\r
+        int index = jTabbedPane.indexOfTab(fvName);\r
+        if (index >= startIndexOfDynamicTab) {\r
+            return;\r

         }\r
         jTabbedPane.addTab(fvName, null, new ModuleOrderPane(fvName, outputFile), null);\r
     }\r
         }\r
         jTabbedPane.addTab(fvName, null, new ModuleOrderPane(fvName, outputFile), null);\r
     }\r


@@ -1560,9 +1591,81 @@ public class FpdFlash extends IInternalFrame {
             jTableFvAdditional.setRowHeight(20);\r
             jTableFvAdditional.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);\r
             jTableFvAdditional.setModel(getFvAddtionalTableModel());\r
             jTableFvAdditional.setRowHeight(20);\r
             jTableFvAdditional.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);\r
             jTableFvAdditional.setModel(getFvAddtionalTableModel());\r

+            \r
+            jTableFvAdditional.getSelectionModel().addListSelectionListener(new ListSelectionListener() {\r
+                public void valueChanged(ListSelectionEvent e) {\r
+                    if (e.getValueIsAdjusting()) {\r
+                        return;\r
+                    }\r
+                    ListSelectionModel lsm = (ListSelectionModel) e.getSource();\r
+                    if (lsm.isSelectionEmpty()) {\r
+                        return;\r
+                    } else {\r
+                        selectedRowInFvAdditionalTable = lsm.getMinSelectionIndex();\r
+                        oldFvName = jTableFvAdditional.getValueAt(selectedRowInFvAdditionalTable, 0)+"";\r
+                    }\r
+                }\r
+            });\r
+            \r
+            jTableFvAdditional.getModel().addTableModelListener(new TableModelListener() {\r
+                public void tableChanged(TableModelEvent arg0) {\r
+                    // TODO Auto-generated method stub\r
+                    int row = arg0.getFirstRow();\r
+                    int col = arg0.getColumn();\r
+                    TableModel m = (TableModel) arg0.getSource();\r
+                    if (arg0.getType() == TableModelEvent.UPDATE) {\r
+                        if (col == 0) {\r
+                            String newFvName = m.getValueAt(row, 0) + "";\r
+                            if (newFvName.equals(oldFvName)) {\r
+                                return;\r
+                            }\r
+                            if (fvNameExists(newFvName)) {\r
+                                JOptionPane.showMessageDialog(frame, "This FV already exists. Please choose another FV name.");\r
+                                m.setValueAt(oldFvName, row, 0);\r
+                                return;\r
+                            }\r
+                            \r
+                            tabIndexForFv = jTabbedPane.indexOfTab(oldFvName);\r
+                            if (tabIndexForFv >= startIndexOfDynamicTab) {\r
+                                jTabbedPane.setTitleAt(tabIndexForFv, newFvName);\r
+                                // change FvName in UserExtensions\r
+                                ffc.updateBuildOptionsUserExtensions(oldFvName, newFvName);\r
+                                // change FvBinding in ModuleSA\r
+                                ffc.appendFvBindingFor(oldFvName, newFvName);\r
+                                ffc.removeFvBindingAll(oldFvName);\r
+                                // change FvImageNames in Flash\r
+                                ffc.updateFvImageNameAll(oldFvName, newFvName);\r
+                                \r
+                            } else {\r
+                                jTabbedPane.addTab(newFvName, new ModuleOrderPane(newFvName, ""));\r
+                                // Add FvImageNames in Flash\r
+                                String[] fvNames = {newFvName};\r
+                                ffc.AddFvImageFvImageNames(fvNames);\r
+                            }\r
+                            \r
+                            oldFvName = newFvName;\r
+                        }\r
+                        docConsole.setSaved(false);\r
+                    }\r
+                }\r
+            });\r

         }\r
         return jTableFvAdditional;\r
     }\r
         }\r
         return jTableFvAdditional;\r
     }\r

+    \r
+    private boolean fvNameExists (String fvName) {\r
+        for (int i = 0; i < jTableFvInFdf.getRowCount(); ++i) {\r
+            if (fvInFdfTableModel.getValueAt(i, 0).equals(fvName)) {\r
+                return true;\r
+            }\r
+        }\r
+        for (int j = 0; j < jTableFvAdditional.getRowCount(); ++j) {\r
+            if (fvAddtionalTableModel.getValueAt(j, 0).equals(fvName) && j != selectedRowInFvAdditionalTable) {\r
+                return true;\r
+            }\r
+        }\r
+        return false;\r
+    }\r

 \r
     /**\r
      * This method initializes fvAddtionalTableModel   \r
 \r
     /**\r
      * This method initializes fvAddtionalTableModel   \r


@@ -1588,11 +1691,15 @@ public class FpdFlash extends IInternalFrame {
         if (jButtonAddFv == null) {\r
             jButtonAddFv = new JButton();\r
             jButtonAddFv.setPreferredSize(new java.awt.Dimension(80,20));\r
         if (jButtonAddFv == null) {\r
             jButtonAddFv = new JButton();\r
             jButtonAddFv.setPreferredSize(new java.awt.Dimension(80,20));\r

-            jButtonAddFv.setEnabled(false);\r
+            jButtonAddFv.setEnabled(true);\r

             jButtonAddFv.setText("New");\r
             jButtonAddFv.addActionListener(new java.awt.event.ActionListener() {\r
                 public void actionPerformed(java.awt.event.ActionEvent e) {\r
             jButtonAddFv.setText("New");\r
             jButtonAddFv.addActionListener(new java.awt.event.ActionListener() {\r
                 public void actionPerformed(java.awt.event.ActionEvent e) {\r

-                    System.out.println("actionPerformed()"); // TODO Auto-generated Event stub actionPerformed()\r
+                    if (jTableFvAdditional.isEditing()) {\r
+                        jTableFvAdditional.getCellEditor().stopCellEditing();\r
+                    }\r
+                    String[] row = {"", "", ""};\r
+                    fvAddtionalTableModel.addRow(row);\r

                 }\r
             });\r
         }\r
                 }\r
             });\r
         }\r


@@ -1673,24 +1780,6 @@ public class FpdFlash extends IInternalFrame {
     }\r
 \r
     private void init(FpdFileContents ffc) {\r
     }\r
 \r
     private void init(FpdFileContents ffc) {\r

-        if (ffc.getFvImagesFvImageCount() == 0) {\r
-            return;\r
-        }\r
-        String[][] saa = new String[ffc.getFvImagesFvImageCount()][2];\r
-        ffc.getFvImagesFvImages(saa);\r
-       \r
-        int i = 0;\r
-        while (i < saa.length) {\r
-            \r
-            fvImageParaTableModel.addRow(saa[i]);\r
-            ++i;\r
-        }\r
-        \r
-        saa = new String[ffc.getFvImagesNameValueCount()][2];\r
-        ffc.getFvImagesNameValues(saa);\r
-        for (int m = 0; m < saa.length; ++m) {\r
-            fvPropertyTableModel.addRow(saa[m]);\r
-        }\r

         \r
         jTextFieldFdf.setText("");\r
         String fdfFile = ffc.getFlashDefinitionFile();\r
         \r
         jTextFieldFdf.setText("");\r
         String fdfFile = ffc.getFlashDefinitionFile();\r


@@ -1700,6 +1789,7 @@ public class FpdFlash extends IInternalFrame {
         \r
         String fdfPath = System.getenv("WORKSPACE") + File.separator + fdfFile;\r
         initFvInFdfTable(fdfPath);\r
         \r
         String fdfPath = System.getenv("WORKSPACE") + File.separator + fdfFile;\r
         initFvInFdfTable(fdfPath);\r

+        initFvAdditionalTable();\r

     }\r
     \r
     private void getOptionNameValue(Map<String, String> m){\r
     }\r
     \r
     private void getOptionNameValue(Map<String, String> m){\r


@@ -2216,7 +2306,7 @@ public class FpdFlash extends IInternalFrame {
             if (jButtonOk == null) {\r
                 jButtonOk = new JButton();\r
                 jButtonOk.setPreferredSize(new java.awt.Dimension(80,20));\r
             if (jButtonOk == null) {\r
                 jButtonOk = new JButton();\r
                 jButtonOk.setPreferredSize(new java.awt.Dimension(80,20));\r

-                jButtonOk.setText("Save");\r
+                jButtonOk.setText("Ok");\r

                 jButtonOk.addActionListener(new java.awt.event.ActionListener() {\r
                     public void actionPerformed(java.awt.event.ActionEvent e) {\r
                         // need reset FvBindings in ModuleSA.\r
                 jButtonOk.addActionListener(new java.awt.event.ActionListener() {\r
                     public void actionPerformed(java.awt.event.ActionEvent e) {\r
                         // need reset FvBindings in ModuleSA.\r