some bug fixing for FpdFrameworkModules

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
index 929e1647e0bb9cbb803d6abf542a9b7494ff3d9f..2ab4d65d2b9521f86f871929289c1b4721e214c7 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
@@ -134,6 +134,7 @@ public class FpdFrameworkModules extends IInternalFrame {
         if (jTable == null) {\r
             model = new NonEditableTableModel();\r
             jTable = new JTable(model);\r
+            jTable.setRowHeight(20);\r
             model.addColumn("ModuleName");\r
             model.addColumn("ModuleGUID");\r
             model.addColumn("ModuleVersion");\r
@@ -190,8 +191,11 @@ public class FpdFrameworkModules extends IInternalFrame {
                     fpdMsa.put(mg + mv + pg + pv, null);\r
                     \r
                     String[] row = {" ", mg, mv, pg, pv};\r
-                    if (getModuleId(mg + " " + mv + " " + pg + " " + pv) != null) {\r
-                        row[0] = getModuleId(mg + " " + mv + " " + pg + " " + pv).getName();\r
+                    ModuleIdentification mi = getModuleId(mg + " " + mv + " " + pg + " " + pv);\r
+                    if (mi != null) {\r
+                        row[0] = mi.getName();\r
+                        row[2] = mi.getVersion();\r
+                        row[4] = mi.getPackage().getVersion();\r
                     }\r
                     model1.addRow(row);\r
                     ffc.addFrameworkModulesPcdBuildDefs(miList.get(selectedRow), null);\r
@@ -241,6 +245,7 @@ public class FpdFrameworkModules extends IInternalFrame {
         if (jTable1 == null) {\r
             model1 = new NonEditableTableModel();\r
             jTable1 = new JTable(model1);\r
+            jTable1.setRowHeight(20);\r
             model1.addColumn("ModuleName");\r
             model1.addColumn("ModuleGUID");\r
             model1.addColumn("ModuleVersion");            \r
@@ -273,10 +278,10 @@ public class FpdFrameworkModules extends IInternalFrame {
                         settingDlg = new FpdModuleSA(ffc);\r
                     }\r
                     \r
-                    String mg = model1.getValueAt(selectedRow, 1).toString();\r
-                    String mv = model1.getValueAt(selectedRow, 2).toString();\r
-                    String pg = model1.getValueAt(selectedRow, 3).toString();\r
-                    String pv = model1.getValueAt(selectedRow, 4).toString();\r
+                    String mg = model1.getValueAt(selectedRow, 1)+"";\r
+                    String mv = model1.getValueAt(selectedRow, 2)+"";\r
+                    String pg = model1.getValueAt(selectedRow, 3)+"";\r
+                    String pv = model1.getValueAt(selectedRow, 4)+"";\r
                     settingDlg.setKey(mg + " " + mv + " " + pg + " " + pv);\r
                     settingDlg.setVisible(true);\r
                 }\r
@@ -357,8 +362,11 @@ public class FpdFrameworkModules extends IInternalFrame {
             String[][] saa = new String[ffc.getFrameworkModulesCount()][5];\r
             ffc.getFrameworkModulesInfo(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
                 model1.addRow(saa[i]);\r
                 fpdMsa.put(saa[i][1]+saa[i][2]+saa[i][3]+saa[i][4], saa[i][0]);\r
@@ -417,14 +425,17 @@ public class FpdFrameworkModules extends IInternalFrame {
         \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
+\r
                     return mi;\r
                 }\r
             }\r