Add in GetNextToken and Register Callback Function funtionality for DXE Driver.

[mirror_edk2.git] / Tools / Source / GenBuild / org / tianocore / build / pcd / action / CollectPCDAction.java

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..e10f325ee6ebe8e4afda9f0fffefd4ff3082d57c 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java
@@ -711,7 +711,7 @@ class PcdDatabase {
 \r
     private void getTwoGroupsOfTokens (ArrayList<Token> alTokens, List<Token> initTokens, List<Token> uninitTokens) {\r
         for (int i = 0; i < alTokens.size(); i++) {\r
-            Token t = (Token)alTokens.get(i);\r
+            Token t = alTokens.get(i);\r
             if (t.hasDefaultValue()) {\r
                 initTokens.add(t);\r
             } else {\r
@@ -788,17 +788,15 @@ class PcdDatabase {
         // Generate Structure Declaration for PcdTokens without Default Value\r
         // PEI_PCD_DATABASE_INIT\r
         //\r
-        java.util.Comparator comparator = new AlignmentSizeComp();\r
-        List<Token> list = initTokens;\r
-        java.util.Collections.sort(list, comparator);\r
+        java.util.Comparator<Token> comparator = new AlignmentSizeComp();\r
+        java.util.Collections.sort(initTokens, comparator);\r
         initCode = processTokens(initTokens);\r
 \r
         //\r
         // Generate Structure Declaration for PcdTokens without Default Value\r
         // PEI_PCD_DATABASE_UNINIT\r
         //\r
-        list = uninitTokens;\r
-        java.util.Collections.sort(list, comparator);\r
+        java.util.Collections.sort(uninitTokens, comparator);\r
         uninitCode = processTokens(uninitTokens);\r
 \r
         //\r