Fixed grammar in messages.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1257 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lhauch 2006-08-14 19:20:35 +00:00
parent 391dbbb1c0
commit 719cebfea7
5 changed files with 21 additions and 21 deletions

View File

@ -46,7 +46,7 @@ public class Database {
Func lf; Func lf;
if (rd.ready()) { if (rd.ready()) {
System.out.println("Found " + filename + " , Importing Library Database"); System.out.println("Found " + filename + ", Importing Library Database.");
while ((line = rd.readLine()) != null) { while ((line = rd.readLine()) != null) {
if (line.length() != 0) { if (line.length() != 0) {
linecontext = line.split(","); linecontext = line.split(",");
@ -64,7 +64,7 @@ public class Database {
Guid gu; Guid gu;
if (rd.ready()) { if (rd.ready()) {
System.out.println("Found " + filename + " , Importing " + type + " Database"); System.out.println("Found " + filename + ", Importing " + type + " Database.");
while ((line = rd.readLine()) != null) { while ((line = rd.readLine()) != null) {
if (line.length() != 0) { if (line.length() != 0) {
linecontext = line.split(","); linecontext = line.split(",");
@ -82,7 +82,7 @@ public class Database {
Macro mc; Macro mc;
if (rd.ready()) { if (rd.ready()) {
System.out.println("Found " + filename + " , Importing Macro Database"); System.out.println("Found " + filename + ", Importing Macro Database.");
while ((line = rd.readLine()) != null) { while ((line = rd.readLine()) != null) {
if (line.length() != 0) { if (line.length() != 0) {
linecontext = line.split(","); linecontext = line.split(",");

View File

@ -74,14 +74,14 @@ public class ModuleInfo {
} else if (list[i].contains(".uni")) { } else if (list[i].contains(".uni")) {
localmodulesources.add(list[i]); localmodulesources.add(list[i]);
} else if (list[i].contains(".inf")) { } 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; hasInf = true;
infname = list[i]; infname = list[i];
} else { } else {
continue; continue;
} }
} else if (list[i].contains(".msa")) { } 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; hasMsa = true;
msaname = list[i]; msaname = list[i];
} else { } else {
@ -97,7 +97,7 @@ public class ModuleInfo {
} else if (hasMsa) { } else if (hasMsa) {
mr.readMsa(msaname); mr.readMsa(msaname);
} else { } else {
ui.println("No Inf Nor Msa Found"); ui.println("No INF nor MSA file found!");
} }
CommentOutNonLocalHFile(); CommentOutNonLocalHFile();
@ -106,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" new SourceFileReplacer(modulepath, this, db, ui).flush(); // some adding library actions are taken here,so it must be put before "MsaWriter"
// show result // 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("\nModule Information : ");
ui.println("Entrypoint : " + entrypoint); ui.println("Entrypoint : " + entrypoint);
show(protocol, "Protocol : "); show(protocol, "Protocol : ");
@ -129,8 +129,8 @@ public class ModuleInfo {
ui.println("Errors Left : " + db.error); ui.println("Errors Left : " + db.error);
ui.println("Complete!"); ui.println("Complete!");
ui.println("Your R9 module is placed at " + modulepath + File.separator + "result"); ui.println("Your R9 module was placed here: " + modulepath + File.separator + "result");
ui.println("Your logfile is placed at " + modulepath); ui.println("Your logfile was placed here: " + modulepath);
} }
private void show(Set<String> hash, String show) { private void show(Set<String> hash, String show) {

View File

@ -50,7 +50,7 @@ public class ModuleReader {
} }
public void readInf(String name) throws Exception { public void readInf(String name) throws Exception {
System.out.println("Reading From Inf : " + name); System.out.println("Parsing INF file: " + name);
BufferedReader rd = new BufferedReader(new FileReader(modulepath + File.separator + name)); BufferedReader rd = new BufferedReader(new FileReader(modulepath + File.separator + name));
String line; String line;
String[] linecontext; String[] linecontext;

View File

@ -58,12 +58,12 @@ public class MsaWriter {
if (mi.modulename != null) { if (mi.modulename != null) {
msaheader.setModuleName(mi.modulename); msaheader.setModuleName(mi.modulename);
} else { } else {
msaheader.setModuleName(mi.modulename = Query("ModuleName Not Found . Please Input ModuleName")); msaheader.setModuleName(mi.modulename = Query("Module Name Not Found! Please Input ModuleName"));
} }
if (mi.guidvalue != null) { if (mi.guidvalue != null) {
msaheader.setGuidValue(mi.guidvalue); msaheader.setGuidValue(mi.guidvalue);
} else { } else {
msaheader.setGuidValue(mi.guidvalue = Query("GuidValue Not Found . Please Input GuidValue")); msaheader.setGuidValue(mi.guidvalue = Query("Guid Value Not Found! Please Input Guid Value"));
} }
if (mi.moduletype != null) { if (mi.moduletype != null) {
if (mi.moduletype.contains("PEI")) { if (mi.moduletype.contains("PEI")) {
@ -72,7 +72,7 @@ public class MsaWriter {
msaheader.setModuleType(ModuleTypeDef.Enum.forString("DXE_DRIVER")); msaheader.setModuleType(ModuleTypeDef.Enum.forString("DXE_DRIVER"));
} }
} else { } else {
msaheader.setModuleType(ModuleTypeDef.Enum.forString(mi.moduletype = Query("GuidValue Not Found . Please Input GuidValue"))); msaheader.setModuleType(ModuleTypeDef.Enum.forString(mi.moduletype = Query("Guid Value Not Found! Please Input Guid Value")));
} }
msaheader.setCopyright("Copyright (c) 2006, Intel Corporation"); msaheader.setCopyright("Copyright (c) 2006, Intel Corporation");

View File

@ -70,7 +70,7 @@ public class SourceFileReplacer {
public void flush() throws Exception { public void flush() throws Exception {
PrintWriter outfile; PrintWriter outfile;
String temp = null; String temp = null;
if (ui.yesOrNo("Change Source Code is to be doing . See details ?")) { if (ui.yesOrNo("Changes will be made to the Source Code. View details?")) {
showdetails = true; showdetails = true;
} }
File tempdir = new File(modulepath + File.separator + "result" + File.separator); File tempdir = new File(modulepath + File.separator + "result" + File.separator);