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

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 d36f258dc1ddae9532a8e17e77c96e1a9a689ae4..2d9e75c8b56f8d93a8eddab6c86a1d875a6b49b0 100644 (file)
--- 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 {
      \r
      **/\r
     public static boolean isFileNameConvention(String arg0) {\r
      \r
      **/\r
     public static boolean isFileNameConvention(String arg0) {\r

-        return isMatch("[a-zA-Z][a-zA-Z0-9]*((_)*(-)*(.)*[a-zA-Z0-9]*)*", arg0);\r
+        return isMatch("[a-zA-Z](\\.?[-_a-zA-Z0-9]+)*", arg0);\r

     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

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 bf7afce417a1b7a7eaceff60240e8fbb0140aca7..5cdcd13405cc02461b3dddeaf3695d4044f8ac93 100644 (file)
--- 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);\r
                 return;\r
             }\r
                 //                jTextFieldOutputFileBasename.addFocusListener(this);\r
                 return;\r
             }\r

+            \r
+            if (!DataValidation.isOutputFileBasename(this.jTextFieldOutputFileBasename.getText())) {\r
+                Log.wrn("Update Msa Header", "Incorrect data type for Output File Basename, it must be a valid file name");\r
+                return;\r
+            }\r
+            \r

             if (!this.jTextFieldOutputFileBasename.getText().equals(md.getOutputFileBasename())) {\r
                 this.md.setOutputFileBasename(this.jTextFieldOutputFileBasename.getText());\r
             } else {\r
             if (!this.jTextFieldOutputFileBasename.getText().equals(md.getOutputFileBasename())) {\r
                 this.md.setOutputFileBasename(this.jTextFieldOutputFileBasename.getText());\r
             } else {\r