tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed grammar in messages. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1369 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lhauch 2006-08-23 17:51:26 +00:00
parent 623db5caeb
commit 816ea4376a
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java
View File

@ -182,11 +182,11 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
jTable.setRowHeight(20); jTable.setRowHeight(20);
jTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF); jTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);
model.addColumn("Name"); model.addColumn("Name");
model.addColumn("C_Name"); model.addColumn("The C Name");
model.addColumn("GUID Value"); model.addColumn("GUID Value");
model.addColumn("HelpText"); model.addColumn("Help Text");
model.addColumn("SupportedArch"); model.addColumn("Supported Architectures");
model.addColumn("SupportedModuleType"); model.addColumn("Supported Module Types");
model.addColumn("GuidTypes"); model.addColumn("GuidTypes");
jTable.getColumnModel().getColumn(2).setCellEditor(new GuidEditor()); jTable.getColumnModel().getColumn(2).setCellEditor(new GuidEditor());
@ -468,7 +468,7 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
jLabelHelp.setLocation(new java.awt.Point(14,85)); jLabelHelp.setLocation(new java.awt.Point(14,85));
jLabelCName = new JLabel(); jLabelCName = new JLabel();
jLabelCName.setBounds(new java.awt.Rectangle(14,35,111,20)); jLabelCName.setBounds(new java.awt.Rectangle(14,35,111,20));
jLabelCName.setText("C_Name"); jLabelCName.setText("C Name");
jLabelGuid = new JLabel(); jLabelGuid = new JLabel();
jLabelGuid.setBounds(new java.awt.Rectangle(15,60,112,20)); jLabelGuid.setBounds(new java.awt.Rectangle(15,60,112,20));
jLabelGuid.setText("Guid Value"); jLabelGuid.setText("Guid Value");
@ -606,19 +606,19 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
protected boolean dataValidation(String[] row){ protected boolean dataValidation(String[] row){
if (!DataValidation.isUiNameType(row[0])) { if (!DataValidation.isUiNameType(row[0])) {
JOptionPane.showMessageDialog(this, "Name is NOT UiNameType."); JOptionPane.showMessageDialog(this, "Name must start with an alpha character.");
return false; return false;
} }
if (!DataValidation.isGuid(row[2])) { if (!DataValidation.isGuid(row[2])) {
JOptionPane.showMessageDialog(this, "Guid Value is NOT GuidType."); JOptionPane.showMessageDialog(this, "Guid Value must be in registry format, 8-4-4-4-12.");
return false; return false;
} }
if (!DataValidation.isC_NameType(row[1])) { if (!DataValidation.isC_NameType(row[1])) {
JOptionPane.showMessageDialog(this, "C_Name is NOT C_NameType."); JOptionPane.showMessageDialog(this, "C Name does not match C Name datatype.");
return false; return false;
} }
if (row[3].length() == 0) { if (row[3].length() == 0) {
JOptionPane.showMessageDialog(this, "HelpText could NOT be empty."); JOptionPane.showMessageDialog(this, "Help Text must be entered!");
return false; return false;
} }
return true; return true;

22
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
View File

@ -223,8 +223,8 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
model.addColumn("Help Text"); model.addColumn("Help Text");
model.addColumn("Recommended Instance"); model.addColumn("Recommended Instance");
model.addColumn("Version"); model.addColumn("Version");
model.addColumn("Sup. Arch"); model.addColumn("Supported Architectures");
model.addColumn("Mod. Types"); model.addColumn("Supported Module Types");
Vector<String> vArch = new Vector<String>(); Vector<String> vArch = new Vector<String>();
vArch.add("IA32"); vArch.add("IA32");
@ -310,7 +310,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
getLibInstances(lib); getLibInstances(lib);
guid = nameToGuid(name); guid = nameToGuid(name);
if (guid == null){ if (guid == null){
JOptionPane.showMessageDialog(frame, "Recommended Instance NOT exists."); JOptionPane.showMessageDialog(frame, "Recommended Instance does not exist.");
return; return;
} }
} }
@ -626,7 +626,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
} }
else{ else{
if (recommendGuid == null) { if (recommendGuid == null) {
JOptionPane.showMessageDialog(frame, "Recommended Instance NOT exists."); JOptionPane.showMessageDialog(frame, "Recommended Instance does not exist.");
return; return;
} }
} }
@ -663,25 +663,25 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
private boolean dataValidation(String[] row) { private boolean dataValidation(String[] row) {
if (!DataValidation.isKeywordType(row[cnClassName])) { if (!DataValidation.isKeywordType(row[cnClassName])) {
JOptionPane.showMessageDialog(frame, "Library Class is NOT KeyWord Type."); JOptionPane.showMessageDialog(frame, "Library Class name entered does not match KeyWord datatype.");
return false; return false;
} }
if (!DataValidation.isPathAndFilename(row[cnHdrFile])) { if (!DataValidation.isPathAndFilename(row[cnHdrFile])) {
JOptionPane.showMessageDialog(frame, "Include Header is NOT PathAndFilename Type."); JOptionPane.showMessageDialog(frame, "Include Header does not match the PathAndFilename datatype.");
return false; return false;
} }
if (row[cnHelpText].length() == 0) { if (row[cnHelpText].length() == 0) {
JOptionPane.showMessageDialog(frame, "Help Text Must NOT be empty."); JOptionPane.showMessageDialog(frame, "Help Text must be entered!");
return false; return false;
} }
if (row[cnRecInstVer] != null && row[cnRecInstVer].length() > 0) { if (row[cnRecInstVer] != null && row[cnRecInstVer].length() > 0) {
if (row[cnRecInstName] == null || row[cnRecInstName].length() == 0) { if (row[cnRecInstName] == null || row[cnRecInstName].length() == 0) {
JOptionPane.showMessageDialog(frame, "Recommended Instance Version must associate with Instance Name."); JOptionPane.showMessageDialog(frame, "Recommended Instance Version must associate with the Instance Name.");
return false; return false;
} }
if (!DataValidation.isVersionDataType(row[cnRecInstVer])) { if (!DataValidation.isVersionDataType(row[cnRecInstVer])) {
JOptionPane.showMessageDialog(frame, "Recommended Instance Version is NOT VersionDataType."); JOptionPane.showMessageDialog(frame, "Recommended Instance Version does not match Version datatype.");
return false; return false;
} }
} }
@ -743,7 +743,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
theFile = chooser.getSelectedFile(); theFile = chooser.getSelectedFile();
String file = theFile.getPath(); String file = theFile.getPath();
if (!file.startsWith(dirPrefix)) { if (!file.startsWith(dirPrefix)) {
JOptionPane.showMessageDialog(frame, "You can only select files in current package!"); JOptionPane.showMessageDialog(frame, "You can only select files in current package directory structure!");
return; return;
} }
@ -943,7 +943,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
} }
} }
catch(Exception e){ catch(Exception e){
JOptionPane.showMessageDialog(frame, "Search Instances Fail."); JOptionPane.showMessageDialog(frame, "Search Instances Failed.");
} }
} }

6
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
View File

@ -342,11 +342,11 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
jLabelSupArch = new JLabel(); jLabelSupArch = new JLabel();
jLabelSupArch.setBounds(new java.awt.Rectangle(241,192,89,16)); jLabelSupArch.setBounds(new java.awt.Rectangle(241,192,89,16));
jLabelSupArch.setText("Supported Arch"); jLabelSupArch.setText("Supported Architectures");
jLabelSupArch.setEnabled(true); jLabelSupArch.setEnabled(true);
jLabelSupMod = new JLabel(); jLabelSupMod = new JLabel();
jLabelSupMod.setBounds(new java.awt.Rectangle(15,193,103,16)); jLabelSupMod.setBounds(new java.awt.Rectangle(15,193,103,16));
jLabelSupMod.setText("Supported Module"); jLabelSupMod.setText("Supported Module type");
jLabelSupMod.setEnabled(true); jLabelSupMod.setEnabled(true);
starLabel = new StarLabel(); starLabel = new StarLabel();
starLabel.setBounds(new java.awt.Rectangle(2,134,10,20)); starLabel.setBounds(new java.awt.Rectangle(2,134,10,20));
@ -357,7 +357,7 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
jLabelVarVal.setBounds(new java.awt.Rectangle(11,133,84,20)); jLabelVarVal.setBounds(new java.awt.Rectangle(11,133,84,20));
jLabelVarVal.setText("Valid Usage"); jLabelVarVal.setText("Valid Usage");
jLabelC_Name = new JLabel(); jLabelC_Name = new JLabel();
jLabelC_Name.setText("C_Name"); jLabelC_Name.setText("C Name");
jLabelC_Name.setBounds(new java.awt.Rectangle(11,9,140,20)); jLabelC_Name.setBounds(new java.awt.Rectangle(11,9,140,20));
jLabelTokenSpace = new JLabel(); jLabelTokenSpace = new JLabel();
jLabelTokenSpace.setBounds(new java.awt.Rectangle(11,58,140,20)); jLabelTokenSpace.setBounds(new java.awt.Rectangle(11,58,140,20));