diff options
| author | hche10x <hche10x@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-10-12 08:08:38 +0000 |
|---|---|---|
| committer | hche10x <hche10x@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-10-12 08:08:38 +0000 |
| commit | f436f72804dfde244aa711dc9f4af17e620d2dc4 (patch) | |
| tree | 1112fb1da89efc0e7bf0073de73d21ffb7dd4292 /Tools | |
| parent | 322c1d686e6fd8a45d6f5b82f34f7fb03b19c589 (diff) | |
| download | edk2-platforms-f436f72804dfde244aa711dc9f4af17e620d2dc4.tar.xz | |
1. Fix EDKT391 The check point of "OutputFileBasename" is missed in wizard tool
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1727 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'Tools')
2 files changed, 7 insertions, 1 deletions
diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/DataValidation.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/DataValidation.java index d36f258dc1..2d9e75c8b5 100644 --- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/DataValidation.java +++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/DataValidation.java @@ -218,7 +218,7 @@ public class DataValidation { **/
public static boolean isFileNameConvention(String arg0) {
- return isMatch("[a-zA-Z][a-zA-Z0-9]*((_)*(-)*(.)*[a-zA-Z0-9]*)*", arg0);
+ return isMatch("[a-zA-Z](\\.?[-_a-zA-Z0-9]+)*", arg0);
}
/**
diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java index bf7afce417..5cdcd13405 100644 --- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java +++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java @@ -1363,6 +1363,12 @@ public class MsaHeader extends IInternalFrame { // jTextFieldOutputFileBasename.addFocusListener(this);
return;
}
+
+ if (!DataValidation.isOutputFileBasename(this.jTextFieldOutputFileBasename.getText())) {
+ Log.wrn("Update Msa Header", "Incorrect data type for Output File Basename, it must be a valid file name");
+ return;
+ }
+
if (!this.jTextFieldOutputFileBasename.getText().equals(md.getOutputFileBasename())) {
this.md.setOutputFileBasename(this.jTextFieldOutputFileBasename.getText());
} else {
|