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

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

4 files changed, 15 insertions, 48 deletions

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
index c05c9eeecb..dfc9f62492 100644
--- 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
 

         if (arg0.getSource() == this.jMenuItemFileCloseAll) {

             this.closeAll();

+            this.makeEmptyTree();

         }

 

         if (arg0.getSource() == this.jMenuItemFileSave) {

@@ -3002,7 +3003,14 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         GlobalData.openingModuleList.closeAll();

         GlobalData.openingPackageList.closeAll();

         GlobalData.openingPlatformList.closeAll();

-        this.makeEmptyTree();

+    }

+

+    /**

+     Refresh all global data from disk to memory

+     

+     **/

+    private void refresh() {

+        GlobalData.init();

     }

 

     /**

@@ -3190,6 +3198,8 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,

                                           JOptionPane.INFORMATION_MESSAGE);

             this.closeAll();

+            this.refresh();

+            this.makeEmptyTree();

         }

         iso.dispose();

     }

@@ -3206,6 +3216,8 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,

                                           JOptionPane.INFORMATION_MESSAGE);

             this.closeAll();

+            this.refresh();

+            this.makeEmptyTree();

         }

         dso.dispose();

     }

@@ -3222,6 +3234,8 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,

                                           JOptionPane.INFORMATION_MESSAGE);

             this.closeAll();

+            this.refresh();

+            this.makeEmptyTree();

         }

         uso.dispose();

     }

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 5b5b4dfcee..f0b337b383 100644
--- 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 {
 

     private JTextArea jDescriptionTextArea = null;

 

-    //    private JLabel jLabelSpecification = null;

-

     private JTextField jSpecificationTextField = null;

 

-    private JButton jButtonOk = null;

-

-    private JButton jButtonCancel = null;

-

     private JScrollPane jLicenseScrollPane = null;

 

     private JScrollPane jDescriptionScrollPane = null;

@@ -362,40 +356,6 @@ public class SpdHeader extends IInternalFrame {
     }

 

     /**

-     This method initializes jButtonOk 

-     

-     @return javax.swing.JButton jButtonOk

-     

-     **/

-    private JButton getJButtonOk() {

-        if (jButtonOk == null) {

-            jButtonOk = new JButton();

-            jButtonOk.setText("OK");

-            jButtonOk.setBounds(new java.awt.Rectangle(290, 445, 90, oneRowHeight));

-            jButtonOk.setVisible(false);

-            jButtonOk.addActionListener(this);

-        }

-        return jButtonOk;

-    }

-

-    /**

-     This method initializes jButtonCancel 

-     

-     @return javax.swing.JButton jButtonCancel

-     

-     **/

-    private JButton getJButtonCancel() {

-        if (jButtonCancel == null) {

-            jButtonCancel = new JButton();

-            jButtonCancel.setText("Cancel");

-            jButtonCancel.setBounds(new java.awt.Rectangle(390, 445, 90, oneRowHeight));

-            jButtonCancel.setVisible(false);

-            jButtonCancel.addActionListener(this);

-        }

-        return jButtonCancel;

-    }

-

-    /**

      This method initializes jLicenseScrollPane 

      

      @return javax.swing.JScrollPane jLicenseScrollPane

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 ada2a82a11..6231d8aac3 100644
--- 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;

 

 import java.awt.BorderLayout;

-import javax.swing.BoxLayout;

 

 import javax.swing.JPanel;

 import javax.swing.JTabbedPane;

@@ -49,7 +48,6 @@ import org.tianocore.PlatformSurfaceAreaDocument;
 import org.tianocore.frameworkwizard.common.DataValidation;

 import org.tianocore.frameworkwizard.common.Identifications.OpeningPlatformType;

 import org.tianocore.frameworkwizard.common.ui.IInternalFrame;

-import org.tianocore.frameworkwizard.common.ui.ArchCheckBox;

 

 import java.io.File;

 import java.util.ArrayList;

@@ -66,8 +64,6 @@ public class FpdBuildOptions extends IInternalFrame {
 

     private final int twoRowHeight = 40;

 

-    private final int threeRowHeight = 60;

-

     private final int sepHeight = 6;

 

     private final int sepWidth = 10;

@@ -100,8 +96,6 @@ public class FpdBuildOptions extends IInternalFrame {
 

     private final int firstButtonLoc = next2LastButtonLoc - buttonWidth - sepWidth;

 

-    private final int starColumn = 2;

-

     private final int labelColumn = 12;

 

     private final int fieldColumn = 168;

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 0c417c53a2..b7acc7da29 100644
--- 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;

 import org.tianocore.frameworkwizard.platform.PlatformIdentification;

 import org.tianocore.PlatformSurfaceAreaDocument;

-import org.tianocore.frameworkwizard.toolchain.ToolChainId;

 

 /**

  * The class is used to update the target.txt file.