1. Fix the bug missing TokenSpaceGuidCName when editing a pcd entry in Msa

[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / module / ui / MsaHeader.java

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 250eb9da2d40cded39cc54f671c364f8b35c8f73..c529bc02070b6937f8e992115d02216963582e58 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
@@ -27,6 +27,7 @@ import javax.swing.JScrollPane;
 import javax.swing.JTextArea;\r
 import javax.swing.JTextField;\r
 \r
+import org.tianocore.ModuleDefinitionsDocument;\r
 import org.tianocore.ModuleSurfaceAreaDocument;\r
 import org.tianocore.ModuleTypeDef;\r
 import org.tianocore.MsaHeaderDocument;\r
@@ -134,6 +135,8 @@ public class MsaHeader extends IInternalFrame {
     private JScrollPane jScrollPane = null;\r
 \r
     private OpeningModuleType omt = null;\r
+    \r
+    private EnumerationData ed = new EnumerationData();\r
 \r
     /**\r
      This method initializes jTextFieldBaseName \r
@@ -235,6 +238,8 @@ public class MsaHeader extends IInternalFrame {
             jTextAreaDescription.setLineWrap(true);\r
             jTextAreaDescription.addFocusListener(this);\r
             jTextAreaDescription.setToolTipText("A verbose description of the module");\r
+            jTextAreaDescription.setSelectionStart(0);\r
+            jTextAreaDescription.setSelectionEnd(0);\r
         }\r
         return jTextAreaDescription;\r
     }\r
@@ -436,6 +441,17 @@ public class MsaHeader extends IInternalFrame {
         super();\r
         this.omt = inMsa;\r
         this.msa = omt.getXmlMsa();\r
+        \r
+        //      \r
+        // Set module definitions default value\r
+        //\r
+        if (msa.getModuleDefinitions() == null) {\r
+            ModuleDefinitionsDocument.ModuleDefinitions md = ModuleDefinitionsDocument.ModuleDefinitions.Factory.newInstance();\r
+            md.setOutputFileBasename(msa.getMsaHeader().getModuleName());\r
+            md.setBinaryModule(false);\r
+            md.setSupportedArchitectures(ed.getVSupportedArchitectures());\r
+            msa.setModuleDefinitions(md);\r
+        }\r
         init(msa.getMsaHeader());\r
         this.setVisible(true);\r
         this.setViewMode(false);\r
@@ -506,12 +522,16 @@ public class MsaHeader extends IInternalFrame {
             }\r
             if (this.msaHeader.getDescription() != null) {\r
                 this.jTextAreaDescription.setText(this.msaHeader.getDescription());\r
+                jTextAreaDescription.setSelectionStart(0);\r
+                jTextAreaDescription.setSelectionEnd(0);\r
             }\r
             if (this.msaHeader.getCopyright() != null) {\r
                 this.jTextFieldCopyright.setText(this.msaHeader.getCopyright());\r
             }\r
             if (this.msaHeader.getLicense() != null) {\r
                 this.jTextAreaLicense.setText(this.msaHeader.getLicense().getStringValue());\r
+                jTextAreaLicense.setSelectionStart(0);\r
+                jTextAreaLicense.setSelectionEnd(0);\r
             }\r
             if (this.msaHeader.getLicense() != null && this.msaHeader.getLicense().getURL() != null) {\r
                 this.jTextFieldURL.setText(this.msaHeader.getLicense().getURL());\r
@@ -795,6 +815,7 @@ public class MsaHeader extends IInternalFrame {
             //            this.msaHeader.setSpecification(this.jTextFieldSpecification.getText());\r
 \r
             msaHeader.setSpecification(this.jTextFieldSpecification.getText());\r
+            msaHeader.setModuleType(ModuleTypeDef.Enum.forString(jComboBoxModuleType.getSelectedItem().toString()));\r
             msa.setMsaHeader(msaHeader);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r
@@ -880,7 +901,7 @@ public class MsaHeader extends IInternalFrame {
         // Check Module Type\r
         //\r
         if (arg0.getSource() == this.jComboBoxModuleType) {\r
-            msaHeader.setModuleType(ModuleTypeDef.Enum.forString(jComboBoxModuleType.getSelectedItem().toString()));\r
+            //msaHeader.setModuleType(ModuleTypeDef.Enum.forString(jComboBoxModuleType.getSelectedItem().toString()));\r
         }\r
 \r
         //\r
@@ -956,7 +977,7 @@ public class MsaHeader extends IInternalFrame {
                 //this.jTextFieldCopyright.requestFocus();\r
                 return;\r
             }\r
-            this.msaHeader.setDescription(this.jTextFieldCopyright.getText());\r
+            this.msaHeader.setCopyright(this.jTextFieldCopyright.getText());\r
         }\r
 \r
         //\r