diff options
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 {
|