Fixed the build warning issue

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@812 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java b/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
index ba27de2f0ad7662298e04cfb7e74dec861f36208..235c604eb3c391ab68495842378ed767341e7f4c 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
@@ -277,9 +277,8 @@ public class SurfaceAreaQuery {
         Filename[] sourceFileNames = (Filename[]) returns;\r
         List<String[]> outputList = new ArrayList<String[]>();\r
         for (int i = 0; i < sourceFileNames.length; i++) {\r
-            @SuppressWarnings("unchecked")\r
-            List<String> archList = sourceFileNames[i].getSupArchList();\r
-            if (arch == null || arch.equalsIgnoreCase("") || archList == null || archList.contains(arch)) {\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
@@ -443,20 +442,16 @@ public class SurfaceAreaQuery {
             }\r
 \r
             archList = new ArrayList<String>();\r
-            @SuppressWarnings("unchecked")\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
@@ -574,9 +569,8 @@ public class SurfaceAreaQuery {
         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
-            @SuppressWarnings("unchecked")\r
-            List<String> archList = item.getSupArchList();\r
-            if (arch == null || archList == null || archList.contains(arch)) {\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
@@ -718,9 +712,8 @@ public class SurfaceAreaQuery {
         List<String> protocolList = new ArrayList<String>();\r
         \r
         for (int i = 0; i < returns.length; i++) {\r
-            @SuppressWarnings("unchecked")\r
-            List<String> archList = returnlList[i].getSupArchList();\r
-            if (archList == null || archList.contains(arch)){\r
+            List archList = returnlList[i].getSupArchList();\r
+            if (archList == null || contains(archList, arch)){\r
                 protocolList.add(returnlList[i].getProtocolCName());\r
             }\r
         }\r
@@ -757,9 +750,8 @@ public class SurfaceAreaQuery {
         List<String> protocolNotifyList = new ArrayList<String>();\r
         \r
         for (int i = 0; i < returns.length; i++) {\r
-            @SuppressWarnings("unchecked")\r
-            List<String> archList = ((ProtocolNotify) returns[i]).getSupArchList();\r
-            if (archList == null || archList.contains(arch)){\r
+            List archList = ((ProtocolNotify) returns[i]).getSupArchList();\r
+            if (archList == null || contains(archList, arch)){\r
                 protocolNotifyList.add(((ProtocolNotify) returns[i]).getProtocolNotifyCName());\r
             }\r
             \r
@@ -879,9 +871,8 @@ public class SurfaceAreaQuery {
         \r
         List<String> ppiNotifyList = new ArrayList<String>();\r
         for (int i = 0; i < returns.length; i++) {\r
-            @SuppressWarnings("unchecked")\r
-            List<String> archList = ((PPIsDocument.PPIs.PpiNotify) returns[i]).getSupArchList();\r
-            if (archList == null || archList.contains(arch)){\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
@@ -960,9 +951,8 @@ public class SurfaceAreaQuery {
 \r
         List<String> ppiList = new ArrayList<String>();\r
         for (int i = 0; i < returns.length; i++) {\r
-            @SuppressWarnings("unchecked")\r
-            List<String> archList = ((PPIsDocument.PPIs.Ppi) returns[i]).getSupArchList();\r
-            if (archList == null || archList.contains(arch)){\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
@@ -1040,9 +1030,8 @@ public class SurfaceAreaQuery {
 \r
         List<String> guidList = new ArrayList<String>();\r
         for (int i = 0; i < returns.length; i++) {\r
-            @SuppressWarnings("unchecked")\r
-            List<String> archList = ((GuidsDocument.Guids.GuidCNames) returns[i]).getSupArchList();\r
-            if (archList == null || archList.contains(arch)){\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
@@ -1590,81 +1579,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
@@ -1786,7 +1701,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
@@ -1907,31 +1822,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
@@ -1968,24 +1858,41 @@ 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
+        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