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

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1517 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 00371cdc97ccb3aecd6a9eb07aba78db122af4be..9c60f15dacecc2b809c720011681b099bd764306 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
@@ -251,12 +251,22 @@ public class FpdFileContents {
     }\r
     \r
     public ModuleSADocument.ModuleSA getModuleSA(String key) {\r
-        String[] s = key.split(" ");\r
+        \r
         if (getfpdFrameworkModules().getModuleSAList() == null || getfpdFrameworkModules().getModuleSAList().size() == 0) {\r
             removeElement(getfpdFrameworkModules());\r
             fpdFrameworkModules = null;\r
             return null;\r
         }\r
+        String[] s = key.split(" ");\r
+        String archsInKey = "";\r
+        if (s.length > 4) {\r
+            for (int i = 4; i < s.length; ++i) {\r
+                archsInKey += s[i];\r
+                archsInKey += " ";\r
+            }\r
+            archsInKey = archsInKey.trim();\r
+        }\r
+        \r
         ListIterator li = getfpdFrameworkModules().getModuleSAList().listIterator();\r
         while(li.hasNext()) {\r
             ModuleSADocument.ModuleSA moduleSa = (ModuleSADocument.ModuleSA)li.next();\r
@@ -271,13 +281,17 @@ public class FpdFileContents {
                         continue;\r
                     }\r
                 }\r
-                //ToDo add arch check for s[4]\r
+                //ToDo add arch check .\r
                 if (moduleSa.getSupArchList() != null) {\r
-                    if (!listToString(moduleSa.getSupArchList()).equals(s[4])) {\r
-                        continue;\r
+                    if (listToString(moduleSa.getSupArchList()).equals(archsInKey)) {\r
+                        return moduleSa;\r
+                    }\r
+                }\r
+                else {\r
+                    if (archsInKey.length() == 0) {\r
+                        return moduleSa;\r
                     }\r
                 }\r
-                return moduleSa;\r
             }\r
         }\r
         return null;\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 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

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