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 / FpdModuleSA.java

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
index 44cead811a368abaaa2fc4e103bdbde93f97b0de..658138a2d889e0cd68bee16413715862104be846 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
@@ -26,6 +26,7 @@ import javax.swing.table.TableModel;
 \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.platform.ui.global.WorkspaceProfile;\r
 import org.tianocore.frameworkwizard.platform.ui.global.SurfaceAreaQuery;\r
@@ -85,10 +86,10 @@ public class FpdModuleSA extends JDialog implements ActionListener {
     private JLabel jLabelPcdHelp = null;\r
     private JButton jButtonOk = null;\r
     private JButton jButtonCancel = null;\r
-    private PartialEditableTableModel model = null;\r
-    private LibraryTableModel selectedInstancesTableModel = null;\r
-    private LibraryTableModel libClassTableModel = null;\r
-    private LibraryTableModel libInstanceTableModel = null;\r
+    private IDefaultTableModel model = null;\r
+    private IDefaultTableModel selectedInstancesTableModel = null;\r
+    private IDefaultTableModel libClassTableModel = null;\r
+    private IDefaultTableModel libInstanceTableModel = null;\r
     private DefaultTableModel optionsTableModel = null;\r
     private FpdFileContents ffc = null;\r
     private String moduleKey = null;\r
@@ -544,7 +545,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
      */\r
     private JTable getJTablePcd() {\r
         if (jTablePcd == null) {\r
-            model = new PartialEditableTableModel();\r
+            model = new IDefaultTableModel();\r
             jTablePcd = new JTable(model);\r
             jTablePcd.setRowHeight(20);\r
             jTablePcd.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r
@@ -803,7 +804,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
      */\r
     private JTable getJTableSelectedInstances() {\r
         if (jTableSelectedInstances == null) {\r
-            selectedInstancesTableModel = new LibraryTableModel();\r
+            selectedInstancesTableModel = new IDefaultTableModel();\r
             selectedInstancesTableModel.addColumn("Name");\r
             selectedInstancesTableModel.addColumn("ModuleGUID");\r
             selectedInstancesTableModel.addColumn("ModuleVersion");\r
@@ -839,7 +840,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
      */\r
     private JTable getJTableLibClass() {\r
         if (jTableLibClass == null) {\r
-            libClassTableModel = new LibraryTableModel();\r
+            libClassTableModel = new IDefaultTableModel();\r
             libClassTableModel.addColumn("LibraryClass");\r
             jTableLibClass = new JTable(libClassTableModel);\r
             jTableLibClass.setRowHeight(20);\r
@@ -908,7 +909,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
      */\r
     private JTable getJTableLibInstances() {\r
         if (jTableLibInstances == null) {\r
-            libInstanceTableModel = new LibraryTableModel();\r
+            libInstanceTableModel = new IDefaultTableModel();\r
             libInstanceTableModel.addColumn("Name");\r
             libInstanceTableModel.addColumn("ModuleGUID");\r
             libInstanceTableModel.addColumn("ModuleVersion");\r
@@ -1632,31 +1633,3 @@ private JPanel getJPanelToolchainC() {
 \r
 \r
 }  //  @jve:decl-index=0:visual-constraint="10,10"\r
-\r
-class PartialEditableTableModel extends DefaultTableModel {\r
-    /**\r
-     * \r
-     */\r
-    private static final long serialVersionUID = 1L;\r
-\r
-    public boolean isCellEditable(int row, int col) {\r
-        switch (col){\r
-        case 2:\r
-            return false;\r
-        default:\r
-            return false; \r
-        }\r
-           \r
-    }\r
-}\r
-\r
-class LibraryTableModel extends DefaultTableModel {\r
-    /**\r
-     * \r
-     */\r
-    private static final long serialVersionUID = 1L;\r
-\r
-    public boolean isCellEditable(int row, int col) {\r
-        return false;\r
-    }\r
-}\r