add MigrationTool

[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 cf1cabe22a6506640ab4f41985acaa27fa36bc03..e7b62f0b97f102f379635299cca2b693d7df42df 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
@@ -32,13 +32,13 @@ public final class ModuleReader {
 \r
                String filename = null;\r
                if (mi.msaorinf.isEmpty()) {\r
-                       ModuleInfo.ui.println("No INF nor MSA file found!");\r
+                       MigrationTool.ui.println("No INF nor MSA file found!");\r
                        System.exit(0);\r
                } else {\r
                        if (mi.msaorinf.size() == 1) {\r
                                filename = (String)mi.msaorinf.toArray()[0];\r
                        } else {\r
-                               filename = ModuleInfo.ui.choose("Found .inf or .msa file for module\n" + mi.modulepath + "\nChoose one Please", mi.msaorinf.toArray());\r
+                               filename = MigrationTool.ui.choose("Found .inf or .msa file for module\n" + mi.modulepath + "\nChoose one Please", mi.msaorinf.toArray());\r
                        }\r
                }\r
                if (filename.contains(".inf")) {\r
@@ -104,7 +104,7 @@ public final class ModuleReader {
                                        }\r
                                        if (mtrinfequation.group(1).matches("DPX_SOURCE")) {\r
                                                if (!mi.localmodulesources.contains(mtrinfequation.group(2))) {\r
-                                                       ModuleInfo.ui.println("DPX File Missing! : " + mtrinfequation.group(2));\r
+                                                       MigrationTool.ui.println("DPX File Missing! : " + mtrinfequation.group(2));\r
                                                }\r
                                        }\r
                                }\r
@@ -113,7 +113,7 @@ public final class ModuleReader {
                                mtrfilename = ptnfilename.matcher(mtrsection.group(2));\r
                                while (mtrfilename.find()) {\r
                                        if (!mi.localmodulesources.contains(mtrfilename.group())) {\r
-                                               ModuleInfo.ui.println("Source File Missing! : " + mtrfilename.group());\r
+                                               MigrationTool.ui.println("Source File Missing! : " + mtrfilename.group());\r
                                        }\r
                                }\r
                        }\r
@@ -141,7 +141,7 @@ public final class ModuleReader {
                                        mtrinclude = ptninclude.matcher(line);\r
                                        if (mtrinclude.find() && mi.localmodulesources.contains(mtrinclude.group(1))) {\r
                                        } else {\r
-                                               line = ModuleInfo.migrationcomment + line;\r
+                                               line = MigrationTool.MIGRATIONCOMMENT + line;\r
                                        }\r
                                }\r
                                outfile.append(line + '\n');\r
@@ -207,8 +207,8 @@ public final class ModuleReader {
                        // find guid\r
                        matguid = Guid.ptnguid.matcher(line);                                                                           // several ways to implement this , which one is faster ? :\r
                        while (matguid.find()) {                                                                                                        // 1.currently , find once , then call to identify which is it\r
-                               if ((temp = Guid.register(matguid, mi, ModuleInfo.db)) != null) {                               // 2.use 3 different matchers , search 3 times to find each\r
-                                       //matguid.appendReplacement(result, ModuleInfo.db.getR9Guidname(temp));         // search the database for all 3 kinds of guids , high cost\r
+                               if ((temp = Guid.register(matguid, mi, MigrationTool.db)) != null) {                            // 2.use 3 different matchers , search 3 times to find each\r
+                                       //matguid.appendReplacement(result, MigrationTool.db.getR9Guidname(temp));              // search the database for all 3 kinds of guids , high cost\r
                                }\r
                        }\r
                        //matguid.appendTail(result);\r
@@ -224,9 +224,9 @@ public final class ModuleReader {
                        // find function call\r
                        matfuncc = Func.ptnfuncc.matcher(line);\r
                        while (matfuncc.find()) {\r
-                               if ((temp = Func.register(matfuncc, mi, ModuleInfo.db)) != null) {\r
-                                       //ModuleInfo.ui.println(ifile + "  dofunc  " + temp);\r
-                                       //matfuncc.appendReplacement(result, ModuleInfo.db.getR9Func(temp));\r
+                               if ((temp = Func.register(matfuncc, mi, MigrationTool.db)) != null) {\r
+                                       //MigrationTool.ui.println(ifile + "  dofunc  " + temp);\r
+                                       //matfuncc.appendReplacement(result, MigrationTool.db.getR9Func(temp));\r
                                }\r
                        }\r
                        //matfuncc.appendTail(result);\r
@@ -235,7 +235,7 @@ public final class ModuleReader {
                        // find macro\r
                        matmacro = Macro.ptntmacro.matcher(line);\r
                        while (matmacro.find()) {\r
-                               if ((temp = Macro.register(matmacro, mi, ModuleInfo.db)) != null) {\r
+                               if ((temp = Macro.register(matmacro, mi, MigrationTool.db)) != null) {\r
                                }\r
                        }\r
                        \r
@@ -247,7 +247,7 @@ public final class ModuleReader {
 \r
                        matfuncd = Func.ptnfuncd.matcher(line);\r
                        while (matfuncd.find()) {\r
-                               if ((temp = Func.register(matfuncd, mi, ModuleInfo.db)) != null) {\r
+                               if ((temp = Func.register(matfuncd, mi, MigrationTool.db)) != null) {\r
                                }\r
                        }\r
                }\r