Remove some unused code and adjust some code format. Modules build with FPD sequence...

[mirror_edk2.git] / Tools / Source / GenBuild / org / tianocore / build / fpd / FpdParserTask.java

diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
index ea287817ee506d5ef56de8a6b671175255a5fca3..37e05fd627425862f2a6adc9ec93d11ee00897ae 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
@@ -25,7 +25,6 @@ import java.util.LinkedHashSet;
 import java.util.Map;\r
 import java.util.Set;\r
 import java.util.Vector;\r
-import java.util.TreeMap;\r
 \r
 import org.apache.tools.ant.BuildException;\r
 import org.apache.tools.ant.Task;\r
@@ -98,11 +97,6 @@ public class FpdParserTask extends Task {
     ///\r
     private Map<String, Set<FpdModuleIdentification>> fvs = new HashMap<String, Set<FpdModuleIdentification>>();\r
 \r
-    ///\r
-    /// Mapping from sequence number to FV names\r
-    ///\r
-    private Map<String, Set<String>> sequences = new TreeMap<String, Set<String>>();\r
-\r
     ///\r
     /// FpdParserTask can specify some ANT properties. \r
     ///\r
@@ -152,10 +146,6 @@ public class FpdParserTask extends Task {
         //\r
         isUnified = OutputManager.getInstance().prepareBuildDir(getProject());\r
         \r
-        //\r
-        // Generate FDF (Flash Definition File) file\r
-        //\r
-\r
         //\r
         // For every Target and ToolChain\r
         //\r
@@ -183,7 +173,7 @@ public class FpdParserTask extends Task {
         //\r
         // Gen build.xml\r
         //\r
-        PlatformBuildFileGenerator fileGenerator = new PlatformBuildFileGenerator(getProject(), outfiles, fvs, sequences, isUnified);\r
+        PlatformBuildFileGenerator fileGenerator = new PlatformBuildFileGenerator(getProject(), outfiles, isUnified);\r
         fileGenerator.genBuildFile();\r
         \r
         //\r
@@ -426,8 +416,7 @@ public class FpdParserTask extends Task {
             SurfaceAreaQuery.pop();\r
 \r
             fpdModuleId.setFvBinding(fvBinding);\r
-            String fvSequence = fpdModuleId.getSequence();\r
-            updateFvs(fvSequence, fvBinding, fpdModuleId);\r
+            updateFvs(fvBinding, fpdModuleId);\r
             \r
             //\r
             // Prepare for out put file name\r
@@ -499,7 +488,7 @@ public class FpdParserTask extends Task {
       @param fvName current FV name\r
       @param moduleName current module identification\r
     **/\r
-    private void updateFvs(String fvSequence, String fvName, FpdModuleIdentification fpdModuleId) {\r
+    private void updateFvs(String fvName, FpdModuleIdentification fpdModuleId) {\r
         if (fvName == null || fvName.trim().length() == 0) {\r
             fvName = "NULL";\r
         }\r
@@ -517,19 +506,6 @@ public class FpdParserTask extends Task {
                 set.add(fpdModuleId);\r
                 fvs.put(fvNameArray[i], set);\r
             }\r
-            \r
-            //\r
-            // Put fvName to corresponding fvSequence\r
-            //\r
-            if (sequences.containsKey(fvSequence)) {\r
-                Set<String> set = sequences.get(fvSequence);\r
-                set.add(fvNameArray[i]);\r
-            }\r
-            else {\r
-                Set<String> set = new LinkedHashSet<String>();\r
-                set.add(fvNameArray[i]);\r
-                sequences.put(fvSequence, set);\r
-            }\r
         }\r
     }\r
 \r