1. Fix EDKT339 Library Class Search need to get info for selected library class

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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java
index c27b81eea0c029dd5a1d402f2f48396150dcb400..1969d07503f12e215ae13791c8d9b3be982fba5b 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java
@@ -471,7 +471,7 @@ public class WorkspaceTools {
                         if (type.elementAt(indexOfType).equals(DataType.PCD_ITEM_TYPE_DYNAMIC)) {\r
                             hasDYNAMIC = true;\r
                         }\r
-                        if(type.elementAt(indexOfType).equals(DataType.PCD_ITEM_TYPE_FEATURE_FLAG)) {\r
+                        if (type.elementAt(indexOfType).equals(DataType.PCD_ITEM_TYPE_FEATURE_FLAG)) {\r
                             hasFEATURE_FLAG = true;\r
                         }\r
                     }\r
@@ -666,10 +666,11 @@ public class WorkspaceTools {
                 //\r
                 // Check id\r
                 //\r
-                if (mid.equals(id)) {\r
-                    return GlobalData.vPackageList.elementAt(indexI);\r
+                if (mid != null) {\r
+                    if (mid.equals(id)) {\r
+                        return GlobalData.vPackageList.elementAt(indexI);\r
+                    }\r
                 }\r
-\r
             }\r
         }\r
 \r
@@ -809,19 +810,10 @@ public class WorkspaceTools {
                     //\r
                     PackageIdentification pid = GlobalData.openingModuleList.getIdByPath(path).getPackageId();\r
                     PackageSurfaceArea spd = GlobalData.openingPackageList.getPackageSurfaceAreaFromId(pid);\r
-                    if (spd != null) {\r
-                        if (spd.getLibraryClassDeclarations() != null) {\r
-                            LibraryClassDeclarations lcdl = spd.getLibraryClassDeclarations();\r
-                            for (int indexOfLibOfSpd = 0; indexOfLibOfSpd < lcdl.sizeOfLibraryClassArray(); indexOfLibOfSpd++) {\r
-                                if (lcdl.getLibraryClassList().get(indexOfLibOfSpd).getName().equals(name)) {\r
-                                    v.addElement(Tools.convertPathToCurrentOsType(Tools.getFilePathOnly(pid.getPath())\r
-                                                                                  + DataType.FILE_SEPARATOR\r
-                                                                                  + lcdl.getLibraryClassList()\r
-                                                                                        .get(indexOfLibOfSpd)\r
-                                                                                        .getIncludeHeader()));\r
-                                }\r
-                            }\r
-                        }\r
+                    String headerFile = getHeaderFileFromPackageByLibraryClassName(spd, name);\r
+                    if (!Tools.isEmpty(headerFile)) {\r
+                        v.addElement(Tools.convertPathToCurrentOsType(Tools.getFilePathOnly(pid.getPath())\r
+                                                                      + DataType.FILE_SEPARATOR + headerFile));\r
                     }\r
                 }\r
             }\r
@@ -920,4 +912,20 @@ public class WorkspaceTools {
         }\r
         return v;\r
     }\r
+\r
+    public String getHeaderFileFromPackageByLibraryClassName(PackageSurfaceArea spd, String name) {\r
+        String headerFile = "";\r
+        if (spd != null) {\r
+            if (spd.getLibraryClassDeclarations() != null) {\r
+                LibraryClassDeclarations lcdl = spd.getLibraryClassDeclarations();\r
+                for (int indexOfLibOfSpd = 0; indexOfLibOfSpd < lcdl.sizeOfLibraryClassArray(); indexOfLibOfSpd++) {\r
+                    if (lcdl.getLibraryClassList().get(indexOfLibOfSpd).getName().equals(name)) {\r
+                        return lcdl.getLibraryClassList().get(indexOfLibOfSpd).getIncludeHeader();\r
+                    }\r
+                }\r
+            }\r
+        }\r
+\r
+        return headerFile;\r
+    }\r
 }\r