1. Fix EDKT277 "ModuleType missing when creating a new Module"

2. Fix EDKT278 "Can NOT save file after generate a new GUID for a MSA"

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1555 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java
index 7084e75dacc6834602fec5c5d31525a9af59f491..da971b9fa67a95a263eb7c418b03a468ca95887b 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java
@@ -28,6 +28,7 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;\r
 import javax.swing.JTextField;\r
 \r
+import org.tianocore.ModuleTypeDef;\r
 import org.tianocore.MsaHeaderDocument;\r
 import org.tianocore.SpdHeaderDocument;\r
 import org.tianocore.ModuleSurfaceAreaDocument.ModuleSurfaceArea;\r
@@ -593,6 +594,7 @@ public class SelectModuleBelong extends IDialog {
             msaHeader.setModuleName(this.jTextFieldName.getText());\r
             msaHeader.setGuidValue(this.jTextFieldGuid.getText());\r
             msaHeader.setVersion(this.jTextFieldVersion.getText());\r
+            msaHeader.setModuleType(ModuleTypeDef.BASE);\r
 \r
             msa.setMsaHeader(msaHeader);\r
         } catch (Exception e) {\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java
index a180910a9f02ac8b88f9c1330bbc0c477ad0194a..9cf0d380e0244fd1ee3ada129b8d7657657ae039 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java
@@ -928,6 +928,8 @@ public class MsaHeader extends IInternalFrame {
         }\r
         if (arg0.getSource() == jButtonGenerateGuid) {\r
             jTextFieldGuid.setText(Tools.generateUuidString());\r
+            jTextFieldGuid.requestFocus();\r
+            jButtonGenerateGuid.requestFocus();\r
         }\r
     }\r
 \r