X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FMigrationTools%2Forg%2Ftianocore%2Fmigration%2FSourceFileReplacer.java;h=7d4c13ba96668ff3f328b9cff29ada8ed8aa9cb2;hp=fdc8a657a7884f60b320cbfd504e44dfa007b46c;hb=050e979f683e64d9d747a9ea49bb3deee0dd9ae5;hpb=437ffb07761f4db8d3271b1b4fc549c9d50ad06d

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
index fdc8a657a7..7d4c13ba96 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
@@ -44,7 +44,7 @@ public final class SourceFileReplacer {
 		
 		String outname = null;
 		String inname = null;
-		if (MigrationTool.ui.yesOrNo("Changes will be made to the Source Code.  View details?")) {
+		if (ModuleInfo.ui.yesOrNo("Changes will be made to the Source Code.  View details?")) {
 			showdetails = true;
 		}
 		
@@ -57,7 +57,7 @@ public final class SourceFileReplacer {
 				} else {
 					outname = inname;
 				}
-				MigrationTool.ui.println("\nModifying file: " + inname);
+				ModuleInfo.ui.println("\nModifying file: " + inname);
 				Common.string2file(sourcefilereplace(mi.modulepath + File.separator + "temp" + File.separator + inname), mi.outputpath + File.separator + "Migration_" + mi.modulename + File.separator + outname);
 			} else if (inname.contains(".h") || inname.contains(".H") || inname.contains(".dxs") || inname.contains(".uni")) {
 				if (inname.contains(".H")) {
@@ -65,7 +65,7 @@ public final class SourceFileReplacer {
 				} else {
 					outname = inname;
 				}
-				MigrationTool.ui.println("\nCopying file: " + inname);
+				ModuleInfo.ui.println("\nCopying file: " + inname);
 				Common.string2file(Common.file2string(mi.modulepath + File.separator + "temp" + File.separator + inname), mi.outputpath + File.separator + "Migration_" + mi.modulename + File.separator + outname);
 			}
 		}
@@ -77,7 +77,7 @@ public final class SourceFileReplacer {
 	
 	private static final void addr8only() throws Exception {
 		String paragraph = null;
-		String line = Common.file2string(MigrationTool.db.DatabasePath + File.separator + "R8Lib.c");
+		String line = Common.file2string(ModuleInfo.db.DatabasePath + File.separator + "R8Lib.c");
 		//Common.ensureDir(mi.modulepath + File.separator + "Migration_" + mi.modulename + File.separator + "R8Lib.c");
 		PrintWriter outfile1 = new PrintWriter(new BufferedWriter(new FileWriter(mi.outputpath + File.separator + "Migration_" + mi.modulename + File.separator + "R8Lib.c")));
 		PrintWriter outfile2 = new PrintWriter(new BufferedWriter(new FileWriter(mi.outputpath + File.separator + "Migration_" + mi.modulename + File.separator + "R8Lib.h")));
@@ -128,7 +128,7 @@ public final class SourceFileReplacer {
 		// replace BS -> gBS , RT -> gRT
 		Matcher mat = pat.matcher(line);
 		if (mat.find()) {												// add a library here
-			MigrationTool.ui.println("Converting all BS->gBS, RT->gRT");
+			ModuleInfo.ui.println("Converting all BS->gBS, RT->gRT");
 			line = mat.replaceAll("g$1$2$3");							//unknown correctiveness
 		}
 		mat.reset();
@@ -145,7 +145,7 @@ public final class SourceFileReplacer {
 		Pattern patentrypoint = Pattern.compile("EFI_DRIVER_ENTRY_POINT[^\\}]*\\}");
 		Matcher matentrypoint = patentrypoint.matcher(line);
 		if (matentrypoint.find()) {
-			MigrationTool.ui.println("Deleting Entry_Point");
+			ModuleInfo.ui.println("Deleting Entry_Point");
 			line = matentrypoint.replaceAll("");
 		}
 		*/
@@ -163,10 +163,10 @@ public final class SourceFileReplacer {
 				mi.hashrequiredr9libs.add("UefiRuntimeServicesTableLib");		//a
 				mi.hashrequiredr9libs.add("DxeServicesTableLib");				//l
 			} else {															//
-				mi.hashrequiredr9libs.add(MigrationTool.db.getR9Lib(r8thing));				// add a library here
+				mi.hashrequiredr9libs.add(ModuleInfo.db.getR9Lib(r8thing));				// add a library here
 			}
 			
-			if ((r9thing = MigrationTool.db.getR9Func(r8thing)) != null) {
+			if ((r9thing = ModuleInfo.db.getR9Func(r8thing)) != null) {
 				if (!r8thing.equals(r9thing)) {
 					if (line.contains(r8thing)) {
 						line = line.replaceAll(r8thing, r9thing);
@@ -174,7 +174,7 @@ public final class SourceFileReplacer {
 						Iterator<r8tor9> rt = filefunc.iterator();
 						while (rt.hasNext()) {
 							temp = rt.next();
-							if (MigrationTool.db.r8only.contains(temp.r8thing)) {
+							if (ModuleInfo.db.r8only.contains(temp.r8thing)) {
 								filer8only.add(r8thing);
 								mi.hashr8only.add(r8thing);
 								addr8 = true;
@@ -192,8 +192,8 @@ public final class SourceFileReplacer {
 		it = mi.hashnonlocalmacro.iterator();
 		while (it.hasNext()) {						//macros are all assumed MdePkg currently
 			r8thing = it.next();
-			//mi.hashrequiredr9libs.add(MigrationTool.db.getR9Lib(r8thing));		
-			if ((r9thing = MigrationTool.db.getR9Macro(r8thing)) != null) {
+			//mi.hashrequiredr9libs.add(ModuleInfo.db.getR9Lib(r8thing));		
+			if ((r9thing = ModuleInfo.db.getR9Macro(r8thing)) != null) {
 				if (line.contains(r8thing)) {
 					line = line.replaceAll(r8thing, r9thing);
 					filemacro.add(new r8tor9(r8thing, r9thing));
@@ -260,7 +260,7 @@ public final class SourceFileReplacer {
 		show(fileppi, "ppi");
 		show(fileprotocol, "protocol");
 		if (!filer8only.isEmpty()) {
-			MigrationTool.ui.println("Converting r8only : " + filer8only);
+			ModuleInfo.ui.println("Converting r8only : " + filer8only);
 		}
 
 		filefunc.clear();
@@ -278,12 +278,12 @@ public final class SourceFileReplacer {
 		r8tor9 temp;
 		if (showdetails) {
 			if (!hash.isEmpty()) {
-				MigrationTool.ui.print("Converting " + sh + " : ");
+				ModuleInfo.ui.print("Converting " + sh + " : ");
 				while (it.hasNext()) {
 					temp = it.next();
-					MigrationTool.ui.print("[" + temp.r8thing + "->" + temp.r9thing + "] ");
+					ModuleInfo.ui.print("[" + temp.r8thing + "->" + temp.r9thing + "] ");
 				}
-				MigrationTool.ui.println("");
+				ModuleInfo.ui.println("");
 			}
 		}
 	}
@@ -295,7 +295,7 @@ public final class SourceFileReplacer {
 		it = hash.iterator();
 		while (it.hasNext()) {
 			r8thing = it.next();
-			if ((r9thing = MigrationTool.db.getR9Guidname(r8thing)) != null) {
+			if ((r9thing = ModuleInfo.db.getR9Guidname(r8thing)) != null) {
 				if (!r8thing.equals(r9thing)) {
 					if (line.contains(r8thing)) {
 						line = line.replaceAll(r8thing, r9thing);