X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FMigrationTools%2Forg%2Ftianocore%2Fmigration%2FModuleInfo.java;h=b238551cac84ca18dc6e7af3094358c61bb515a1;hp=3576578202f68cef37e63865d82a0d107cc37bf7;hb=719cebfea79fc6a8cdf06e1694a6596b4db69d1b;hpb=7b086bab60be422ae5417d3c801356aa162ab6f9

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
index 3576578202..b238551cac 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
@@ -38,7 +38,6 @@ public class ModuleInfo {
 	public String entrypoint = null;
 	
 	public Set<String> localmodulesources = new HashSet<String>();		//contains both .c and .h
-	public Set<String> localmoduleheaders = new HashSet<String>();
 	public Set<String> preprocessedccodes = new HashSet<String>();
 	
 	public Set<String> hashfuncc = new HashSet<String>();
@@ -69,21 +68,20 @@ public class ModuleInfo {
 				if (list[i].contains(".c") || list[i].contains(".C")) {
 					localmodulesources.add(list[i]);
 				} else if (list[i].contains(".h") || list[i].contains(".H")) {
-					localmodulesources.add(list[i]);
-					localmoduleheaders.add(list[i]);	//the case that several .inf or .msa found is not concerned
+					localmodulesources.add(list[i]);	//the case that several .inf or .msa found is not concerned
 				} else if (list[i].contains(".dxs")) {
 					localmodulesources.add(list[i]);
 				} else if (list[i].contains(".uni")) {
 					localmodulesources.add(list[i]);
 				} else if (list[i].contains(".inf")) {
-					if (ui.yesOrNo("Found .inf file : " + list[i] + "\nUse this file as this module's .inf ?")) {
+					if (ui.yesOrNo("Found .inf file : " + list[i] + "\nDo you want to use this file as this module's .inf?")) {
 						hasInf = true;
 						infname = list[i];
 					} else {
 						continue;
 					}
 				} else if (list[i].contains(".msa")) {
-					if (ui.yesOrNo("Found .msa file : " + list[i] + "\nUse this file as this module's .msa ?")) {
+					if (ui.yesOrNo("Found .msa file : " + list[i] + "\nDo you want to use this file as this module's .msa?")) {
 						hasMsa = true;
 						msaname = list[i];
 					} else {
@@ -99,7 +97,7 @@ public class ModuleInfo {
 		} else if (hasMsa) {
 			mr.readMsa(msaname);
 		} else {
-			ui.println("No Inf Nor Msa Found");
+			ui.println("No INF nor MSA file found!");
 		}
 		
 		CommentOutNonLocalHFile();
@@ -108,7 +106,7 @@ public class ModuleInfo {
 		new SourceFileReplacer(modulepath, this, db, ui).flush();	// some adding library actions are taken here,so it must be put before "MsaWriter"
 		
 		// show result
-		if (ui.yesOrNo("Parse Module Information Complete . See details ?")) {
+		if (ui.yesOrNo("Parse of the Module Information has completed. View details?")) {
 			ui.println("\nModule Information : ");
 			ui.println("Entrypoint : " + entrypoint);
 			show(protocol, "Protocol : ");
@@ -131,8 +129,8 @@ public class ModuleInfo {
 		
 		ui.println("Errors Left : " + db.error);
 		ui.println("Complete!");
-		ui.println("Your R9 module is placed at " + modulepath + File.separator + "result");
-		ui.println("Your logfile is placed at " + modulepath);
+		ui.println("Your R9 module was placed here: " + modulepath + File.separator + "result");
+		ui.println("Your logfile was placed here: " + modulepath);
 	}
 	
 	private void show(Set<String> hash, String show) {
@@ -161,7 +159,7 @@ public class ModuleInfo {
 			while ((line = rd.readLine()) != null) {
 				if (line.contains("#include")) {
 					mtcinclude = ptninclude.matcher(line);
-					if (mtcinclude.find() && localmoduleheaders.contains(mtcinclude.group(1))) {
+					if (mtcinclude.find() && localmodulesources.contains(mtcinclude.group(1))) {
 					} else {
 						line = migrationcomment + line;
 					}
@@ -293,4 +291,4 @@ public class ModuleInfo {
 	public static void main(String[] args) throws Exception {
 		FirstPanel.init();
 	}
-}
\ No newline at end of file
+}