Fix the problem of not displaying library instances for multiple archs in supArchList.

[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / platform / ui / FpdFlash.java

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 ece4fb3e7fe8fc014594bf7394895632f3d88ff0..5a365bb487daa9baa7c23b522663ef8e92e0aa36 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
@@ -26,11 +26,11 @@ import javax.swing.ListSelectionModel;
 import org.tianocore.PlatformSurfaceAreaDocument;\r
 import org.tianocore.frameworkwizard.common.DataValidation;\r
 import org.tianocore.frameworkwizard.common.GlobalData;\r
+import org.tianocore.frameworkwizard.common.IDefaultTableModel;\r
 import org.tianocore.frameworkwizard.common.Identifications.OpeningPlatformType;\r
 import org.tianocore.frameworkwizard.common.ui.IInternalFrame;\r
 import org.tianocore.frameworkwizard.common.ui.StarLabel;\r
 import org.tianocore.frameworkwizard.module.Identifications.ModuleIdentification;\r
-import org.tianocore.frameworkwizard.platform.ui.FpdFrameworkModules;\r
 import org.tianocore.frameworkwizard.platform.ui.global.WorkspaceProfile;\r
 \r
 import java.awt.FlowLayout;\r
@@ -145,7 +145,7 @@ public class FpdFlash extends IInternalFrame {
     private JLabel jLabelFvAdditional = null;\r
     private JScrollPane jScrollPaneFvInFdf = null;\r
     private JTable jTableFvInFdf = null;\r
-    private NonEditableTableModel fvInFdfTableModel = null;  //  @jve:decl-index=0:visual-constraint=""\r
+    private IDefaultTableModel fvInFdfTableModel = null;  //  @jve:decl-index=0:visual-constraint=""\r
     private JButton jButtonFvInFdfOptions = null;\r
     private JScrollPane jScrollPaneFvAdditional = null;\r
     private JTable jTableFvAdditional = null;\r
@@ -169,7 +169,6 @@ public class FpdFlash extends IInternalFrame {
     private JPanel jPanelBgFvName = null;\r
     private JPanel jPanelBgFvImage = null;\r
     private JPanel jPanelW = null;\r
-    private String oldFvNameInFvImage = "";\r
     \r
     public FpdFlash() {\r
         super();\r
@@ -704,7 +703,7 @@ public class FpdFlash extends IInternalFrame {
      */\r
     private JTable getJTableFvImageNames() {\r
         if (jTableFvImageNames == null) {\r
-            fvImageNameTableModel = new NonEditableTableModel();\r
+            fvImageNameTableModel = new IDefaultTableModel();\r
             jTableFvImageNames = new JTable(fvImageNameTableModel);\r
             jTableFvImageNames.setRowHeight(20);\r
             fvImageNameTableModel.addColumn("FV Image Name");\r
@@ -1413,7 +1412,7 @@ public class FpdFlash extends IInternalFrame {
      */\r
     private JTable getJTableFvImageOpts() {\r
         if (jTableFvImageOpts == null) {\r
-            fvOptionTableModel = new NonEditableTableModel();\r
+            fvOptionTableModel = new IDefaultTableModel();\r
             fvOptionTableModel.addColumn("Name");\r
             fvOptionTableModel.addColumn("Value");\r
             jTableFvImageOpts = new JTable(fvOptionTableModel);\r
@@ -1650,9 +1649,9 @@ public class FpdFlash extends IInternalFrame {
      *         \r
      * @return org.tianocore.frameworkwizard.platform.ui.NonEditableTableModel \r
      */\r
-    private NonEditableTableModel getFvInFdfTableModel() {\r
+    private IDefaultTableModel getFvInFdfTableModel() {\r
         if (fvInFdfTableModel == null) {\r
-            fvInFdfTableModel = new NonEditableTableModel();\r
+            fvInFdfTableModel = new IDefaultTableModel();\r
             fvInFdfTableModel.addColumn("FV Name");\r
             fvInFdfTableModel.addColumn("Size");\r
             fvInFdfTableModel.addColumn("Corresponding File Name");\r
@@ -2327,8 +2326,8 @@ public class FpdFlash extends IInternalFrame {
         private JButton jButtonDown = null;\r
         private JButton jButtonOk = null;\r
         private JButton jButtonCancel = null;\r
-        private NonEditableTableModel modInFvTableModel = null;\r
-        private NonEditableTableModel fpdModTableModel = null;\r
+        private IDefaultTableModel modInFvTableModel = null;\r
+        private IDefaultTableModel fpdModTableModel = null;\r
         private HashMap<String, ModuleIdentification> mGuidToModuleId = null;\r
         private ArrayList<String> listModGuidInFv = null;\r
         private String title = null;\r
@@ -2497,7 +2496,7 @@ public class FpdFlash extends IInternalFrame {
          */\r
         private JTable getJTableModInFv() {\r
             if (jTableModInFv == null) {\r
-                modInFvTableModel = new NonEditableTableModel();\r
+                modInFvTableModel = new IDefaultTableModel();\r
                 modInFvTableModel.addColumn("Module Orders in FV");\r
                 jTableModInFv = new JTable(modInFvTableModel);\r
                 jTableModInFv.setRowHeight(20);\r
@@ -2549,7 +2548,7 @@ public class FpdFlash extends IInternalFrame {
          */\r
         private JTable getJTableFpdModules() {\r
             if (jTableFpdModules == null) {\r
-                fpdModTableModel = new NonEditableTableModel();\r
+                fpdModTableModel = new IDefaultTableModel();\r
                 TableSorter sorter = new TableSorter(fpdModTableModel);\r
                 jTableFpdModules = new JTable(sorter);\r
                 jTableFpdModules.setRowHeight(20);\r