remodel 1

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

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
index c1c36981d5d8ac78f86e1cadade3fa99e97d5937..bc579ac741945ccc984cec8a78a0a38f177a89f7 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
@@ -18,18 +18,14 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;\r
 \r
 public final class SourceFileReplacer {\r
-       SourceFileReplacer(String path, String outpath, ModuleInfo moduleinfo, Database database, UI fp) {\r
+       SourceFileReplacer(String path, String outpath, ModuleInfo moduleinfo) {\r
                modulepath = path;\r
                outputpath = outpath;\r
                mi = moduleinfo;\r
-               db = database;\r
-               ui = fp;\r
        }\r
        private String modulepath;\r
        private String outputpath;\r
        private ModuleInfo mi;\r
-       private Database db;\r
-       private UI ui;\r
        private boolean showdetails = false;\r
        \r
        private class r8tor9 {\r
@@ -72,7 +68,7 @@ public final class SourceFileReplacer {
        public void flush() throws Exception {\r
                String outname = null;\r
                String inname = null;\r
-               if (ui.yesOrNo("Changes will be made to the Source Code.  View details?")) {\r
+               if (MigrationTool.ui.yesOrNo("Changes will be made to the Source Code.  View details?")) {\r
                        showdetails = true;\r
                }\r
                \r
@@ -85,7 +81,7 @@ public final class SourceFileReplacer {
                                } else {\r
                                        outname = inname;\r
                                }\r
-                               ui.println("\nModifying file: " + inname);\r
+                               MigrationTool.ui.println("\nModifying file: " + inname);\r
                                Common.string2file(sourcefilereplace(modulepath + File.separator + "temp" + File.separator + inname), outputpath + File.separator + "Migration_" + mi.modulename + File.separator + outname);\r
                        } else if (inname.contains(".h") || inname.contains(".H") || inname.contains(".dxs") || inname.contains(".uni")) {\r
                                if (inname.contains(".H")) {\r
@@ -93,7 +89,7 @@ public final class SourceFileReplacer {
                                } else {\r
                                        outname = inname;\r
                                }\r
-                               ui.println("\nCopying file: " + inname);\r
+                               MigrationTool.ui.println("\nCopying file: " + inname);\r
                                Common.string2file(Common.file2string(modulepath + File.separator + "temp" + File.separator + inname), outputpath + File.separator + "Migration_" + mi.modulename + File.separator + outname);\r
                        }\r
                }\r
@@ -156,7 +152,7 @@ public final class SourceFileReplacer {
                // replace BS -> gBS , RT -> gRT\r
                Matcher mat = pat.matcher(line);\r
                if (mat.find()) {                                                                                               // add a library here\r
-                       ui.println("Converting all BS->gBS, RT->gRT");\r
+                       MigrationTool.ui.println("Converting all BS->gBS, RT->gRT");\r
                        line = mat.replaceAll("g$1$2$3");                                                       //unknown correctiveness\r
                }\r
                mat.reset();\r
@@ -173,7 +169,7 @@ public final class SourceFileReplacer {
                Pattern patentrypoint = Pattern.compile("EFI_DRIVER_ENTRY_POINT[^\\}]*\\}");\r
                Matcher matentrypoint = patentrypoint.matcher(line);\r
                if (matentrypoint.find()) {\r
-                       ui.println("Deleting Entry_Point");\r
+                       MigrationTool.ui.println("Deleting Entry_Point");\r
                        line = matentrypoint.replaceAll("");\r
                }\r
                */\r
@@ -191,10 +187,10 @@ public final class SourceFileReplacer {
                                mi.hashrequiredr9libs.add("UefiRuntimeServicesTableLib");               //a\r
                                mi.hashrequiredr9libs.add("DxeServicesTableLib");                               //l\r
                        } else {                                                                                                                        //\r
-                               mi.hashrequiredr9libs.add(db.getR9Lib(r8thing));                                // add a library here\r
+                               mi.hashrequiredr9libs.add(MigrationTool.db.getR9Lib(r8thing));                          // add a library here\r
                        }\r
                        \r
-                       if ((r9thing = db.getR9Func(r8thing)) != null) {\r
+                       if ((r9thing = MigrationTool.db.getR9Func(r8thing)) != null) {\r
                                if (!r8thing.equals(r9thing)) {\r
                                        if (line.contains(r8thing)) {\r
                                                line = line.replaceAll(r8thing, r9thing);\r
@@ -220,8 +216,8 @@ public final class SourceFileReplacer {
                it = mi.hashnonlocalmacro.iterator();\r
                while (it.hasNext()) {                                          //macros are all assumed MdePkg currently\r
                        r8thing = it.next();\r
-                       //mi.hashrequiredr9libs.add(db.getR9Lib(r8thing));              \r
-                       if ((r9thing = db.getR9Macro(r8thing)) != null) {\r
+                       //mi.hashrequiredr9libs.add(MigrationTool.db.getR9Lib(r8thing));                \r
+                       if ((r9thing = MigrationTool.db.getR9Macro(r8thing)) != null) {\r
                                if (line.contains(r8thing)) {\r
                                        line = line.replaceAll(r8thing, r9thing);\r
                                        filemacro.add(new r8tor9(r8thing, r9thing));\r
@@ -288,7 +284,7 @@ public final class SourceFileReplacer {
                show(fileppi, "ppi");\r
                show(fileprotocol, "protocol");\r
                if (!filer8only.isEmpty()) {\r
-                       ui.println("Converting r8only : " + filer8only);\r
+                       MigrationTool.ui.println("Converting r8only : " + filer8only);\r
                }\r
 \r
                filefunc.clear();\r
@@ -306,12 +302,12 @@ public final class SourceFileReplacer {
                r8tor9 temp;\r
                if (showdetails) {\r
                        if (!hash.isEmpty()) {\r
-                               ui.print("Converting " + sh + " : ");\r
+                               MigrationTool.ui.print("Converting " + sh + " : ");\r
                                while (it.hasNext()) {\r
                                        temp = it.next();\r
-                                       ui.print("[" + temp.r8thing + "->" + temp.r9thing + "] ");\r
+                                       MigrationTool.ui.print("[" + temp.r8thing + "->" + temp.r9thing + "] ");\r
                                }\r
-                               ui.println("");\r
+                               MigrationTool.ui.println("");\r
                        }\r
                }\r
        }\r
@@ -323,7 +319,7 @@ public final class SourceFileReplacer {
                it = hash.iterator();\r
                while (it.hasNext()) {\r
                        r8thing = it.next();\r
-                       if ((r9thing = db.getR9Guidname(r8thing)) != null) {\r
+                       if ((r9thing = MigrationTool.db.getR9Guidname(r8thing)) != null) {\r
                                if (!r8thing.equals(r9thing)) {\r
                                        if (line.contains(r8thing)) {\r
                                                line = line.replaceAll(r8thing, r9thing);\r