1. Fix EDKT319 "Can't save when changing value of "PCD Is Driver" on MsaHeader page"

[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 70e2166fbe98d43128b8ca77b61ae34d096ac5a5..fddf763e7f85ad5a58436d77598f1fd04193a0dd 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
@@ -640,6 +640,7 @@ public class MsaHeader extends IInternalFrame {
             jComboBoxPcdIsDriver.setPreferredSize(new java.awt.Dimension(320, 20));\r
             jComboBoxPcdIsDriver.setBounds(new java.awt.Rectangle(160, 530, 320, 20));\r
             jComboBoxPcdIsDriver.addItemListener(this);\r
+            jComboBoxPcdIsDriver.addFocusListener(this);\r
             jComboBoxPcdIsDriver.setEnabled(false);\r
             Tools.generateComboBoxByVector(jComboBoxPcdIsDriver, ed.getVPcdDriverTypes());\r
         }\r
@@ -889,7 +890,6 @@ public class MsaHeader extends IInternalFrame {
             jContentPane.add(jLabelLicense, null);\r
             jContentPane.add(jLabelCopyright, null);\r
             jContentPane.add(jLabelDescription, null);\r
-            //            jContentPane.add(jLabelSpecification, null);\r
             jContentPane.add(getJTextFieldSpecification(), null);\r
             jContentPane.add(getJButtonOk(), null);\r
             jContentPane.add(getJButtonCancel(), null);\r
@@ -929,8 +929,6 @@ public class MsaHeader extends IInternalFrame {
             jStarLabel13.setLocation(new java.awt.Point(0, 480));\r
             jStarLabel14 = new StarLabel();\r
             jStarLabel14.setLocation(new java.awt.Point(0, 505));\r
-            //            jStarLabel15 = new StarLabel();\r
-            //            jStarLabel15.setLocation(new java.awt.Point(0, 530));\r
 \r
             jContentPane.add(jStarLabel1, null);\r
             jContentPane.add(jStarLabel2, null);\r
@@ -943,7 +941,6 @@ public class MsaHeader extends IInternalFrame {
             jContentPane.add(jStarLabel12, null);\r
             jContentPane.add(jStarLabel13, null);\r
             jContentPane.add(jStarLabel14, null);\r
-            //            jContentPane.add(jStarLabel15, null);\r
             jContentPane.add(getJScrollPaneCopyright(), null);\r
 \r
             jContentPane.add(getJCheckBoxIa32(), null);\r
@@ -1411,21 +1408,17 @@ public class MsaHeader extends IInternalFrame {
         //\r
         // Check Pcd is Driver\r
         //\r
-        if (arg0.getSource() == this.jCheckBoxPcd) {\r
+        if (arg0.getSource() == this.jCheckBoxPcd || arg0.getSource() == this.jComboBoxPcdIsDriver) {\r
             if ((this.ex == null) && this.jCheckBoxPcd.isSelected()) {\r
                 this.ex = ExternsDocument.Externs.Factory.newInstance();\r
                 this.ex.setPcdIsDriver(PcdDriverTypes.Enum.forString(this.jComboBoxPcdIsDriver.getSelectedItem()\r
                                                                                               .toString()));\r
                 this.msa.setExterns(this.ex);\r
-            }\r
-\r
-            if ((this.ex != null) && (this.ex.getPcdIsDriver() == null) && this.jCheckBoxPcd.isSelected()) {\r
+            } else if ((this.ex != null) && (this.ex.getPcdIsDriver() == null) && this.jCheckBoxPcd.isSelected()) {\r
                 this.ex.setPcdIsDriver(PcdDriverTypes.Enum.forString(this.jComboBoxPcdIsDriver.getSelectedItem()\r
                                                                                               .toString()));\r
                 this.msa.setExterns(this.ex);\r
-            }\r
-\r
-            if ((this.ex != null) && (this.ex.getPcdIsDriver() != null)) {\r
+            } else if ((this.ex != null) && (this.ex.getPcdIsDriver() != null)) {\r
                 if (this.jCheckBoxPcd.isSelected()\r
                     && !this.jComboBoxPcdIsDriver.getSelectedItem().toString().equals(\r
                                                                                       this.ex.getPcdIsDriver()\r
@@ -1465,14 +1458,10 @@ public class MsaHeader extends IInternalFrame {
                 this.ex = ExternsDocument.Externs.Factory.newInstance();\r
                 this.ex.setTianoR8FlashMapH(this.jCheckBoxFlashMap.isSelected());\r
                 this.msa.setExterns(this.ex);\r
-            }\r
-\r
-            if ((this.ex != null) && this.jCheckBoxFlashMap.isSelected()) {\r
+            } else if ((this.ex != null) && this.jCheckBoxFlashMap.isSelected()) {\r
                 this.ex.setTianoR8FlashMapH(this.jCheckBoxFlashMap.isSelected());\r
                 this.msa.setExterns(this.ex);\r
-            }\r
-\r
-            if ((this.ex != null) && !this.jCheckBoxFlashMap.isSelected()) {\r
+            } else if ((this.ex != null) && !this.jCheckBoxFlashMap.isSelected()) {\r
                 ExternsDocument.Externs newEx = ExternsDocument.Externs.Factory.newInstance();\r
                 if (this.ex.getExternList() != null) {\r
                     for (int index = 0; index < this.ex.getExternList().size(); index++) {\r