Remove the warning message reported when building GenBuild.jar

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

diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java
index 9df18008ccf9ae9466951a2b1f6ed24340998e9e..7b86e6b88fc4e680bfa83c5828641315862218e6 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java
@@ -788,7 +788,7 @@ class PcdDatabase {
         // Generate Structure Declaration for PcdTokens without Default Value\r
         // PEI_PCD_DATABASE_INIT\r
         //\r
-        java.util.Comparator comparator = new AlignmentSizeComp();\r
+        java.util.Comparator<Token> comparator = new AlignmentSizeComp();\r
         List<Token> list = initTokens;\r
         java.util.Collections.sort(list, comparator);\r
         initCode = processTokens(initTokens);\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/MemoryDatabaseManager.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/MemoryDatabaseManager.java
index 7df96398ef56de9ad953727ee0bd8c60de1027cb..0acdad094854759d46a737813068916c5a966725 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/MemoryDatabaseManager.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/MemoryDatabaseManager.java
@@ -144,11 +144,11 @@ public class MemoryDatabaseManager {
     }\r
 \r
 \r
-    private ArrayList getDynamicRecordArray() {\r
+    private ArrayList<Token> getDynamicRecordArray() {\r
         Token[]     tokenArray  =   getRecordArray();\r
         int         index       =   0;\r
         int         count       =   0;\r
-        ArrayList   al          =   new ArrayList();\r
+        ArrayList<Token>   al   =   new ArrayList<Token>();\r
 \r
         for (index = 0; index < tokenArray.length; index++) {\r
             if (tokenArray[index].pcdType == Token.PCD_TYPE.DYNAMIC ||\r
@@ -170,13 +170,10 @@ public class MemoryDatabaseManager {
     public void getTwoPhaseDynamicRecordArray(ArrayList<Token> pei, ArrayList<Token> dxe) {\r
         int                     usageInstanceIndex  =   0;\r
         int                     index               =   0;\r
-        ArrayList               tokenArrayList      =   getDynamicRecordArray();\r
+        ArrayList<Token>        tokenArrayList      =   getDynamicRecordArray();\r
         List<UsageInstance>     usageInstanceArray  =   null;\r
         UsageInstance           usageInstance       =   null;\r
 \r
-        //pei = new ArrayList<Token>();\r
-        //dxe = new ArrayList<Token>();\r
-\r
         for (index = 0; index < tokenArrayList.size(); index++) {\r
             boolean found   =   false;\r
             Token       token = (Token) tokenArrayList.get(index);\r