]> git.proxmox.com Git - mirror_edk2.git/blobdiff - Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
Support prebuild and postbuild for UserExtension for Platform build. If UserExtension...
[mirror_edk2.git] / Tools / Source / GenBuild / org / tianocore / build / global / SurfaceAreaQuery.java
index 956033993d523ad95abc7978508404b28166efae..149b30dd173e88fb7946e4b21eeb629bc55a7e25 100644 (file)
@@ -23,17 +23,13 @@ import java.util.Stack;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
-import org.apache.xmlbeans.XmlNormalizedString;\r
 import org.apache.xmlbeans.XmlObject;\r
 import org.apache.xmlbeans.XmlString;\r
 import org.tianocore.BuildOptionsDocument;\r
 import org.tianocore.CNameType;\r
-import org.tianocore.DataIdDocument;\r
 import org.tianocore.ExternsDocument;\r
 import org.tianocore.FileNameConvention;\r
-import org.tianocore.FvAttributeDocument;\r
 import org.tianocore.FvImagesDocument;\r
-import org.tianocore.FvOptionDocument;\r
 import org.tianocore.GuidDeclarationsDocument;\r
 import org.tianocore.GuidsDocument;\r
 import org.tianocore.LibrariesDocument;\r
@@ -51,22 +47,23 @@ import org.tianocore.PackageDependenciesDocument;
 import org.tianocore.PackageHeadersDocument;\r
 import org.tianocore.PcdCodedDocument;\r
 import org.tianocore.PlatformDefinitionsDocument;\r
+import org.tianocore.PlatformHeaderDocument;\r
 import org.tianocore.PpiDeclarationsDocument;\r
 import org.tianocore.ProtocolDeclarationsDocument;\r
 import org.tianocore.Sentence;\r
 import org.tianocore.SpdHeaderDocument;\r
-import org.tianocore.SupportedArchitectures;\r
+import org.tianocore.UserExtensionsDocument;\r
 import org.tianocore.FilenameDocument.Filename;\r
 import org.tianocore.MsaHeaderDocument.MsaHeader;\r
 import org.tianocore.ProtocolsDocument.Protocols.Protocol;\r
 import org.tianocore.ProtocolsDocument.Protocols.ProtocolNotify;\r
-import org.tianocore.PlatformHeaderDocument;\r
 import org.tianocore.build.id.FpdModuleIdentification;\r
 import org.tianocore.build.id.ModuleIdentification;\r
 import org.tianocore.build.id.PackageIdentification;\r
 import org.tianocore.build.id.PlatformIdentification;\r
 import org.tianocore.build.toolchain.ToolChainInfo;\r
 import org.tianocore.logger.EdkLog;\r
+import org.w3c.dom.Node;\r
 \r
 /**\r
  * SurfaceAreaQuery class is used to query Surface Area information from msa,\r
@@ -269,12 +266,7 @@ public class SurfaceAreaQuery {
         String[] xPath;\r
         Object[] returns;\r
 \r
-        if (arch == null || arch.equals("")) {\r
-            xPath = new String[] { "/Filename" };\r
-        } else {\r
-            xPath = new String[] { "/Filename[not(@SupArchList) or @SupArchList='"\r
-                    + arch + "']" };\r
-        }\r
+        xPath = new String[] { "/Filename" };\r
 \r
         returns = get("SourceFiles", xPath);\r
 \r
@@ -283,10 +275,18 @@ public class SurfaceAreaQuery {
         }\r
 \r
         Filename[] sourceFileNames = (Filename[]) returns;\r
-        String[][] outputString = new String[sourceFileNames.length][2];\r
+        List<String[]> outputList = new ArrayList<String[]>();\r
         for (int i = 0; i < sourceFileNames.length; i++) {\r
-            outputString[i][0] = sourceFileNames[i].getToolCode();\r
-            outputString[i][1] = sourceFileNames[i].getStringValue();\r
+            List archList = sourceFileNames[i].getSupArchList();\r
+            if (arch == null || arch.equalsIgnoreCase("") || archList == null || contains(archList, arch)) {\r
+                outputList.add(new String[] {sourceFileNames[i].getToolCode(),sourceFileNames[i].getStringValue()});\r
+            }\r
+        }\r
+           \r
+        String[][] outputString = new String[outputList.size()][2];\r
+        for (int index = 0; index < outputList.size(); index++) {\r
+            outputString[index][0] = outputList.get(index)[0];\r
+            outputString[index][1] = outputList.get(index)[1];\r
         }\r
         return outputString;\r
     }\r
@@ -397,7 +397,6 @@ public class SurfaceAreaQuery {
         String toolchainFamily = null;\r
         List<String> archList = null;\r
         String cmd = null;\r
-        String targetName = null;\r
         String optionName = null;\r
 \r
         Object[] returns = get(from, xPath);\r
@@ -442,19 +441,16 @@ public class SurfaceAreaQuery {
             }\r
 \r
             archList = new ArrayList<String>();\r
-            List<String> archEnumList = option.getSupArchList();            \r
+            List archEnumList = option.getSupArchList();            \r
             if (archEnumList == null) {\r
                 archList.add(null);\r
             } else {\r
-                archList.addAll(archEnumList);\r
-                /*\r
+                //archList.addAll(archEnumList);\r
                 Iterator it = archEnumList.iterator();\r
                 while (it.hasNext()) {\r
-                    System.out.println(it.next().getClass().getName());\r
-                    SupportedArchitectures.Enum archType = it.next();\r
-                    archList.add(archType.toString());\r
+                    String archType = (String)it.next();\r
+                    archList.add(archType);\r
                 }\r
-                */\r
             }\r
 \r
             cmd = option.getToolCode();\r
@@ -558,26 +554,37 @@ public class SurfaceAreaQuery {
         String packageGuid = null;\r
         String packageVersion = null;\r
 \r
-        if (arch == null || arch.equals("")) {\r
-            xPath = new String[] { "/Package" };\r
-        } else {\r
-            xPath = new String[] { "/Package[not(@SupArchList) or @SupArchList='"\r
-                    + arch + "']" };\r
-        }\r
-\r
+        \r
+        xPath = new String[] { "/Package" };\r
+        \r
         Object[] returns = get("PackageDependencies", xPath);\r
         if (returns == null) {\r
             return new PackageIdentification[0];\r
         }\r
-        PackageIdentification[] packageIdList = new PackageIdentification[returns.length];\r
+\r
+        //\r
+        //  Get packageIdentification \r
+        // \r
+        List<PackageIdentification> packageIdList = new ArrayList<PackageIdentification>();\r
         for (int i = 0; i < returns.length; i++) {\r
             PackageDependenciesDocument.PackageDependencies.Package item = (PackageDependenciesDocument.PackageDependencies.Package) returns[i];\r
-            packageGuid = item.getPackageGuid();\r
-            packageVersion = item.getPackageVersion();\r
-            packageIdList[i] = (new PackageIdentification(null, packageGuid,\r
+            List archList = item.getSupArchList();\r
+            if (arch == null || archList == null || contains(archList, arch)) {\r
+                packageGuid = item.getPackageGuid();\r
+                packageVersion = item.getPackageVersion();\r
+                packageIdList.add(new PackageIdentification(null, packageGuid,\r
                     packageVersion));\r
+            }\r
         }\r
-        return packageIdList;\r
+\r
+        //\r
+        //  transfer packageIdentification list to array.\r
+        // \r
+        PackageIdentification[] packageIdArray = new PackageIdentification[packageIdList.size()];\r
+        for (int i = 0; i < packageIdList.size(); i++) {\r
+            packageIdArray[i] = new PackageIdentification(null, packageIdList.get(i).getGuid(),packageIdList.get(i).getVersion());\r
+        }\r
+        return packageIdArray;\r
     }\r
 \r
     /**\r
@@ -590,9 +597,8 @@ public class SurfaceAreaQuery {
      *          xpath\r
      * @returns null if nothing is there\r
      */\r
-    public static String[] getLibraryClasses(String usage) {\r
+    public static String[] getLibraryClasses(String usage, String arch) {\r
         String[] xPath;\r
-\r
         if (usage == null || usage.equals("")) {\r
             xPath = new String[] { "/LibraryClass" };\r
         } else {\r
@@ -605,11 +611,19 @@ public class SurfaceAreaQuery {
         }\r
 \r
         LibraryClassDocument.LibraryClass[] libraryClassList = (LibraryClassDocument.LibraryClass[]) returns;\r
-        String[] libraryClassName = new String[libraryClassList.length];\r
+        List<String> libraryClassName = new ArrayList<String>();\r
         for (int i = 0; i < libraryClassList.length; i++) {\r
-            libraryClassName[i] = libraryClassList[i].getKeyword();\r
+                       List archList = libraryClassList[i].getSupArchList();\r
+                       \r
+                       if (arch == null || contains(archList, arch)) {\r
+                libraryClassName.add(libraryClassList[i].getKeyword());\r
+                       }\r
         }\r
-        return libraryClassName;\r
+               String[] libraryArray = new String[libraryClassName.size()];\r
+               for (int i = 0; i < libraryClassName.size(); i++) {\r
+                       libraryArray[i] = libraryClassName.get(i);\r
+               }\r
+        return libraryArray;\r
     }\r
 \r
     /**\r
@@ -654,7 +668,7 @@ public class SurfaceAreaQuery {
         if (arch == null || arch.equals("")) {\r
             return new String[0];\r
         } else {\r
-            archXpath = "/Protocol[@SupArchList='" + arch + "']";\r
+            archXpath = "/Protocol";\r
             if (usage != null && !usage.equals("")) {\r
                 usageXpath = "/Protocol[@Usage='" + usage + "']";\r
                 xPath = new String[] { usageXpath, archXpath };\r
@@ -699,15 +713,20 @@ public class SurfaceAreaQuery {
         if (returns == null) {\r
             return new String[0];\r
         }\r
-        Protocol[] protocolList = (Protocol[]) returns;\r
+        Protocol[] returnlList = (Protocol[]) returns;\r
 \r
-        String[] protocolArray = new String[returns.length];\r
+        List<String> protocolList = new ArrayList<String>();\r
+        \r
         for (int i = 0; i < returns.length; i++) {\r
-            List<String> archList = protocolList[i].getSupArchList();\r
-            if (archList == null || archList.contains(arch)){\r
-                protocolArray[i] = protocolList[i].getProtocolCName(); \r
+            List archList = returnlList[i].getSupArchList();\r
+            if (archList == null || contains(archList, arch)){\r
+                protocolList.add(returnlList[i].getProtocolCName());\r
             }\r
         }\r
+        String[] protocolArray = new String[protocolList.size()];\r
+        for (int i = 0; i < protocolList.size(); i++) {\r
+            protocolArray[i] = protocolList.get(i);\r
+        }\r
         return protocolArray;\r
     }\r
 \r
@@ -734,16 +753,20 @@ public class SurfaceAreaQuery {
             return new String[0];\r
         }\r
 \r
-        String[] protocolNotifyList = new String[returns.length];\r
+        List<String> protocolNotifyList = new ArrayList<String>();\r
+        \r
         for (int i = 0; i < returns.length; i++) {\r
-            List<String> archList = ((ProtocolNotify) returns[i]).getSupArchList();\r
-            if (archList == null || archList.contains(arch)){\r
-                protocolNotifyList[i] = ((ProtocolNotify) returns[i]).getProtocolNotifyCName();\r
+            List archList = ((ProtocolNotify) returns[i]).getSupArchList();\r
+            if (archList == null || contains(archList, arch)){\r
+                protocolNotifyList.add(((ProtocolNotify) returns[i]).getProtocolNotifyCName());\r
             }\r
             \r
         }\r
-\r
-        return protocolNotifyList;\r
+        String[] protocolNotifyArray = new String[protocolNotifyList.size()];\r
+        for (int i = 0; i < protocolNotifyList.size(); i++) {\r
+            protocolNotifyArray[i] = protocolNotifyList.get(i);\r
+        }\r
+        return protocolNotifyArray;\r
     }\r
 \r
     /**\r
@@ -764,7 +787,7 @@ public class SurfaceAreaQuery {
         if (arch == null || arch.equals("")) {\r
             return new String[0];\r
         } else {\r
-            archXpath = "/ProtocolNotify[@SupArchList='" + arch + "']";\r
+            archXpath = "/ProtocolNotify";\r
             if (usage != null && !usage.equals("")) {\r
                 usageXpath = "/ProtocolNotify[@Usage='" + arch + "']";\r
                 xPath = new String[] { archXpath, usageXpath };\r
@@ -851,16 +874,21 @@ public class SurfaceAreaQuery {
             return new String[0];\r
         }\r
 \r
-        String[] ppiNotifyList = new String[returns.length];\r
+        \r
+        List<String> ppiNotifyList = new ArrayList<String>();\r
         for (int i = 0; i < returns.length; i++) {\r
-            List<String> archList = ((PPIsDocument.PPIs.PpiNotify) returns[i]).getSupArchList();\r
-            if (archList == null || archList.contains(arch)){\r
-                ppiNotifyList[i] = ((PPIsDocument.PPIs.PpiNotify) returns[i]).getPpiNotifyCName();    \r
+            List archList = ((PPIsDocument.PPIs.PpiNotify) returns[i]).getSupArchList();\r
+            if (archList == null || contains(archList, arch)){\r
+                ppiNotifyList.add(((PPIsDocument.PPIs.PpiNotify) returns[i]).getPpiNotifyCName()); \r
             }\r
             \r
         }\r
+        String[] ppiNotifyArray = new String[ppiNotifyList.size()];\r
+        for (int i = 0; i < ppiNotifyList.size(); i++) {\r
+            ppiNotifyArray[i] = ppiNotifyList.get(i);\r
+        }\r
 \r
-        return ppiNotifyList;\r
+        return ppiNotifyArray;\r
     }\r
 \r
     /**\r
@@ -927,15 +955,19 @@ public class SurfaceAreaQuery {
             return new String[0];\r
         }\r
 \r
-        String[] ppiList = new String[returns.length];\r
+        List<String> ppiList = new ArrayList<String>();\r
         for (int i = 0; i < returns.length; i++) {\r
-            List<String> archList = ((PPIsDocument.PPIs.Ppi) returns[i]).getSupArchList();\r
-            if (archList == null || archList.contains(arch)){\r
-                ppiList[i] = ((PPIsDocument.PPIs.Ppi) returns[i]).getPpiCName();    \r
+            List archList = ((PPIsDocument.PPIs.Ppi) returns[i]).getSupArchList();\r
+            if (archList == null || contains(archList, arch)){\r
+                ppiList.add(((PPIsDocument.PPIs.Ppi) returns[i]).getPpiCName());    \r
             }\r
             \r
         }\r
-        return ppiList;\r
+        String[] ppiArray = new String[ppiList.size()];\r
+        for (int i = 0; i < ppiList.size(); i++) {\r
+            ppiArray[i] = ppiList.get(i);\r
+        }\r
+        return ppiArray;\r
     }\r
 \r
     /**\r
@@ -1001,15 +1033,20 @@ public class SurfaceAreaQuery {
         if (returns == null) {\r
             return new String[0];\r
         }\r
-        String[] guidList = new String[returns.length];\r
+\r
+        List<String> guidList = new ArrayList<String>();\r
         for (int i = 0; i < returns.length; i++) {\r
-            List<String> archList = ((GuidsDocument.Guids.GuidCNames) returns[i]).getSupArchList();\r
-            if (archList == null || archList.contains(arch)){\r
-                guidList[i] = ((GuidsDocument.Guids.GuidCNames) returns[i]).getGuidCName();    \r
+            List archList = ((GuidsDocument.Guids.GuidCNames) returns[i]).getSupArchList();\r
+            if (archList == null || contains(archList, arch)){\r
+                guidList.add(((GuidsDocument.Guids.GuidCNames) returns[i]).getGuidCName());    \r
             }\r
             \r
         }\r
-        return guidList;\r
+        String[] guidArray = new String[guidList.size()];\r
+        for (int i = 0; i < guidList.size(); i++) {\r
+            guidArray[i] = guidList.get(i);\r
+        }\r
+        return guidArray;\r
 \r
     }\r
 \r
@@ -1074,6 +1111,11 @@ public class SurfaceAreaQuery {
         if (arch == null || arch.equalsIgnoreCase("")) {\r
             xPath = new String[] { "/Instance" };\r
         } else {\r
+            //\r
+            // Since Schema don't have SupArchList now, so the follow Xpath is \r
+            // equal to "/Instance" and [not(@SupArchList) or @SupArchList= arch]\r
+            // don't have effect.\r
+            //\r
             xPath = new String[] { "/Instance[not(@SupArchList) or @SupArchList='"\r
                     + arch + "']" };\r
         }\r
@@ -1342,14 +1384,28 @@ public class SurfaceAreaQuery {
         return result;\r
     }\r
     \r
-    public static XmlObject getFpdUserExtension() {\r
-        String[] xPath = new String[] { "" };\r
+    public static Node getFpdUserExtensionPreBuild() {\r
+        String[] xPath = new String[] { "/UserExtensions[@UserID='TianoCore' and @Identifier='0']" }; \r
 \r
         Object[] queryResult = get("PlatformSurfaceArea", xPath);\r
-        if (queryResult == null) {\r
+        if (queryResult == null || queryResult.length == 0) {\r
             return null;\r
         }\r
-        return null;\r
+        UserExtensionsDocument.UserExtensions a =  (UserExtensionsDocument.UserExtensions)queryResult[0];\r
+        \r
+        return a.getDomNode();\r
+    }\r
+    \r
+    public static Node getFpdUserExtensionPostBuild() {\r
+        String[] xPath = new String[] { "/UserExtensions[@UserID='TianoCore' and @Identifier='1']" }; \r
+\r
+        Object[] queryResult = get("PlatformSurfaceArea", xPath);\r
+        if (queryResult == null || queryResult.length == 0) {\r
+            return null;\r
+        }\r
+        UserExtensionsDocument.UserExtensions a =  (UserExtensionsDocument.UserExtensions)queryResult[0];\r
+        \r
+        return a.getDomNode();\r
     }\r
 \r
     /**\r
@@ -1541,81 +1597,7 @@ public class SurfaceAreaQuery {
             return null;\r
         }\r
 \r
-        // PcdCoded.PcdData[] pcds = (PcdCoded.PcdData[]) returns;\r
-        // String[][] result = new String[pcds.length][2];\r
-        // for (int i = 0; i < returns.length; ++i) {\r
-        // if (pcds[i].getItemType() != null) {\r
-        // result[i][1] = pcds[i].getItemType().toString();\r
-        // } else {\r
-        // result[i][1] = null;\r
-        // }\r
-        // result[i][0] = pcds[i].getCName();\r
-        // }\r
-\r
-        return null;\r
-    }\r
-\r
-    /**\r
-     * Get the PcdToken array from module's surface area document. The array\r
-     * should contains following data:\r
-     * <p>\r
-     * -------------------------------------------------------------------\r
-     * </p>\r
-     * <p>\r
-     * CName | ItemType | TokenspaceName | DefaultValue | Usage | HelpText\r
-     * </p>\r
-     * <p>\r
-     * -------------------------------------------------------------------\r
-     * </p>\r
-     * <p>\r
-     * Note: Until new schema applying, now we can only get CName, ItemType,\r
-     * </p>\r
-     * \r
-     * @return 2-array table contains all information of PCD token retrieved\r
-     *         from MSA.\r
-     */\r
-    public static Object[][] etModulePCDTokenArray() {\r
         return null;\r
-        // int index;\r
-        // Object[][] result;\r
-        // PCDs.PcdData[] pcds;\r
-        // String[] xPath = new String[] { "/PcdData" };\r
-        // Object[] returns = get("PCDs", xPath);\r
-        //\r
-        // if ((returns == null) || (returns.length == 0)) {\r
-        // return null;\r
-        // }\r
-        //\r
-        // pcds = (PCDs.PcdData[]) returns;\r
-        // result = new Object[pcds.length][6];\r
-        // for (index = 0; index < pcds.length; index++) {\r
-        // //\r
-        // // Get CName\r
-        // //\r
-        // result[index][0] = pcds[index].getCName();\r
-        // //\r
-        // // Get ItemType: FEATURE_FLAG, FIXED_AT_BUILD, PATCHABLE_IN_MODLE,\r
-        // // DYNAMIC, DYNAMIC_EX\r
-        // //\r
-        // if (pcds[index].getItemType() != null) {\r
-        // result[index][1] = pcds[index].getItemType().toString();\r
-        // } else {\r
-        // result[index][1] = null;\r
-        // }\r
-        //\r
-        // //\r
-        // // BUGBUG: following field can *not* be got from current MSA until\r
-        // // schema changed.\r
-        // //\r
-        // // result [index][2] = pcds[index].getTokenSpaceName();\r
-        // result[index][2] = null;\r
-        // result[index][3] = pcds[index].getDefaultValue();\r
-        // // result [index][4] = pcds[index].getUsage ();\r
-        // result[index][4] = null;\r
-        // // result [index][5] = pcds[index].getHelpText ();\r
-        // result[index][5] = null;\r
-        // }\r
-        // return result;\r
     }\r
 \r
     /**\r
@@ -1737,7 +1719,7 @@ public class SurfaceAreaQuery {
         if (returns == null) {\r
             return packageIncludeMap;\r
         }\r
-//        GlobalData.log.info("" + returns[0].getClass().getName());\r
+\r
         for (int i = 0; i < returns.length; i++) {\r
             PackageHeadersDocument.PackageHeaders.IncludePkgHeader includeHeader = (PackageHeadersDocument.PackageHeaders.IncludePkgHeader) returns[i];\r
             packageIncludeMap.put(includeHeader.getModuleType().toString(),\r
@@ -1858,31 +1840,6 @@ public class SurfaceAreaQuery {
         return ppiMap;\r
     }\r
 \r
-    /**\r
-     * getToolChainFamily\r
-     * \r
-     * This function is to retrieve ToolChainFamily attribute of FPD\r
-     * <BuildOptions>\r
-     * \r
-     * @param\r
-     * @return toolChainFamily If find toolChainFamily attribute in\r
-     *         <BuildOptions> Null If don't have toolChainFamily in\r
-     *         <BuildOptions>.\r
-     */\r
-    public String getToolChainFamily() {\r
-        String toolChainFamily;\r
-        String[] xPath = new String[] { "/BuildOptions" };\r
-\r
-        Object[] result = get("PlatformSurfaceArea", xPath);\r
-        if (result == null) {\r
-            return null;\r
-        }\r
-        // toolChainFamily =\r
-        // ((BuildOptionsDocument.BuildOptions)result[0]).getToolChainFamilies();\r
-        // return toolChainFamily;\r
-        return null;\r
-    }\r
-\r
     /**\r
      * Retrieve module Guid string\r
      * \r
@@ -1919,24 +1876,44 @@ public class SurfaceAreaQuery {
     is same, and token name should not be conflicted.\r
     \r
     @return String[]\r
- **/\r
- public static String[] getModulePcdEntryNameArray() {\r
-     PcdCodedDocument.PcdCoded.PcdEntry[] pcdEntries  = null;\r
-     String[]            results;\r
-     int                 index;\r
-     String[]            xPath       = new String[] {"/PcdEntry"};\r
-     Object[]         returns     = get ("PcdCoded", xPath);\r
-     \r
-     if (returns == null) {\r
-         return new String[0];\r
-     }\r
-     \r
-     pcdEntries = (PcdCodedDocument.PcdCoded.PcdEntry[])returns;\r
-     results    = new String[pcdEntries.length];\r
-     \r
-     for (index = 0; index < pcdEntries.length; index ++) {\r
-         results[index] = pcdEntries[index].getCName();\r
-     }\r
-     return results;\r
- }\r
+    **/\r
+    public static String[] getModulePcdEntryNameArray() {\r
+        PcdCodedDocument.PcdCoded.PcdEntry[] pcdEntries  = null;\r
+        String[]            results;\r
+        int                 index;\r
+        String[]            xPath       = new String[] {"/PcdEntry"};\r
+        Object[]         returns     = get ("PcdCoded", xPath);\r
+\r
+        if (returns == null) {\r
+            return new String[0];\r
+        }\r
+\r
+        pcdEntries = (PcdCodedDocument.PcdCoded.PcdEntry[])returns;\r
+        results    = new String[pcdEntries.length];\r
+\r
+        for (index = 0; index < pcdEntries.length; index ++) {\r
+            results[index] = pcdEntries[index].getCName();\r
+        }\r
+        return results;\r
+    }\r
+\r
+    /**\r
+     Search in a List for a given string\r
+\r
+     @return boolean\r
+     **/\r
+    public static boolean contains(List list, String str) {\r
+               if (list == null || list.size()== 0) {\r
+                       return true;\r
+               }\r
+        Iterator it = list.iterator();\r
+        while (it.hasNext()) {\r
+            String s = (String)it.next();\r
+            if (s.equalsIgnoreCase(str)) {\r
+                return true;\r
+            }\r
+        }\r
+\r
+        return false;\r
+    }\r
 }\r