From a70d444e06ead96652431b6667bcc84a99e9b4e9 Mon Sep 17 00:00:00 2001 From: lhauch Date: Wed, 23 Aug 2006 18:03:17 +0000 Subject: [PATCH] Fixed grammar in messages. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1370 6f19259b-4bc3-4df7-8a09-765794883524 --- .../platform/ui/FpdFileContents.java | 2 +- .../frameworkwizard/platform/ui/FpdHeader.java | 14 +++++++------- .../platform/ui/FpdPlatformDefs.java | 12 ++++++------ .../platform/ui/global/WorkspaceProfile.java | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java index 6d9f84d689..096fec5810 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java @@ -1145,7 +1145,7 @@ public class FpdFileContents { if (value > 0xFF) { // "[FPD file error] The datum type of PCD %s in %s is VOID*, "+ -// "it is byte array in fact. But the element of %s exceed the byte range", +// "it must be a byte array. But the element of %s exceed the byte range", throw new PcdValueMalFormed (datum); } } diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java index 6c583f3c06..0e3c9517e8 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java @@ -143,7 +143,7 @@ public class FpdHeader extends IInternalFrame { jTextFieldBaseName.addFocusListener(new FocusAdapter(){ public void focusLost(FocusEvent e) { if (!DataValidation.isUiNameType(jTextFieldBaseName.getText())) { - JOptionPane.showMessageDialog(frame, "Package Name is NOT UiNameType."); + JOptionPane.showMessageDialog(frame, "Package Name does not match the UiNameType datatype."); return; } if (jTextFieldBaseName.getText().equals(ffc.getFpdHdrPlatformName())) { @@ -171,7 +171,7 @@ public class FpdHeader extends IInternalFrame { jTextFieldGuid.addFocusListener(new FocusAdapter(){ public void focusLost(FocusEvent e) { if (!DataValidation.isGuid(jTextFieldGuid.getText())) { - JOptionPane.showMessageDialog(frame, "Guid is NOT GuidType."); + JOptionPane.showMessageDialog(frame, "Guid must be in registry (8-4-4-4-12) format."); return; } if (jTextFieldGuid.getText().equals(ffc.getFpdHdrGuidValue())) { @@ -199,7 +199,7 @@ public class FpdHeader extends IInternalFrame { jTextFieldVersion.addFocusListener(new FocusAdapter(){ public void focusLost(FocusEvent e) { if (!DataValidation.isVersion(jTextFieldVersion.getText())) { - JOptionPane.showMessageDialog(frame, "Version is NOT version type."); + JOptionPane.showMessageDialog(frame, "Version does not match the Version datatype."); return; } if (jTextFieldVersion.getText().equals(ffc.getFpdHdrVer())) { @@ -243,7 +243,7 @@ public class FpdHeader extends IInternalFrame { jTextAreaLicense.addFocusListener(new FocusAdapter(){ public void focusLost(FocusEvent e) { if (jTextAreaLicense.getText().length() == 0) { - JOptionPane.showMessageDialog(frame, "License contents could NOT be empty."); + JOptionPane.showMessageDialog(frame, "License must be entered!"); return; } if (jTextAreaLicense.getText().equals(ffc.getFpdHdrLicense())) { @@ -270,7 +270,7 @@ public class FpdHeader extends IInternalFrame { jTextAreaDescription.addFocusListener(new FocusAdapter(){ public void focusLost(FocusEvent e) { if (jTextAreaDescription.getText().length() == 0) { - JOptionPane.showMessageDialog(frame, "Description contents could NOT be empty."); + JOptionPane.showMessageDialog(frame, "Description must be entered."); return; } if (jTextAreaDescription.getText().equals(ffc.getFpdHdrDescription())) { @@ -386,7 +386,7 @@ public class FpdHeader extends IInternalFrame { jTextFieldAbstract.addFocusListener(new FocusAdapter(){ public void focusLost(FocusEvent e) { if (!DataValidation.isAbstract(jTextFieldAbstract.getText())) { - JOptionPane.showMessageDialog(frame, "Abstract could NOT be empty."); + JOptionPane.showMessageDialog(frame, "Abstract must be entered."); return; } if (jTextFieldAbstract.getText().equals(ffc.getFpdHdrAbs())) { @@ -414,7 +414,7 @@ public class FpdHeader extends IInternalFrame { jTextFieldCopyright.addFocusListener(new FocusAdapter(){ public void focusLost(FocusEvent e) { if (!DataValidation.isCopyright(jTextFieldCopyright.getText())) { - JOptionPane.showMessageDialog(frame, "Copyright contents could not be empty."); + JOptionPane.showMessageDialog(frame, "Copyright must be entered."); return; } if (jTextFieldCopyright.getText().equals(ffc.getFpdHdrCopyright())) { diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java index cda63d0bd4..d23c90cf51 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java @@ -356,7 +356,7 @@ public class FpdPlatformDefs extends IInternalFrame { Vector v = new Vector(); getToolChain(v); if (v.size() == 0) { - JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Arch."); + JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Architecture."); return; } ffc.setPlatformDefsSupportedArchs(v); @@ -380,7 +380,7 @@ public class FpdPlatformDefs extends IInternalFrame { Vector v = new Vector(); getToolChain(v); if (v.size() == 0) { - JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Arch."); + JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Architecture."); return; } ffc.setPlatformDefsSupportedArchs(v); @@ -404,7 +404,7 @@ public class FpdPlatformDefs extends IInternalFrame { Vector v = new Vector(); getToolChain(v); if (v.size() == 0) { - JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Arch."); + JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Architecture."); return; } ffc.setPlatformDefsSupportedArchs(v); @@ -662,7 +662,7 @@ public class FpdPlatformDefs extends IInternalFrame { Vector v = new Vector(); getToolChain(v); if (v.size() == 0) { - JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Arch."); + JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Architecture."); return; } ffc.setPlatformDefsSupportedArchs(v); @@ -688,7 +688,7 @@ public class FpdPlatformDefs extends IInternalFrame { Vector v = new Vector(); getToolChain(v); if (v.size() == 0) { - JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Arch."); + JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Architecture."); return; } ffc.setPlatformDefsSupportedArchs(v); @@ -714,7 +714,7 @@ public class FpdPlatformDefs extends IInternalFrame { Vector v = new Vector(); getToolChain(v); if (v.size() == 0) { - JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Arch."); + JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Architecture."); return; } ffc.setPlatformDefsSupportedArchs(v); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/WorkspaceProfile.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/WorkspaceProfile.java index 007df778ea..71278e9a1e 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/WorkspaceProfile.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/WorkspaceProfile.java @@ -174,7 +174,7 @@ public class WorkspaceProfile { } } if (msaFile == null){ - throw new Exception("Can't find Module [" + moduleId.getName() + "] in all packages. "); + throw new Exception("Can not find Module [" + moduleId.getName() + "] in any packages in this workspace."); } else { return msaFile; @@ -371,7 +371,7 @@ public class WorkspaceProfile { return platformId; } } - throw new Exception("Can't find platform [" + name + "] in current workspace. "); + throw new Exception("Can not find platform [" + name + "] in the current workspace. "); } public synchronized static File getPackageFile(PackageIdentification packageId) throws Exception { @@ -383,7 +383,7 @@ public class WorkspaceProfile { return packageItem.getSpdFile(); } } - throw new Exception("Can't find " + packageId + " in current workspace. "); + throw new Exception("Can not find " + packageId + " in the current workspace. "); } public synchronized static File getModuleFile(ModuleIdentification moduleId) throws Exception { -- 2.39.2