1. Fix EDKT214 "Framework Wizard is not synchronized with FrameworkDatabase.db when...

2. Remove some unused code from some files.

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
index c05c9eeecbe2416f682d1bb09b4b267d52200439..dfc9f6249219f65b3c4c9f8faef44df50e53d0f4 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
@@ -1828,6 +1828,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
 \r
         if (arg0.getSource() == this.jMenuItemFileCloseAll) {\r
             this.closeAll();\r
+            this.makeEmptyTree();\r
         }\r
 \r
         if (arg0.getSource() == this.jMenuItemFileSave) {\r
@@ -3002,7 +3003,14 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         GlobalData.openingModuleList.closeAll();\r
         GlobalData.openingPackageList.closeAll();\r
         GlobalData.openingPlatformList.closeAll();\r
-        this.makeEmptyTree();\r
+    }\r
+\r
+    /**\r
+     Refresh all global data from disk to memory\r
+     \r
+     **/\r
+    private void refresh() {\r
+        GlobalData.init();\r
     }\r
 \r
     /**\r
@@ -3190,6 +3198,8 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,\r
                                           JOptionPane.INFORMATION_MESSAGE);\r
             this.closeAll();\r
+            this.refresh();\r
+            this.makeEmptyTree();\r
         }\r
         iso.dispose();\r
     }\r
@@ -3206,6 +3216,8 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,\r
                                           JOptionPane.INFORMATION_MESSAGE);\r
             this.closeAll();\r
+            this.refresh();\r
+            this.makeEmptyTree();\r
         }\r
         dso.dispose();\r
     }\r
@@ -3222,6 +3234,8 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,\r
                                           JOptionPane.INFORMATION_MESSAGE);\r
             this.closeAll();\r
+            this.refresh();\r
+            this.makeEmptyTree();\r
         }\r
         uso.dispose();\r
     }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java
index 5b5b4dfcee7aef98aa8d44dafd24513eb5699d9c..f0b337b38382ae21d83e98206cc1d0f4ac41485f 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java
@@ -128,14 +128,8 @@ public class SpdHeader extends IInternalFrame {
 \r
     private JTextArea jDescriptionTextArea = null;\r
 \r
-    //    private JLabel jLabelSpecification = null;\r
-\r
     private JTextField jSpecificationTextField = null;\r
 \r
-    private JButton jButtonOk = null;\r
-\r
-    private JButton jButtonCancel = null;\r
-\r
     private JScrollPane jLicenseScrollPane = null;\r
 \r
     private JScrollPane jDescriptionScrollPane = null;\r
@@ -361,40 +355,6 @@ public class SpdHeader extends IInternalFrame {
         return jSpecificationTextField;\r
     }\r
 \r
-    /**\r
-     This method initializes jButtonOk \r
-     \r
-     @return javax.swing.JButton jButtonOk\r
-     \r
-     **/\r
-    private JButton getJButtonOk() {\r
-        if (jButtonOk == null) {\r
-            jButtonOk = new JButton();\r
-            jButtonOk.setText("OK");\r
-            jButtonOk.setBounds(new java.awt.Rectangle(290, 445, 90, oneRowHeight));\r
-            jButtonOk.setVisible(false);\r
-            jButtonOk.addActionListener(this);\r
-        }\r
-        return jButtonOk;\r
-    }\r
-\r
-    /**\r
-     This method initializes jButtonCancel \r
-     \r
-     @return javax.swing.JButton jButtonCancel\r
-     \r
-     **/\r
-    private JButton getJButtonCancel() {\r
-        if (jButtonCancel == null) {\r
-            jButtonCancel = new JButton();\r
-            jButtonCancel.setText("Cancel");\r
-            jButtonCancel.setBounds(new java.awt.Rectangle(390, 445, 90, oneRowHeight));\r
-            jButtonCancel.setVisible(false);\r
-            jButtonCancel.addActionListener(this);\r
-        }\r
-        return jButtonCancel;\r
-    }\r
-\r
     /**\r
      This method initializes jLicenseScrollPane \r
      \r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java
index ada2a82a11fb9118b3b2c65f1ce5e1364ca9e66a..6231d8aac3db6f9631cf70c5c82e2dbf38990ec5 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java
@@ -15,7 +15,6 @@
 package org.tianocore.frameworkwizard.platform.ui;\r
 \r
 import java.awt.BorderLayout;\r
-import javax.swing.BoxLayout;\r
 \r
 import javax.swing.JPanel;\r
 import javax.swing.JTabbedPane;\r
@@ -49,7 +48,6 @@ import org.tianocore.PlatformSurfaceAreaDocument;
 import org.tianocore.frameworkwizard.common.DataValidation;\r
 import org.tianocore.frameworkwizard.common.Identifications.OpeningPlatformType;\r
 import org.tianocore.frameworkwizard.common.ui.IInternalFrame;\r
-import org.tianocore.frameworkwizard.common.ui.ArchCheckBox;\r
 \r
 import java.io.File;\r
 import java.util.ArrayList;\r
@@ -66,8 +64,6 @@ public class FpdBuildOptions extends IInternalFrame {
 \r
     private final int twoRowHeight = 40;\r
 \r
-    private final int threeRowHeight = 60;\r
-\r
     private final int sepHeight = 6;\r
 \r
     private final int sepWidth = 10;\r
@@ -100,8 +96,6 @@ public class FpdBuildOptions extends IInternalFrame {
 \r
     private final int firstButtonLoc = next2LastButtonLoc - buttonWidth - sepWidth;\r
 \r
-    private final int starColumn = 2;\r
-\r
     private final int labelColumn = 12;\r
 \r
     private final int fieldColumn = 168;\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/toolchain/Preferences.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/toolchain/Preferences.java
index 0c417c53a2e86b60ac27d3d0ccb4d6507fc9b7be..b7acc7da29414752105a9097ab8d0b0a20442582 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/toolchain/Preferences.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/toolchain/Preferences.java
@@ -42,7 +42,6 @@ import org.tianocore.frameworkwizard.workspace.Workspace;
 import org.tianocore.frameworkwizard.workspace.WorkspaceTools;\r
 import org.tianocore.frameworkwizard.platform.PlatformIdentification;\r
 import org.tianocore.PlatformSurfaceAreaDocument;\r
-import org.tianocore.frameworkwizard.toolchain.ToolChainId;\r
 \r
 /**\r
  * The class is used to update the target.txt file.\r