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

2 files changed, 4 insertions, 7 deletions

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 9df18008cc..7b86e6b88f 100644
--- 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

         // PEI_PCD_DATABASE_INIT

         //

-        java.util.Comparator comparator = new AlignmentSizeComp();

+        java.util.Comparator<Token> comparator = new AlignmentSizeComp();

         List<Token> list = initTokens;

         java.util.Collections.sort(list, comparator);

         initCode = processTokens(initTokens);

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 7df96398ef..0acdad0948 100644
--- 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 {
     }

 

 

-    private ArrayList getDynamicRecordArray() {

+    private ArrayList<Token> getDynamicRecordArray() {

         Token[]     tokenArray  =   getRecordArray();

         int         index       =   0;

         int         count       =   0;

-        ArrayList   al          =   new ArrayList();

+        ArrayList<Token>   al   =   new ArrayList<Token>();

 

         for (index = 0; index < tokenArray.length; index++) {

             if (tokenArray[index].pcdType == Token.PCD_TYPE.DYNAMIC ||

@@ -170,13 +170,10 @@ public class MemoryDatabaseManager {
     public void getTwoPhaseDynamicRecordArray(ArrayList<Token> pei, ArrayList<Token> dxe) {

         int                     usageInstanceIndex  =   0;

         int                     index               =   0;

-        ArrayList               tokenArrayList      =   getDynamicRecordArray();

+        ArrayList<Token>        tokenArrayList      =   getDynamicRecordArray();

         List<UsageInstance>     usageInstanceArray  =   null;

         UsageInstance           usageInstance       =   null;

 

-        //pei = new ArrayList<Token>();

-        //dxe = new ArrayList<Token>();

-

         for (index = 0; index < tokenArrayList.size(); index++) {

             boolean found   =   false;

             Token       token = (Token) tokenArrayList.get(index);