From f436f72804dfde244aa711dc9f4af17e620d2dc4 Mon Sep 17 00:00:00 2001 From: hche10x Date: Thu, 12 Oct 2006 08:08:38 +0000 Subject: [PATCH] 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 --- .../tianocore/frameworkwizard/common/DataValidation.java | 2 +- .../org/tianocore/frameworkwizard/module/ui/MsaHeader.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) 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 { -- 2.39.2