rearrange target of procedures of library instance selection.

[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 048616ca666a79e1f1ab294b27847cb1cc445f58..b6c92d6c3e47e479f106975250ccb2890fd2f9a2 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
@@ -24,11 +24,12 @@ import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableModel;\r
 \r
 import org.tianocore.frameworkwizard.common.DataValidation;\r
+import org.tianocore.frameworkwizard.common.GlobalData;\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
-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
+import org.tianocore.frameworkwizard.packaging.PackageIdentification;\r
 \r
 import java.awt.FlowLayout;\r
 import java.awt.event.ActionEvent;\r
@@ -37,7 +38,6 @@ import java.util.ArrayList;
 import java.util.HashMap;\r
 import java.util.Iterator;\r
 import java.util.ListIterator;\r
-import java.util.Set;\r
 import java.util.Vector;\r
 \r
 import javax.swing.JTextField;\r
@@ -185,17 +185,16 @@ public class FpdModuleSA extends JDialog implements ActionListener {
                 if (mi != null) {\r
                     saa[i][0] = mi.getName();\r
                     saa[i][2] = mi.getVersion();\r
-                    saa[i][4] = mi.getPackage().getVersion();\r
+                    saa[i][4] = mi.getPackageId().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
                     selectedInstancesTableModel.addRow(saa[i]);\r
                 }\r
-                \r
-                \r
             }\r
         }\r
+        showClassToResolved();\r
     }\r
     \r
     public void initFvInfo (String key) {\r
@@ -286,7 +285,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
                 \r
             }\r
             \r
-            showClassToResolved();\r
+//            showClassToResolved();\r
         }\r
         catch(Exception e) {\r
             e.printStackTrace();\r
@@ -297,11 +296,12 @@ public class FpdModuleSA extends JDialog implements ActionListener {
         ArrayList<String> al = new ArrayList<String>();\r
         \r
         for (int i = 0; i < depPkgList.length; ++i) {\r
-            Set<ModuleIdentification> smi = WorkspaceProfile.getModules(depPkgList[i]);\r
-            Iterator ismi = smi.iterator();\r
+            Iterator ismi = GlobalData.vModuleList.iterator();\r
             while(ismi.hasNext()) {\r
                 ModuleIdentification mi = (ModuleIdentification)ismi.next();\r
-                \r
+                if (!mi.getPackageId().getGuid().equalsIgnoreCase(depPkgList[i].getGuid())) {\r
+                    continue;\r
+                }\r
                 String[] clsProduced = getClassProduced(mi);\r
                 \r
                 boolean isPotential = false;\r
@@ -417,6 +417,21 @@ public class FpdModuleSA extends JDialog implements ActionListener {
         }\r
         libInstanceTableModel.setRowCount(0);\r
     }\r
+    \r
+    private void addLibInstance (ModuleIdentification libMi) {\r
+        \r
+        ffc.genLibraryInstance(libMi, moduleKey);\r
+        //\r
+        // Add pcd information of selected instance to current moduleSA\r
+        //\r
+        try{\r
+            ffc.addFrameworkModulesPcdBuildDefs(libMi, null, ffc.getModuleSA(moduleKey));\r
+        }\r
+        catch (Exception exception) {\r
+            JOptionPane.showMessageDialog(frame, "Adding Instance" + libMi.getName() + ": "+ exception.getMessage());\r
+        }\r
+        \r
+    }\r
     /**\r
      * This method initializes this\r
      * \r
@@ -993,17 +1008,9 @@ public class FpdModuleSA extends JDialog implements ActionListener {
                     libInstanceTableModel.getValueAt(row, 3) + " " +\r
                     libInstanceTableModel.getValueAt(row, 4);\r
                     ModuleIdentification libMi = WorkspaceProfile.getModuleId(instanceValue);\r
-                    ffc.genLibraryInstance(libMi, moduleKey);\r
-                    //\r
-                    // Add pcd information of selected instance to current moduleSA\r
-                    //\r
-                    try{\r
-                        ffc.addFrameworkModulesPcdBuildDefs(libMi, null, ffc.getModuleSA(moduleKey));\r
-                    }\r
-                    catch (Exception exception) {\r
-                        JOptionPane.showMessageDialog(frame, "Adding Instance" + s[0] + ": "+ exception.getMessage());\r
-                    }\r
+                    addLibInstance (libMi);\r
                     resolveLibraryInstances(instanceValue);\r
+                    showClassToResolved();\r
                 }\r
             });\r
         }\r