Bug fixing for FPD ModuleSA editor.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@788 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 a8191aba5fe91cdd14d43fe735cdf4ed3900d6f1..633aafeb2166810735d0c92e2da75cc3ca4721db 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
@@ -209,26 +209,26 @@ public class FpdFileContents {
         while(li.hasNext()) {\r
             ModuleSADocument.ModuleSA msa = (ModuleSADocument.ModuleSA)li.next();\r
             if (msa.getModuleGuid().equals(s[0]) && msa.getPackageGuid().equals(s[2])) {\r
-                if (msa.getModuleVersion() != null) {\r
-                    if (!msa.getModuleVersion().equals(s[1])) {\r
-                        continue;\r
-                    }\r
-                }\r
-                else{\r
-                    if (s[1] != null) {\r
-                        continue;\r
-                    }\r
-                }\r
-                if (msa.getPackageVersion() != null) {\r
-                    if (!msa.getPackageVersion().equals(s[3])) {\r
-                        continue;\r
-                    }\r
-                }\r
-                else{\r
-                    if (s[3] != null) {\r
-                        continue;\r
-                    }\r
-                }\r
+//                if (msa.getModuleVersion() != null) {\r
+//                    if (!msa.getModuleVersion().equals(s[1])) {\r
+//                        continue;\r
+//                    }\r
+//                }\r
+//                else{\r
+//                    if (s[1] != null) {\r
+//                        continue;\r
+//                    }\r
+//                }\r
+//                if (msa.getPackageVersion() != null) {\r
+//                    if (!msa.getPackageVersion().equals(s[3])) {\r
+//                        continue;\r
+//                    }\r
+//                }\r
+//                else{\r
+//                    if (s[3] != null) {\r
+//                        continue;\r
+//                    }\r
+//                }\r
                 return msa;\r
             }\r
         }\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 daca39c657a03ef1c1c2edecd865e43fb9fd8bfb..0265fb8f8011ebe4f71578e238213fc12f5f6fb6 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
@@ -136,7 +136,10 @@ public class FpdModuleSA extends JDialog implements ActionListener {
                 model.addRow(saa[i]);\r
             }\r
         }\r
-        \r
+        //\r
+        // display library classes that need to be resolved. also potential instances for them.\r
+        //\r
+        resolveLibraryInstances(key);\r
         //\r
         // display lib instances already selected for key\r
         //\r
@@ -146,17 +149,22 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             String[][] saa = new String[instanceCount][5];\r
             ffc.getLibraryInstances(key, saa);\r
             for (int i = 0; i < saa.length; ++i) {\r
-                if (getModuleId(saa[i][1] + " " + saa[i][2] + " " + saa[i][3] + " " + saa[i][4]) != null) {\r
-                    saa[i][0] = getModuleId(saa[i][1] + " " + saa[i][2] + " " + saa[i][3] + " " + saa[i][4]).getName();\r
+                ModuleIdentification mi = getModuleId(saa[i][1] + " " + saa[i][2] + " " + saa[i][3] + " " + saa[i][4]);\r
+                if (mi != null) {\r
+                    saa[i][0] = mi.getName();\r
+                    saa[i][2] = mi.getVersion();\r
+                    saa[i][4] = mi.getPackage().getVersion();\r
+                    //\r
+                    // re-evaluate lib instance usage when adding a already-selected lib instance.\r
+                    //\r
+                    resolveLibraryInstances(saa[i][1] + " " + saa[i][2] + " " + saa[i][3] + " " + saa[i][4]);\r
+                    model1.addRow(saa[i]);\r
                 }\r
                 \r
-                model1.addRow(saa[i]);\r
+                \r
             }\r
         }\r
-        //\r
-        // display library classes that need to be resolved. also potential instances for them.\r
-        //\r
-        resolveLibraryInstances(key);\r
+        \r
         //\r
         // display module SA options\r
         //\r
@@ -328,14 +336,16 @@ public class FpdModuleSA extends JDialog implements ActionListener {
         \r
         while(ispi.hasNext()) {\r
             PackageIdentification pi = (PackageIdentification)ispi.next();\r
-            if ( !pi.getGuid().equals(keyPart[2]) || !pi.getVersion().equals(keyPart[3])){\r
+            if ( !pi.getGuid().equals(keyPart[2])){\r
+//                            || !pi.getVersion().equals(keyPart[3])){\r
                 continue;\r
             }\r
             Set<ModuleIdentification> smi = GlobalData.getModules(pi);\r
             Iterator ismi = smi.iterator();\r
             while(ismi.hasNext()) {\r
                 ModuleIdentification mi = (ModuleIdentification)ismi.next();\r
-                if (mi.getGuid().equals(keyPart[0]) && mi.getVersion().equals(keyPart[1])){\r
+                if (mi.getGuid().equals(keyPart[0])){\r
+//                                && mi.getVersion().equals(keyPart[1])){\r
                     return mi;\r
                 }\r
             }\r
@@ -474,6 +484,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             jPanel1.add(getJPanel7(), java.awt.BorderLayout.CENTER);\r
             jPanel1.addComponentListener(new java.awt.event.ComponentAdapter() {\r
                 public void componentShown(java.awt.event.ComponentEvent e) {\r
+                    init(moduleKey);\r
                 }\r
             });\r
         }\r
@@ -503,6 +514,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             model = new PartialEditableTableModel();\r
             jTable = new JTable(model);\r
             jTable.setRowHeight(20);\r
+            jTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r
             model.addColumn("CName");\r
             model.addColumn("TokenSpaceGUID");\r
             model.addColumn("ItemType");\r
@@ -687,6 +699,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             model1.addColumn("PackageVersion");\r
             jTable1 = new JTable(model1);\r
             jTable1.setRowHeight(20);\r
+            jTable1.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r
             jTable1.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
             jTable1.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
                 public void valueChanged(ListSelectionEvent e) {\r
@@ -809,6 +822,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             model3.addColumn("PackageVersion");\r
             jTable3 = new JTable(model3);\r
             jTable3.setRowHeight(20);\r
+            jTable3.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r
             jTable3.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
             jTable3.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
                 public void valueChanged(ListSelectionEvent e) {\r
@@ -1022,6 +1036,11 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             jPanel8.add(getJScrollPane6(), null);\r
             jPanel8.add(getJButton4(), null);\r
             jPanel8.add(getJButton5(), null);\r
+            jPanel8.addComponentListener(new java.awt.event.ComponentAdapter() {\r
+                public void componentShown(java.awt.event.ComponentEvent e) {\r
+                    init(moduleKey);\r
+                }\r
+            });\r
         }\r
         return jPanel8;\r
     }\r
@@ -1114,6 +1133,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             vArch.add("PPC");\r
             jTable4.getColumnModel().getColumn(4).setCellEditor(new ListEditor(vArch));\r
             jTable4.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
+                       jTable4.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r
             jTable4.getModel().addTableModelListener(new TableModelListener() {\r
                 public void tableChanged(TableModelEvent arg0) {\r
                     // TODO Auto-generated method stub\r