Use unified global data to get module informations.

[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 6ba80c42fe43b0421b65ea99262195d316329f42..bab107737d49d835538a404fe404a95a76ddf939 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
@@ -30,19 +30,18 @@ import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableModel;\r
 \r
 import org.tianocore.PlatformSurfaceAreaDocument;\r
+import org.tianocore.frameworkwizard.common.GlobalData;\r
 import org.tianocore.frameworkwizard.common.Identifications.OpeningPlatformType;\r
 import org.tianocore.frameworkwizard.common.ui.IInternalFrame;\r
+import org.tianocore.frameworkwizard.platform.ui.global.SurfaceAreaQuery;\r
 import org.tianocore.frameworkwizard.platform.ui.global.WorkspaceProfile;\r
-import org.tianocore.frameworkwizard.platform.ui.id.ModuleIdentification;\r
-import org.tianocore.frameworkwizard.platform.ui.id.PackageIdentification;\r
+import org.tianocore.frameworkwizard.module.Identifications.ModuleIdentification;\r
 \r
 import java.awt.FlowLayout;\r
-import java.io.File;\r
 import java.util.ArrayList;\r
 import java.util.HashMap;\r
 import java.util.Iterator;\r
 import java.util.Map;\r
-import java.util.Set;\r
 import java.util.Vector;\r
 \r
 public class FpdFrameworkModules extends IInternalFrame {\r
@@ -358,9 +357,9 @@ public class FpdFrameworkModules extends IInternalFrame {
                     String archsAdded = "";\r
                     String mg = mi.getGuid();\r
                     String mv = mi.getVersion();\r
-                    String pg = mi.getPackage().getGuid();\r
-                    String pv = mi.getPackage().getVersion();\r
-                    String mType = mi.getModuleType();\r
+                    String pg = mi.getPackageId().getGuid();\r
+                    String pv = mi.getPackageId().getVersion();\r
+                    String mType = SurfaceAreaQuery.getModuleType(mi);\r
 \r
                     ArrayList<String> al = fpdMsa.get(mg + mv + pg + pv);\r
                     if (al == null) {\r
@@ -408,7 +407,7 @@ public class FpdFrameworkModules extends IInternalFrame {
 \r
                         if (mi != null) {\r
                             row[modNameColForFpdModTable] = mi.getName();\r
-                            row[pkgNameColForFpdModTable] = mi.getPackage().getName();\r
+                            row[pkgNameColForFpdModTable] = mi.getPackageId().getName();\r
                             row[pathColForFpdModTable] = path;\r
                             row[archColForFpdModTable] = arch;\r
                             row[pkgVerColForFpdModTable] = pv;\r
@@ -629,7 +628,7 @@ public class FpdFrameworkModules extends IInternalFrame {
                     String arch = sa[ffcModArch];\r
                     ModuleIdentification mi = WorkspaceProfile.getModuleId(mg + " " + mv + " " + pg + " " + pv + " " + arch);\r
                     mv = mi.getVersion();\r
-                    pv = mi.getPackage().getVersion();\r
+                    pv = mi.getPackageId().getVersion();\r
                     modelFpdModules.removeRow(selectedRow);\r
                     if (arch == null) {\r
                         // if no arch specified in ModuleSA\r
@@ -679,12 +678,6 @@ public class FpdFrameworkModules extends IInternalFrame {
     }\r
 \r
     private void init(PlatformSurfaceAreaDocument.PlatformSurfaceArea fpd) {\r
-        try {\r
-            WorkspaceProfile.initInfo("Tools" + File.separator + "Conf" + File.separator + "FrameworkDatabase.db", System.getenv("WORKSPACE"));\r
-        }\r
-        catch(Exception e){\r
-            JOptionPane.showMessageDialog(frame, "Error occurred when getting module data.");\r
-        }\r
 \r
         if (ffc == null) {\r
             ffc = new FpdFileContents(fpd);\r
@@ -705,14 +698,12 @@ public class FpdFrameworkModules extends IInternalFrame {
                 if (mi != null) {\r
                     row[modNameColForFpdModTable] = mi.getName();\r
                     row[modVerColForFpdModTable] = mi.getVersion();\r
-                    row[typeColForFpdModTable] = mi.getModuleType();\r
-                    row[pkgNameColForFpdModTable] = mi.getPackage().getName();\r
-                    row[pkgVerColForFpdModTable] = mi.getPackage().getVersion();\r
+                    row[typeColForFpdModTable] = SurfaceAreaQuery.getModuleType(mi);\r
+                    row[pkgNameColForFpdModTable] = mi.getPackageId().getName();\r
+                    row[pkgVerColForFpdModTable] = mi.getPackageId().getVersion();\r
                     row[archColForFpdModTable] = saa[i][ffcModArch];\r
                     try {\r
-                        row[pathColForFpdModTable] = WorkspaceProfile.getMsaFile(mi).getPath().substring(\r
-                                                                                      System.getenv("WORKSPACE")\r
-                                                                                            .length() + 1);\r
+                        row[pathColForFpdModTable] = mi.getPath().substring(System.getenv("WORKSPACE").length() + 1);\r
                     } catch (Exception e) {\r
                         JOptionPane.showMessageDialog(frame, "Show FPD Modules:" + e.getMessage());\r
                     }\r
@@ -743,32 +734,26 @@ public class FpdFrameworkModules extends IInternalFrame {
         if (miList == null) {\r
             miList = new ArrayList<ModuleIdentification>();\r
         }\r
-        Set<PackageIdentification> spi = WorkspaceProfile.getPackageList();\r
-        Iterator ispi = spi.iterator();\r
 \r
-        while (ispi.hasNext()) {\r
-            PackageIdentification pi = (PackageIdentification) ispi.next();\r
             String[] s = { "", "", "", "", "", "" };\r
-\r
-            Set<ModuleIdentification> smi = WorkspaceProfile.getModules(pi);\r
-            Iterator ismi = smi.iterator();\r
+            \r
+            Iterator ismi = GlobalData.vModuleList.iterator();\r
             while (ismi.hasNext()) {\r
                 ModuleIdentification mi = (ModuleIdentification) ismi.next();\r
                 s[modNameColForAllModTable] = mi.getName();\r
                 s[modVerColForAllModTable] = mi.getVersion();\r
-                s[typeColForAllModTable] = mi.getModuleType();\r
-                s[pkgNameColForAllModTable] = pi.getName();\r
-                s[pkgVerColForAllModTable] = pi.getVersion();\r
+                s[typeColForAllModTable] = SurfaceAreaQuery.getModuleType(mi);\r
+                s[pkgNameColForAllModTable] = mi.getPackageId().getName();\r
+                s[pkgVerColForAllModTable] = mi.getPackageId().getVersion();\r
                 try {\r
-                    s[pathColForAllModTable] = WorkspaceProfile.getMsaFile(mi).getPath()\r
-                                            .substring(System.getenv("WORKSPACE").length() + 1);\r
+                    s[pathColForAllModTable] = mi.getPath().substring(System.getenv("WORKSPACE").length() + 1);\r
                 } catch (Exception e) {\r
                     JOptionPane.showMessageDialog(frame, "Show All Modules:" + e.getMessage());\r
                 }\r
                 modelAllModules.addRow(s);\r
                 miList.add(mi);\r
             }\r
-        }\r
+        \r
         \r
         TableSorter sorter = (TableSorter)jTableAllModules.getModel();\r
         sorter.setSortState(modNameColForAllModTable, TableSorter.ASCENDING);\r