Create more threads to synchronize pcd data for FrameworkModules in a platform.

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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
index d8dfb279ba59f2228a4fce57ceb13b79fb57ad91..c5f854a7e881b4f6c7fc1f2cf44c6b3696cdcfd8 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
@@ -58,6 +58,7 @@ import org.tianocore.PlatformHeaderDocument;
 import org.tianocore.SkuInfoDocument;\r
 import org.tianocore.UserDefinedAntTasksDocument;\r
 import org.tianocore.UserExtensionsDocument;\r
+import org.tianocore.LibrariesDocument.Libraries.Instance;\r
 import org.tianocore.frameworkwizard.platform.ui.global.WorkspaceProfile;\r
 import org.tianocore.frameworkwizard.platform.ui.global.SurfaceAreaQuery;\r
 import org.tianocore.frameworkwizard.module.Identifications.ModuleIdentification;\r
@@ -384,7 +385,7 @@ public class FpdFileContents {
         cursor.dispose();\r
     }\r
     \r
-    public boolean adjustPcd (int seqModuleSa, Vector<String> vExceptions) throws Exception {\r
+    public boolean adjustPcd (String seqModuleSa, Vector<String> vExceptions) throws Exception {\r
         boolean dataModified = false;\r
         ModuleSADocument.ModuleSA moduleSa = getModuleSA(seqModuleSa);\r
         int pcdCount = getPcdDataCount(seqModuleSa);\r
@@ -493,7 +494,7 @@ public class FpdFileContents {
         return dataModified;\r
     }\r
     \r
-    private void maintainDynPcdMap(String pcdKey, String moduleInfo) {\r
+    private synchronized void maintainDynPcdMap(String pcdKey, String moduleInfo) {\r
         \r
         ArrayList<String> al = dynPcdMap.get(pcdKey);\r
         if (al == null) {\r
@@ -523,8 +524,8 @@ public class FpdFileContents {
     //\r
     // key for ModuleSA : "ModuleGuid ModuleVer PackageGuid PackageVer Arch"\r
     //\r
-    public int getPcdDataCount (int i){\r
-        ModuleSADocument.ModuleSA msa = getModuleSA(i);\r
+    public int getPcdDataCount (String key){\r
+        ModuleSADocument.ModuleSA msa = getModuleSA(key);\r
         \r
         if (msa == null || msa.getPcdBuildDefinition() == null || msa.getPcdBuildDefinition().getPcdDataList() == null){\r
             return 0;\r
@@ -533,8 +534,8 @@ public class FpdFileContents {
         \r
     }\r
     \r
-    public void getPcdData (int i, String[][] saa) {\r
-        ModuleSADocument.ModuleSA msa = getModuleSA(i);\r
+    public void getPcdData (String key, String[][] saa) {\r
+        ModuleSADocument.ModuleSA msa = getModuleSA(key);\r
         \r
         if (msa == null || msa.getPcdBuildDefinition() == null || msa.getPcdBuildDefinition().getPcdDataList() == null){\r
             return;\r
@@ -553,8 +554,8 @@ public class FpdFileContents {
         }\r
     }\r
     \r
-    public void removePcdData (int seqModuleSa, String cName, String tsGuid) {\r
-        ModuleSADocument.ModuleSA moduleSa = getModuleSA(seqModuleSa);\r
+    public void removePcdData (String key, String cName, String tsGuid) {\r
+        ModuleSADocument.ModuleSA moduleSa = getModuleSA(key);\r
         if (moduleSa == null || moduleSa.getPcdBuildDefinition() == null){\r
             return;\r
         }\r
@@ -573,7 +574,7 @@ public class FpdFileContents {
                 PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData pcdData = (PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData)cursor.getObject();\r
                 if (pcdData.getCName().equals(cName) && pcdData.getTokenSpaceGuidCName().equals(tsGuid)) {\r
                     maintainDynPcdMap(cName + " " + tsGuid, moduleKey);\r
-                    if (getPcdDataCount(seqModuleSa) == 1) {\r
+                    if (getPcdDataCount(key) == 1) {\r
                         cursor.toParent();\r
                     }\r
                     cursor.removeXml();\r
@@ -780,17 +781,50 @@ public class FpdFileContents {
         }\r
     }\r
     \r
-    public void removeLibraryInstance(String key, int i) {\r
+    public boolean instanceExistsInModuleSA (String key, String mg, String mv, String pg, String pv) {\r
+        int count = 0;\r
+        if ((count = getLibraryInstancesCount(key)) > 0) {\r
+            String[][] saa = new String[count][5];\r
+            getLibraryInstances (key, saa);\r
+            for (int i = 0; i < count; ++i) {\r
+                if (mg.equalsIgnoreCase(saa[i][1]) && pg.equalsIgnoreCase(saa[i][3])) {\r
+                    boolean modVerMatch = false;\r
+                    boolean pkgVerMatch = false;\r
+                    if ((mv.equals("null") || saa[i][2] == null)) {\r
+                        modVerMatch = true;\r
+                    }\r
+                    if (pv.equals("null") || saa[i][4] == null) {\r
+                        pkgVerMatch = true;\r
+                    }\r
+                    if (modVerMatch && pkgVerMatch) {\r
+                    return true;\r
+                }\r
+                    else {\r
+                        if (mv.equals(saa[i][2]) && pv.equals(saa[i][4])) {\r
+                            return true;\r
+                        }\r
+                    }\r
+                }\r
+            }\r
+        }\r
+        return false;\r
+    }\r
+    \r
+    public void removeLibraryInstance(String key, String instanceKey) {\r
         ModuleSADocument.ModuleSA msa = getModuleSA(key);\r
         if (msa == null || msa.getLibraries() == null){\r
             return ;\r
         }\r
         \r
+        String[] instanceInfo = instanceKey.split(" ");\r
         XmlCursor cursor = msa.getLibraries().newCursor();\r
         if (cursor.toFirstChild()) {\r
-            for (int j = 0; j < i; ++j) {\r
-                cursor.toNextSibling();\r
+            do {\r
+                Instance libIns = (Instance)cursor.getObject();\r
+                if (libIns.getModuleGuid().equalsIgnoreCase(instanceInfo[0]) && libIns.getPackageGuid().equalsIgnoreCase(instanceInfo[2])) {\r
+                    break;\r
             }\r
+            }while (cursor.toNextSibling());\r
             cursor.push();\r
             while (cursor.hasPrevToken()) {\r
                 cursor.toPrevToken();\r
@@ -1284,7 +1318,7 @@ public class FpdFileContents {
         return choosedType;\r
     }\r
     \r
-    private void genPcdData (String cName, Object token, String tsGuid, String itemType, String dataType, String defaultVal, \r
+    private synchronized void genPcdData (String cName, Object token, String tsGuid, String itemType, String dataType, String defaultVal, \r
                              ModuleSADocument.ModuleSA moduleSa, PcdDeclarationsDocument.PcdDeclarations.PcdEntry spdPcd) \r
     throws PcdItemTypeConflictException, PcdValueMalFormed{\r
         if (moduleSa.getPcdBuildDefinition() == null){\r
@@ -1867,7 +1901,7 @@ public class FpdFileContents {
         cursor.dispose();\r
     }\r
     \r
-    public int getUserExtsIncModCount (String fvName, String userId, int id) {\r
+    public int getUserExtsIncModCount (String fvName, String userId, String id) {\r
         if (getfpdBuildOpts().getUserExtensionsList() == null) {\r
             return -1;\r
         }\r
@@ -1879,7 +1913,7 @@ public class FpdFileContents {
             if (!ues.getUserID().equals(userId)) {\r
                 continue;\r
             }\r
-            if (ues.getIdentifier() == null || ues.getIdentifier() != new Integer(id).toString()) {\r
+            if (ues.getIdentifier() == null || !ues.getIdentifier().equals(id)) {\r
                 continue;\r
             }\r
             XmlCursor cursor = ues.newCursor();\r
@@ -1901,7 +1935,7 @@ public class FpdFileContents {
         return -1;\r
     }\r
     \r
-    public void getUserExtsIncMods(String fvName, String userId, int id, String[][] saa) {\r
+    public void getUserExtsIncMods(String fvName, String userId, String id, String[][] saa) {\r
         if (getfpdBuildOpts().getUserExtensionsList() == null) {\r
             return;\r
         }\r
@@ -1921,7 +1955,7 @@ public class FpdFileContents {
         if (cursor.toChild(elementUserExts)) {\r
             do {\r
                 cursor.push();\r
-                if (cursor.getAttributeText(attribUserId).equals(userId) && cursor.getAttributeText(attribId).equals(id+"")) {\r
+                if (cursor.getAttributeText(attribUserId).equals(userId) && cursor.getAttributeText(attribId).equals(id)) {\r
                     cursor.toChild(elementFvName);\r
                     String elementName = cursor.getTextValue();\r
                     if (elementName.equals(fvName)) {\r
@@ -1968,7 +2002,7 @@ public class FpdFileContents {
         \r
     }\r
     \r
-    public void removeBuildOptionsUserExtensions (String fvName, String userId, int id) {\r
+    public void removeBuildOptionsUserExtensions (String fvName, String userId, String id) {\r
         if (getfpdBuildOpts().getUserExtensionsList() == null) {\r
             return;\r
         }\r
@@ -1979,7 +2013,7 @@ public class FpdFileContents {
             if (!ues.getUserID().equals(userId)) {\r
                 continue;\r
             }\r
-            if (ues.getIdentifier()== null || ues.getIdentifier() != new Integer(id).toString()) {\r
+            if (ues.getIdentifier()== null || !ues.getIdentifier().equals(id)) {\r
                 continue;\r
             }\r
             XmlCursor cursor = ues.newCursor();\r
@@ -2010,7 +2044,7 @@ public class FpdFileContents {
         return false;\r
     }\r
     \r
-    public boolean moduleInBuildOptionsUserExtensions (String fvName, String userId, int id, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) {\r
+    public boolean moduleInBuildOptionsUserExtensions (String fvName, String userId, String id, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) {\r
         boolean inList = false;\r
         if (getUserExtsIncModCount(fvName, userId, id) > 0) {\r
             XmlCursor cursor = getfpdBuildOpts().newCursor();\r
@@ -2028,7 +2062,7 @@ public class FpdFileContents {
             if (cursor.toChild(elementUserExts)) {\r
                 do {\r
                     cursor.push();\r
-                    if (cursor.getAttributeText(attribUserId).equals(userId) && cursor.getAttributeText(attribId).equals(id+"")) {\r
+                    if (cursor.getAttributeText(attribUserId).equals(userId) && cursor.getAttributeText(attribId).equals(id)) {\r
                         cursor.toChild(elementFvName);\r
                         String elementName = cursor.getTextValue();\r
                         if (elementName.equals(fvName)) {\r
@@ -2071,7 +2105,7 @@ public class FpdFileContents {
         return inList;\r
     }\r
     \r
-    public void removeModuleInBuildOptionsUserExtensions (String fvName, String userId, int id, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) {\r
+    public void removeModuleInBuildOptionsUserExtensions (String fvName, String userId, String id, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) {\r
         //\r
         // if there is only one module before remove operation, the whole user extension should be removed.\r
         //\r
@@ -2097,7 +2131,7 @@ public class FpdFileContents {
             if (cursor.toChild(elementUserExts)) {\r
                 do {\r
                     cursor.push();\r
-                    if (cursor.getAttributeText(attribUserId).equals(userId) && cursor.getAttributeText(attribId).equals(id+"")) {\r
+                    if (cursor.getAttributeText(attribUserId).equals(userId) && cursor.getAttributeText(attribId).equals(id)) {\r
                         cursor.toChild(elementFvName);\r
                         String elementName = cursor.getTextValue();\r
                         if (elementName.equals(fvName)) {\r
@@ -2138,7 +2172,7 @@ public class FpdFileContents {
         }\r
     }\r
     \r
-    public void addModuleIntoBuildOptionsUserExtensions (String fvName, String userId, int id, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) {\r
+    public void addModuleIntoBuildOptionsUserExtensions (String fvName, String userId, String id, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) {\r
         if (moduleInBuildOptionsUserExtensions (fvName, userId, id, moduleGuid, moduleVersion, packageGuid, packageVersion, arch)) {\r
             return;\r
         }\r
@@ -2151,7 +2185,7 @@ public class FpdFileContents {
             if (!ues.getUserID().equals(userId)) {\r
                 continue;\r
             }\r
-            if (ues.getIdentifier() == null || ues.getIdentifier() != new Integer(id).toString()) {\r
+            if (ues.getIdentifier() == null || !ues.getIdentifier().equals(id)) {\r
                 continue;\r
             }\r
             XmlCursor cursor = ues.newCursor();\r