1. Fix EDKT462: "Save/Save All' are still highlighted if close a msa/spd/fpd without...

2. Fix parts of EDKT423 After modification in text editor, save and save all firsthand, they are gray

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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
index b8bb5581c53afeca6feca9b792fd69b0628bb658..651222d8537d851d06762b2dd4d488f131e52ad9 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
@@ -3109,6 +3109,7 @@ public class FrameworkWizardUI extends IFrame implements KeyListener, MouseListe
                 }\r
 \r
                 GlobalData.openingModuleList.setModuleOpen(this.currentOpeningModuleIndex, false);\r
+                GlobalData.openingModuleList.setModuleSaved(this.currentOpeningModuleIndex, true);\r
                 this.cleanDesktopPaneModule();\r
                 this.currentOpeningModuleIndex = -1;\r
             }\r
@@ -3144,6 +3145,7 @@ public class FrameworkWizardUI extends IFrame implements KeyListener, MouseListe
                 }\r
 \r
                 GlobalData.openingPackageList.setPackageOpen(this.currentOpeningPackageIndex, false);\r
+                GlobalData.openingPackageList.setPackageSaved(this.currentOpeningPackageIndex, true);\r
                 this.cleanDesktopPanePackage();\r
                 this.currentOpeningPackageIndex = -1;\r
             }\r
@@ -3179,6 +3181,7 @@ public class FrameworkWizardUI extends IFrame implements KeyListener, MouseListe
                 }\r
 \r
                 GlobalData.openingPlatformList.setPlatformOpen(this.currentOpeningPlatformIndex, false);\r
+                GlobalData.openingPlatformList.setPlatformSaved(this.currentOpeningPlatformIndex, true);\r
                 this.cleanDesktopPanePlatform();\r
                 this.currentOpeningPlatformIndex = -1;\r
             }\r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningModuleList.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningModuleList.java
index 174b72fef0e69a8e814f8b2a049a8c970dcd07b4..d12291c70c1f485817d885b6f214abb36c819efd 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningModuleList.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningModuleList.java
@@ -197,6 +197,7 @@ public class OpeningModuleList {
     public void closeAll() {\r
         for (int index = 0; index < this.size(); index++) {\r
             this.setModuleOpen(index, false);\r
+            this.setModuleSaved(index, true);\r
         }\r
     }\r
 \r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningPackageList.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningPackageList.java
index 3f008f12ebec5fe0b68e0bbc6db5fb35a443b788..10d3732cc6afa1869a4582f8f47584db3a99dbb8 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningPackageList.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningPackageList.java
@@ -197,6 +197,7 @@ public class OpeningPackageList {
     public void closeAll() {\r
         for (int index = 0; index < this.size(); index++) {\r
            this.setPackageOpen(index, false);\r
+           this.setPackageSaved(index, true);\r
         }\r
     }\r
     \r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningPlatformList.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningPlatformList.java
index cee2f8caadc2c122f424325fb49fb2ddc76de237..97c5a5034b5ec69874e94286601dbcab4873adc2 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningPlatformList.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpeningPlatformList.java
@@ -183,6 +183,7 @@ public class OpeningPlatformList {
     public void closeAll() {\r
         for (int index = 0; index < this.size(); index++) {\r
            this.setPlatformOpen(index, false);\r
+           this.setPlatformSaved(index, true);\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 3427d7d8e5feab5c9bd4f0885c5bef543f052972..50969a9d79472f12ed75d24d1f99c6115c43788c 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
@@ -47,6 +47,8 @@ import org.tianocore.frameworkwizard.common.Identifications.OpeningModuleType;
 import org.tianocore.frameworkwizard.common.ui.IInternalFrame;\r
 import org.tianocore.frameworkwizard.common.ui.StarLabel;\r
 import javax.swing.JRadioButton;\r
+import javax.swing.event.DocumentEvent;\r
+import javax.swing.event.DocumentListener;\r
 \r
 /**\r
  The class is used to create, update MsaHeader of MSA file\r
@@ -55,7 +57,7 @@ import javax.swing.JRadioButton;
 \r
 \r
  **/\r
-public class MsaHeader extends IInternalFrame {\r
+public class MsaHeader extends IInternalFrame implements DocumentListener {\r
 \r
     ///\r
     /// Define class Serial Version UID\r
@@ -212,7 +214,6 @@ public class MsaHeader extends IInternalFrame {
             jCheckBoxIa32.setText("IA32");\r
             jCheckBoxIa32.setToolTipText(DataType.SUP_ARCH_LIST_HELP_TEXT);\r
             jCheckBoxIa32.addFocusListener(this);\r
-            jCheckBoxIa32.addItemListener(this);\r
         }\r
         return jCheckBoxIa32;\r
     }\r
@@ -229,7 +230,6 @@ public class MsaHeader extends IInternalFrame {
             jCheckBoxX64.setText("X64");\r
             jCheckBoxX64.setToolTipText(DataType.SUP_ARCH_LIST_HELP_TEXT);\r
             jCheckBoxX64.addFocusListener(this);\r
-            jCheckBoxX64.addItemListener(this);\r
         }\r
         return jCheckBoxX64;\r
     }\r
@@ -246,7 +246,6 @@ public class MsaHeader extends IInternalFrame {
             jCheckBoxIpf.setText("IPF");\r
             jCheckBoxIpf.setToolTipText(DataType.SUP_ARCH_LIST_HELP_TEXT);\r
             jCheckBoxIpf.addFocusListener(this);\r
-            jCheckBoxIpf.addItemListener(this);\r
         }\r
         return jCheckBoxIpf;\r
     }\r
@@ -263,7 +262,6 @@ public class MsaHeader extends IInternalFrame {
             jCheckBoxEbc.setText("EBC");\r
             jCheckBoxEbc.setToolTipText(DataType.SUP_ARCH_LIST_HELP_TEXT);\r
             jCheckBoxEbc.addFocusListener(this);\r
-            jCheckBoxEbc.addItemListener(this);\r
         }\r
         return jCheckBoxEbc;\r
     }\r
@@ -280,7 +278,6 @@ public class MsaHeader extends IInternalFrame {
             jCheckBoxArm.setText("ARM");\r
             jCheckBoxArm.setToolTipText(DataType.SUP_ARCH_LIST_HELP_TEXT);\r
             jCheckBoxArm.addFocusListener(this);\r
-            jCheckBoxArm.addItemListener(this);\r
         }\r
         return jCheckBoxArm;\r
     }\r
@@ -297,7 +294,6 @@ public class MsaHeader extends IInternalFrame {
             jCheckBoxPpc.setText("PPC");\r
             jCheckBoxPpc.setToolTipText(DataType.SUP_ARCH_LIST_HELP_TEXT);\r
             jCheckBoxPpc.addFocusListener(this);\r
-            jCheckBoxPpc.addItemListener(this);\r
         }\r
         return jCheckBoxPpc;\r
     }\r
@@ -538,7 +534,6 @@ public class MsaHeader extends IInternalFrame {
             jComboBoxModuleType.setBounds(new java.awt.Rectangle(valueCol, 35, valueWidth, 20));\r
             jComboBoxModuleType.setPreferredSize(new java.awt.Dimension(valueWidth, 20));\r
             jComboBoxModuleType.addFocusListener(this);\r
-            jComboBoxModuleType.addItemListener(this);\r
         }\r
         return jComboBoxModuleType;\r
     }\r
@@ -686,6 +681,7 @@ public class MsaHeader extends IInternalFrame {
         init(msa.getMsaHeader());\r
         init(msa.getModuleDefinitions());\r
         init(msa.getExterns());\r
+        this.addListeners();\r
 \r
         this.setVisible(true);\r
         this.setViewMode(false);\r
@@ -1544,7 +1540,6 @@ public class MsaHeader extends IInternalFrame {
             jCheckBoxPcd.addFocusListener(this);\r
             jCheckBoxPcd.addActionListener(this);\r
             jCheckBoxPcd.setEnabled(false);\r
-            jCheckBoxPcd.addItemListener(this);\r
         }\r
         return jCheckBoxPcd;\r
     }\r
@@ -1688,5 +1683,45 @@ public class MsaHeader extends IInternalFrame {
             }\r
             this.save();\r
         }\r
+        \r
+        this.omt.setSaved(false);\r
+    }\r
+    \r
+    private void addListeners() {\r
+        this.jTextFieldBaseName.getDocument().addDocumentListener(this);\r
+        this.jTextFieldGuid.getDocument().addDocumentListener(this);\r
+        this.jTextFieldAbstract.getDocument().addDocumentListener(this);\r
+        this.jTextAreaCopyright.getDocument().addDocumentListener(this);\r
+        this.jTextAreaDescription.getDocument().addDocumentListener(this);\r
+        this.jTextAreaLicense.getDocument().addDocumentListener(this);\r
+        this.jTextFieldOutputFileBasename.getDocument().addDocumentListener(this);\r
+        this.jTextFieldSpecification.getDocument().addDocumentListener(this);\r
+        this.jTextFieldURL.getDocument().addDocumentListener(this);\r
+        this.jTextFieldVersion.getDocument().addDocumentListener(this);\r
+        \r
+        this.jComboBoxModuleType.addItemListener(this);\r
+        \r
+        this.jCheckBoxIa32.addItemListener(this);\r
+        this.jCheckBoxX64.addItemListener(this);\r
+        this.jCheckBoxIpf.addItemListener(this);\r
+        this.jCheckBoxEbc.addItemListener(this);\r
+        this.jCheckBoxArm.addItemListener(this);\r
+        this.jCheckBoxPpc.addItemListener(this);\r
+        \r
+        this.jCheckBoxPcd.addItemListener(this);\r
+        \r
+        this.jCheckBoxFlashMap.addItemListener(this);\r
+    }\r
+\r
+    public void insertUpdate(DocumentEvent e) {\r
+        this.omt.setSaved(false);        \r
+    }\r
+\r
+    public void removeUpdate(DocumentEvent e) {\r
+        this.omt.setSaved(false);\r
+    }\r
+\r
+    public void changedUpdate(DocumentEvent e) {\r
+        // Do nothing\r
     }\r
 }\r