refresh Pcd data from library instance when editing the settings of FrameworkModules

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1492 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 c80d758f284f0b3ca92dc051fc6f80aa0a283485..08992048085fe0cddb7047b5108162228ba42519 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
@@ -360,17 +360,22 @@ public class FpdFileContents {
         getLibraryInstances(moduleKey, saaLib);\r
         ModuleIdentification mi = WorkspaceProfile.getModuleId(moduleKey);\r
         Vector<ModuleIdentification> vMi = new Vector<ModuleIdentification>();\r
+        //\r
+        // create vector for module & library instance MIs.\r
+        //\r
         vMi.add(mi);\r
+        for (int j = 0; j < saaLib.length; ++j) {\r
+            String libKey = saaLib[j][1] + " " + saaLib[j][2] + " " + saaLib[j][3] + " " + saaLib[j][4];\r
+            ModuleIdentification libMi = WorkspaceProfile.getModuleId(libKey);\r
+            vMi.add(libMi);\r
+        }\r
+        \r
         try {\r
     nextPcd:for (int i = 0; i < saaModuleSaPcd.length; ++i) {\r
-                if (WorkspaceProfile.pcdInMsa(saaModuleSaPcd[i][0], saaModuleSaPcd[i][1], mi)){\r
-                    continue;\r
-                }\r
-                for (int j = 0; j < saaLib.length; ++j) {\r
-                    String libKey = saaLib[j][1] + " " + saaLib[j][2] + " " + saaLib[j][3] + " " + saaLib[j][4];\r
-                    ModuleIdentification libMi = WorkspaceProfile.getModuleId(libKey);\r
-                    vMi.add(libMi);\r
-                    if (WorkspaceProfile.pcdInMsa(saaModuleSaPcd[i][0], saaModuleSaPcd[i][1], libMi)) {\r
+\r
+                for (int j = 0; j < vMi.size(); ++j) {\r
+                    ModuleIdentification nextMi = vMi.get(j);\r
+                    if (WorkspaceProfile.pcdInMsa(saaModuleSaPcd[i][0], saaModuleSaPcd[i][1], nextMi)) {\r
                         continue nextPcd;\r
                     }\r
                 }\r
@@ -379,7 +384,7 @@ public class FpdFileContents {
             }\r
         }\r
         catch (Exception e) {\r
-            \r
+            throw e;\r
         }\r
         //\r
         // add new Pcd from MSA file to ModuleSA.\r
@@ -405,9 +410,6 @@ public class FpdFileContents {
                         }\r
                     }\r
                     \r
-                    Map<String, XmlObject> m = new HashMap<String, XmlObject>();\r
-                    m.put("ModuleSurfaceArea", msa);\r
-                    SurfaceAreaQuery.setDoc(m);\r
                     PackageIdentification[] depPkgs = SurfaceAreaQuery.getDependencePkg(null, vMi.get(i));\r
                     PcdDeclarationsDocument.PcdDeclarations.PcdEntry spdPcd = LookupPcdDeclaration(msaPcd, depPkgs);\r
                     if (spdPcd == null) {\r