1. Fix EDKT323 (Only dependent packages' ppis can be added to module's ppi section)

[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / workspace / WorkspaceTools.java

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java
index e022eb1d3a2e9e56ce276c3623a2af6a43690457..9c62ecde672525867f78af1ae0efdc5b11222f09 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java
@@ -25,6 +25,7 @@ import org.tianocore.DbPathAndFilename;
 import org.tianocore.IndustryStdIncludesDocument.IndustryStdIncludes;\r
 import org.tianocore.ModuleSurfaceAreaDocument.ModuleSurfaceArea;\r
 import org.tianocore.MsaFilesDocument.MsaFiles;\r
+import org.tianocore.PackageDependenciesDocument.PackageDependencies;\r
 import org.tianocore.PackageSurfaceAreaDocument.PackageSurfaceArea;\r
 import org.tianocore.PlatformSurfaceAreaDocument.PlatformSurfaceArea;\r
 import org.tianocore.SourceFilesDocument.SourceFiles;\r
@@ -327,7 +328,7 @@ public class WorkspaceTools {
                         }\r
                     }\r
                     if (!isFind) {\r
-                        v.addElement(id);    \r
+                        v.addElement(id);\r
                     }\r
                 }\r
             }\r
@@ -466,6 +467,20 @@ public class WorkspaceTools {
         Sort.sortVectorString(vector, DataType.SORT_TYPE_ASCENDING);\r
         return vector;\r
     }\r
+    \r
+    public Vector<String> getAllLibraryClassDefinitionsFromPackages(Vector<PackageIdentification> vpid) {\r
+        Vector<String> vector = new Vector<String>();\r
+        for (int index = 0; index < vpid.size(); index++) {\r
+            Vector<String> v = getAllLibraryClassDefinitionsFromPackage(GlobalData.openingPackageList\r
+                                                                                                     .getPackageSurfaceAreaFromId(vpid.get(index)));\r
+            if (v != null && v.size() > 0) {\r
+                vector.addAll(v);\r
+            }\r
+\r
+        }\r
+        Sort.sortVectorString(vector, DataType.SORT_TYPE_ASCENDING);\r
+        return vector;\r
+    }\r
 \r
     public Vector<String> getAllProtocolDeclarationsFromWorkspace() {\r
         Vector<String> vector = new Vector<String>();\r
@@ -481,6 +496,20 @@ public class WorkspaceTools {
         return vector;\r
     }\r
 \r
+    public Vector<String> getAllProtocolDeclarationsFromPackages(Vector<PackageIdentification> vpid) {\r
+        Vector<String> vector = new Vector<String>();\r
+        for (int index = 0; index < vpid.size(); index++) {\r
+            Vector<String> v = getAllProtocolDeclarationsFromPackage(GlobalData.openingPackageList\r
+                                                                                                  .getPackageSurfaceAreaFromId(vpid\r
+                                                                                                                                   .get(index)));\r
+            if (v != null && v.size() > 0) {\r
+                vector.addAll(v);\r
+            }\r
+        }\r
+        Sort.sortVectorString(vector, DataType.SORT_TYPE_ASCENDING);\r
+        return vector;\r
+    }\r
+\r
     public Vector<String> getAllPpiDeclarationsFromWorkspace() {\r
         Vector<String> vector = new Vector<String>();\r
         for (int index = 0; index < GlobalData.vPackageList.size(); index++) {\r
@@ -495,6 +524,20 @@ public class WorkspaceTools {
         return vector;\r
     }\r
 \r
+    public Vector<String> getAllPpiDeclarationsFromPackages(Vector<PackageIdentification> vpid) {\r
+        Vector<String> vector = new Vector<String>();\r
+        for (int index = 0; index < vpid.size(); index++) {\r
+            Vector<String> v = getAllPpiDeclarationsFromPackage(GlobalData.openingPackageList\r
+                                                                                             .getPackageSurfaceAreaFromId(vpid\r
+                                                                                                                              .get(index)));\r
+            if (v != null && v.size() > 0) {\r
+                vector.addAll(v);\r
+            }\r
+        }\r
+        Sort.sortVectorString(vector, DataType.SORT_TYPE_ASCENDING);\r
+        return vector;\r
+    }\r
+\r
     public Vector<String> getAllGuidDeclarationsFromWorkspace() {\r
         Vector<String> vector = new Vector<String>();\r
         for (int index = 0; index < GlobalData.vPackageList.size(); index++) {\r
@@ -510,6 +553,21 @@ public class WorkspaceTools {
         return vector;\r
     }\r
 \r
+    public Vector<String> getAllGuidDeclarationsFromPackages(Vector<PackageIdentification> vpid) {\r
+        Vector<String> vector = new Vector<String>();\r
+        for (int index = 0; index < vpid.size(); index++) {\r
+            Vector<String> v = getAllGuidDeclarationsFromPackage(GlobalData.openingPackageList\r
+                                                                                              .getPackageSurfaceAreaFromId(vpid\r
+                                                                                                                               .get(index)));\r
+            if (v != null && v.size() > 0) {\r
+                vector.addAll(v);\r
+            }\r
+\r
+        }\r
+        Sort.sortVectorString(vector, DataType.SORT_TYPE_ASCENDING);\r
+        return vector;\r
+    }\r
+\r
     public PcdVector getAllPcdDeclarationsFromWorkspace() {\r
         PcdVector vector = new PcdVector();\r
         for (int index = 0; index < GlobalData.openingPackageList.size(); index++) {\r
@@ -525,6 +583,21 @@ public class WorkspaceTools {
         return vector;\r
     }\r
 \r
+    public PcdVector getAllPcdDeclarationsFromPackages(Vector<PackageIdentification> vpid) {\r
+        PcdVector vector = new PcdVector();\r
+        for (int index = 0; index < vpid.size(); index++) {\r
+            PcdVector v = getAllPcdDeclarationsFromPackage(GlobalData.openingPackageList\r
+                                                                                        .getPackageSurfaceAreaFromId(vpid\r
+                                                                                                                         .get(index)));\r
+            if (v != null && v.size() > 0) {\r
+                vector.addAll(v);\r
+            }\r
+\r
+        }\r
+        Sort.sortPcds(vector, DataType.SORT_TYPE_ASCENDING);\r
+        return vector;\r
+    }\r
+\r
     /**\r
      Find a module's package's id\r
      \r
@@ -705,4 +778,30 @@ public class WorkspaceTools {
 \r
         return v;\r
     }\r
+\r
+    /**\r
+     Get a module's all package dependencies\r
+     \r
+     @param mid The module id\r
+     @return A vector of all package dependency ids\r
+     \r
+     **/\r
+    public Vector<PackageIdentification> getPackageDependenciesOfModule(ModuleIdentification mid) {\r
+        Vector<PackageIdentification> vpid = new Vector<PackageIdentification>();\r
+        ModuleSurfaceArea msa = GlobalData.openingModuleList.getModuleSurfaceAreaFromId(mid);\r
+        if (msa != null) {\r
+            PackageDependencies pd = msa.getPackageDependencies();\r
+            if (pd != null) {\r
+                for (int index = 0; index < pd.getPackageList().size(); index++) {\r
+                    String guid = pd.getPackageList().get(index).getPackageGuid();\r
+                    String version = pd.getPackageList().get(index).getPackageVersion();\r
+                    PackageIdentification pid = GlobalData.openingPackageList.getIdByGuidVersion(guid, version);\r
+                    if (pid != null) {\r
+                        vpid.addElement(pid);\r
+                    }\r
+                }\r
+            }\r
+        }\r
+        return vpid;\r
+    }\r
 }\r