Many Many Modifies

[mirror_edk2.git] / Tools / Source / MigrationTools / org / tianocore / migration / ModuleReader.java

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
index 4eb32463311b1f94b16e347644684c6170be2e47..b8bde6fef0fc445d46636ba1dc7409749ede0057 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
@@ -17,24 +17,24 @@ import java.util.*;
 import java.util.regex.*;\r
 import org.tianocore.*;\r
 \r
-public class ModuleReader {\r
+public final class ModuleReader {\r
        ModuleReader(String path, ModuleInfo moduleinfo, Database database, UI u) {\r
-               modulepath = path;\r
-               mi = moduleinfo;\r
+               //modulepath = path;\r
+               //mi = moduleinfo;\r
                db = database;\r
                ui = u;\r
        }\r
-       private String modulepath;\r
-       private ModuleInfo mi;\r
-       private Database db;\r
-       private UI ui;\r
+       //private static String modulepath;\r
+       //private static ModuleInfo mi;\r
+       private static Database db;\r
+       private static UI ui;\r
        \r
-       private static Pattern ptninfequation = Pattern.compile("([^\\s]*)\\s*=\\s*([^\\s]*)");\r
-       private static Pattern ptnsection = Pattern.compile("\\[([^\\[\\]]*)\\]([^\\[\\]]*)\\n", Pattern.MULTILINE);\r
-       private static Pattern ptnfilename = Pattern.compile("[^\\s]+");\r
+       private static final Pattern ptninfequation = Pattern.compile("([^\\s]*)\\s*=\\s*([^\\s]*)");\r
+       private static final Pattern ptnsection = Pattern.compile("\\[([^\\[\\]]*)\\]([^\\[\\]]*)\\n", Pattern.MULTILINE);\r
+       private static final Pattern ptnfilename = Pattern.compile("[^\\s]+");\r
        \r
-       public void readMsa(String name) throws Exception {\r
-               ModuleSurfaceAreaDocument msadoc = ModuleSurfaceAreaDocument.Factory.parse(new File(modulepath + File.separator + name));\r
+       public static final void readMsa(String name, ModuleInfo mi) throws Exception {\r
+               ModuleSurfaceAreaDocument msadoc = ModuleSurfaceAreaDocument.Factory.parse(new File(mi.modulepath + File.separator + name));\r
                ModuleSurfaceAreaDocument.ModuleSurfaceArea msa = msadoc.getModuleSurfaceArea();\r
                MsaHeaderDocument.MsaHeader msaheader = msa.getMsaHeader();\r
                \r
@@ -53,14 +53,14 @@ public class ModuleReader {
                }\r
        }\r
        \r
-       public void readInf(String name) throws Exception {\r
+       public static final void readInf(String name, ModuleInfo mi) throws Exception {\r
                System.out.println("\nParsing INF file: " + name);\r
                String wholeline;\r
                Matcher mtrinfequation;\r
                Matcher mtrsection;\r
                Matcher mtrfilename;\r
 \r
-               wholeline = Common.file2string(modulepath + File.separator + name);\r
+               wholeline = Common.file2string(mi.modulepath + File.separator + name);\r
                mtrsection = ptnsection.matcher(wholeline);\r
                while (mtrsection.find()) {\r
                        if (mtrsection.group(1).matches("defines")) {\r