1. Adjust UI for far operations

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

10 files changed, 72 insertions, 107 deletions

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepFour.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepFour.java
index 55475431a1..2ce541a276 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepFour.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepFour.java
@@ -26,9 +26,9 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;

 import javax.swing.JTextArea;

 import javax.swing.JTextField;

-import javax.swing.table.DefaultTableModel;

 

 import org.tianocore.frameworkwizard.common.DataType;

+import org.tianocore.frameworkwizard.common.IDefaultTableModel;

 import org.tianocore.frameworkwizard.common.IFileFilter;

 import org.tianocore.frameworkwizard.common.Log;

 import org.tianocore.frameworkwizard.common.Tools;

@@ -66,7 +66,7 @@ public class CreateStepFour extends IDialog implements MouseListener {
 

     private JButton jButtonPrevious = null;

 

-    private PartialTableModel model = null;

+    private IDefaultTableModel model = null;

 

     private CreateStepThree stepThree = null;

 

@@ -99,7 +99,7 @@ public class CreateStepFour extends IDialog implements MouseListener {
     private JTextField getJTextField1() {

         if (jTextFieldSaveToFile == null) {

             jTextFieldSaveToFile = new JTextField();

-            jTextFieldSaveToFile.setBounds(new java.awt.Rectangle(139, 70, 400, 20));

+            jTextFieldSaveToFile.setBounds(new java.awt.Rectangle(147,70,412,20));

         }

         return jTextFieldSaveToFile;

     }

@@ -112,7 +112,7 @@ public class CreateStepFour extends IDialog implements MouseListener {
     private JButton getJButtonBrower() {

         if (jButtonBrowser == null) {

             jButtonBrowser = new JButton();

-            jButtonBrowser.setBounds(new java.awt.Rectangle(542, 70, 97, 20));

+            jButtonBrowser.setBounds(new java.awt.Rectangle(570, 70, 100, 20));

             jButtonBrowser.setText("Browser...");

             jButtonBrowser.addMouseListener(this);

         }

@@ -173,6 +173,7 @@ public class CreateStepFour extends IDialog implements MouseListener {
             jButtonPrevious.setBounds(new java.awt.Rectangle(370, 330, 90, 20));

             jButtonPrevious.setText("Previous");

             jButtonPrevious.addMouseListener(this);

+            jButtonPrevious.setVisible(false);

         }

         return jButtonPrevious;

     }

@@ -193,7 +194,7 @@ public class CreateStepFour extends IDialog implements MouseListener {
     private void initialize() {

         this.setSize(700, 400);

         this.setContentPane(getJContentPane());

-        this.setTitle("Create Framework Archive(FAR) - Step 4: Summary");

+        this.setTitle("Create Framework Archive(FAR) - Step 4: Finish");

         this.centerWindow();

     }

 

@@ -205,10 +206,10 @@ public class CreateStepFour extends IDialog implements MouseListener {
     private JPanel getJContentPane() {

         if (jContentPane == null) {

             jLabel2 = new JLabel();

-            jLabel2.setBounds(new java.awt.Rectangle(30, 70, 220, 18));

+            jLabel2.setBounds(new java.awt.Rectangle(30,70,111,18));

             jLabel2.setText("Select File to Save:  ");

             jLabel = new JLabel();

-            jLabel.setBounds(new java.awt.Rectangle(30, 64, 320, 20));

+            jLabel.setBounds(new java.awt.Rectangle(29,108,320,20));

             jLabel.setText("This FAR will depend on following packages: ");

             jLabel.setVisible(false);

             jContentPane = new JPanel();

@@ -258,8 +259,8 @@ public class CreateStepFour extends IDialog implements MouseListener {
             this.setVisible(false);

             this.dispose();

         } else if (e.getSource() == jButtonPrevious) {

-            this.setVisible(false);

             stepThree.setVisible(true);

+            this.setVisible(false);

         } else if (e.getSource() == jButtonBrowser) {

             JFileChooser fc = new JFileChooser();

             fc.setAcceptAllFileFilterUsed(false);

@@ -352,16 +353,3 @@ public class CreateStepFour extends IDialog implements MouseListener {
     }

 }

 

-class PartialTableModel extends DefaultTableModel {

-    /**

-     * 

-     */

-    private static final long serialVersionUID = 1L;

-

-    public boolean isCellEditable(int row, int col) {

-        switch (col) {

-        default:

-            return false;

-        }

-    }

-}

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepOne.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepOne.java
index 6e11a5a455..54baaeb102 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepOne.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepOne.java
@@ -122,7 +122,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
     private JTextField getJTextFieldBaseName() {

         if (jTextFieldBaseName == null) {

             jTextFieldBaseName = new JTextField();

-            jTextFieldBaseName.setBounds(new java.awt.Rectangle(160, 10, 260, 20));

+            jTextFieldBaseName.setBounds(new java.awt.Rectangle(160, 10, 520, 20));

             jTextFieldBaseName.setToolTipText("An brief Identifier, such as USB I/O Library, of the module");

         }

         return jTextFieldBaseName;

@@ -137,7 +137,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
     private JTextField getJTextFieldGuid() {

         if (jTextFieldGuid == null) {

             jTextFieldGuid = new JTextField();

-            jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 260, 20));

+            jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 410, 20));

             jTextFieldGuid.setToolTipText("Guaranteed Unique Identification Number (8-4-4-4-12)");

         }

         return jTextFieldGuid;

@@ -152,7 +152,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
     private JTextField getJTextFieldVersion() {

         if (jTextFieldVersion == null) {

             jTextFieldVersion = new JTextField();

-            jTextFieldVersion.setBounds(new java.awt.Rectangle(160, 60, 260, 20));

+            jTextFieldVersion.setBounds(new java.awt.Rectangle(160, 60, 520, 20));

             jTextFieldVersion.setToolTipText("A Version Number, 1.0, 1, 1.01");

         }

         return jTextFieldVersion;

@@ -167,7 +167,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
     private JButton getJButtonGenerateGuid() {

         if (jButtonGenerateGuid == null) {

             jButtonGenerateGuid = new JButton();

-            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(440, 35, 90, 20));

+            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(590, 35, 90, 20));

             jButtonGenerateGuid.setText("Generate");

             jButtonGenerateGuid.addMouseListener(this);

         }

@@ -215,7 +215,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
         if (jTextFieldSpecification == null) {

             jTextFieldSpecification = new JTextField();

             jTextFieldSpecification.setText("FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052");

-            jTextFieldSpecification.setBounds(new java.awt.Rectangle(160, 290, 420, 20));

+            jTextFieldSpecification.setBounds(new java.awt.Rectangle(160, 290, 520, 20));

             jTextFieldSpecification.setEditable(false);

         }

         return jTextFieldSpecification;

@@ -231,7 +231,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
         if (jScrollPaneLicense == null) {

             jScrollPaneLicense = new JScrollPane();

             jScrollPaneLicense.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);

-            jScrollPaneLicense.setBounds(new java.awt.Rectangle(160, 200, 420, 60));

+            jScrollPaneLicense.setBounds(new java.awt.Rectangle(160, 200, 520, 60));

             jScrollPaneLicense.setViewportView(getJTextAreaLicense());

         }

         return jScrollPaneLicense;

@@ -247,7 +247,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
         if (jScrollPaneDescription == null) {

             jScrollPaneDescription = new JScrollPane();

             jScrollPaneDescription.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);

-            jScrollPaneDescription.setBounds(new java.awt.Rectangle(160, 110, 420, 60));

+            jScrollPaneDescription.setBounds(new java.awt.Rectangle(160, 110, 520, 60));

             jScrollPaneDescription.setViewportView(getJTextAreaDescription());

         }

         return jScrollPaneDescription;

@@ -262,7 +262,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
     private JTextField getJTextFieldAbstract() {

         if (jTextFieldAbstract == null) {

             jTextFieldAbstract = new JTextField();

-            jTextFieldAbstract.setBounds(new java.awt.Rectangle(160, 85, 420, 20));

+            jTextFieldAbstract.setBounds(new java.awt.Rectangle(160, 85, 520, 20));

             jTextFieldAbstract.setToolTipText("A one sentence description of this module");

         }

         return jTextFieldAbstract;

@@ -277,7 +277,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
     private JTextField getJTextFieldCopyright() {

         if (jTextFieldCopyright == null) {

             jTextFieldCopyright = new JTextField();

-            jTextFieldCopyright.setBounds(new java.awt.Rectangle(160, 175, 420, 20));

+            jTextFieldCopyright.setBounds(new java.awt.Rectangle(160, 175, 520, 20));

             jTextFieldCopyright.setToolTipText("One or more copyright lines");

         }

         return jTextFieldCopyright;

@@ -291,7 +291,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
     private JTextField getJTextFieldURL() {

         if (jTextFieldURL == null) {

             jTextFieldURL = new JTextField();

-            jTextFieldURL.setBounds(new java.awt.Rectangle(160, 265, 420, 20));

+            jTextFieldURL.setBounds(new java.awt.Rectangle(160, 265, 520, 20));

             jTextFieldURL.setToolTipText("A URL for the latest version of the license");

         }

         return jTextFieldURL;

@@ -318,7 +318,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
     private JButton getJButtonCancel() {

         if (jButtonCancel == null) {

             jButtonCancel = new JButton();

-            jButtonCancel.setBounds(new java.awt.Rectangle(570, 330, 90, 20));

+            jButtonCancel.setBounds(new java.awt.Rectangle(590, 330, 90, 20));

             jButtonCancel.setText("Cancel");

             jButtonCancel.addMouseListener(this);

         }

@@ -333,7 +333,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
     private JButton getJButtonNext() {

         if (jButtonNext == null) {

             jButtonNext = new JButton();

-            jButtonNext.setBounds(new java.awt.Rectangle(470, 330, 90, 20));

+            jButtonNext.setBounds(new java.awt.Rectangle(480, 330, 90, 20));

             jButtonNext.setText("Next");

             jButtonNext.addMouseListener(this);

         }

@@ -398,31 +398,31 @@ public class CreateStepOne extends IDialog implements MouseListener {
 

             jLabelURL = new JLabel();

             jLabelURL.setText("License URL");

-            jLabelURL.setBounds(new java.awt.Rectangle(35, 265, 140, 20));

+            jLabelURL.setBounds(new java.awt.Rectangle(35, 265, 120, 20));

             jLabelBaseName = new JLabel();

             jLabelBaseName.setText("FAR Name");

-            jLabelBaseName.setBounds(new java.awt.Rectangle(35, 10, 140, 20));

+            jLabelBaseName.setBounds(new java.awt.Rectangle(35, 10, 120, 20));

             jLabelGuid = new JLabel();

             jLabelGuid.setText("Guid Value");

-            jLabelGuid.setBounds(new java.awt.Rectangle(35, 35, 140, 20));

+            jLabelGuid.setBounds(new java.awt.Rectangle(35, 35, 120, 20));

             jLabelVersion = new JLabel();

             jLabelVersion.setText("Version");

-            jLabelVersion.setBounds(new java.awt.Rectangle(35, 60, 140, 20));

+            jLabelVersion.setBounds(new java.awt.Rectangle(35, 60, 120, 20));

             jLabelAbstract = new JLabel();

             jLabelAbstract.setText("Abstract");

-            jLabelAbstract.setBounds(new java.awt.Rectangle(35, 85, 140, 20));

+            jLabelAbstract.setBounds(new java.awt.Rectangle(35, 85, 120, 20));

             jLabelDescription = new JLabel();

             jLabelDescription.setText("Description");

-            jLabelDescription.setBounds(new java.awt.Rectangle(35, 110, 140, 20));

+            jLabelDescription.setBounds(new java.awt.Rectangle(35, 110, 120, 20));

             jLabelCopyright = new JLabel();

             jLabelCopyright.setText("Copyright");

-            jLabelCopyright.setBounds(new java.awt.Rectangle(35, 175, 140, 20));

+            jLabelCopyright.setBounds(new java.awt.Rectangle(35, 175, 120, 20));

             jLabelLicense = new JLabel();

             jLabelLicense.setText("License");

-            jLabelLicense.setBounds(new java.awt.Rectangle(35, 200, 140, 20));

+            jLabelLicense.setBounds(new java.awt.Rectangle(35, 200, 120, 20));

             jLabelSpecification = new JLabel();

             jLabelSpecification.setText("Specification");

-            jLabelSpecification.setBounds(new java.awt.Rectangle(35, 290, 140, 20));

+            jLabelSpecification.setBounds(new java.awt.Rectangle(35, 290, 120, 20));

 

             jContentPane = new JPanel();

             jContentPane.setLayout(null);

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepThree.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepThree.java
index fd7def76e8..53a6f6f519 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepThree.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepThree.java
@@ -153,7 +153,7 @@ public class CreateStepThree extends IDialog implements MouseListener {
     private JScrollPane getJScrollPane() {

         if (jScrollPane == null) {

             jScrollPane = new JScrollPane();

-            jScrollPane.setBounds(new java.awt.Rectangle(139, 85, 500, 130));

+            jScrollPane.setBounds(new java.awt.Rectangle(30, 85, 640, 130));

             jScrollPane.setViewportView(getJComboBoxFileFilter());

         }

         return jScrollPane;

@@ -167,7 +167,7 @@ public class CreateStepThree extends IDialog implements MouseListener {
     private JTextField getJTextField() {

         if (jTextField == null) {

             jTextField = new JTextField();

-            jTextField.setBounds(new java.awt.Rectangle(139, 250, 500, 20));

+            jTextField.setBounds(new java.awt.Rectangle(30, 250, 640, 20));

         }

         return jTextField;

     }

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepTwo.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepTwo.java
index c1d1d3a1ae..5763963e04 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepTwo.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepTwo.java
@@ -173,7 +173,7 @@ public class CreateStepTwo extends IDialog implements MouseListener {
     private JScrollPane getJScrollPanePackage() {

         if (jScrollPanePackage == null) {

             jScrollPanePackage = new JScrollPane();

-            jScrollPanePackage.setBounds(new java.awt.Rectangle(139, 64, 500, 130));

+            jScrollPanePackage.setBounds(new java.awt.Rectangle(140,65,535,130));

             jScrollPanePackage.setViewportView(getJComboBoxPackage());

         }

         return jScrollPanePackage;

@@ -187,7 +187,7 @@ public class CreateStepTwo extends IDialog implements MouseListener {
     private JScrollPane getJScrollPanePlatform() {

         if (jScrollPanePlatform == null) {

             jScrollPanePlatform = new JScrollPane();

-            jScrollPanePlatform.setBounds(new java.awt.Rectangle(139, 200, 500, 100));

+            jScrollPanePlatform.setBounds(new java.awt.Rectangle(140,200,535,110));

             jScrollPanePlatform.setViewportView(getJComboBoxPlatform());

         }

         return jScrollPanePlatform;

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepOne.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepOne.java
index ecb71c3a0e..f861eeed06 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepOne.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepOne.java
@@ -13,12 +13,23 @@
 

 package org.tianocore.frameworkwizard.far.deleteui;

 

+import java.awt.Color;

+import java.awt.Dimension;

+import java.awt.Toolkit;

+import java.awt.event.ActionEvent;

+import java.util.Iterator;

+import java.util.List;

+import java.util.Vector;

+

 import javax.swing.ImageIcon;

-import javax.swing.JPanel;

 import javax.swing.JButton;

-import javax.swing.JTextArea;

 import javax.swing.JLabel;

+import javax.swing.JList;

+import javax.swing.JPanel;

 import javax.swing.JScrollPane;

+import javax.swing.JTextArea;

+import javax.swing.event.ListSelectionEvent;

+import javax.swing.event.ListSelectionListener;

 

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

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

@@ -30,20 +41,7 @@ import org.tianocore.frameworkwizard.packaging.PackageIdentification;
 import org.tianocore.frameworkwizard.platform.PlatformIdentification;

 import org.tianocore.frameworkwizard.workspace.WorkspaceTools;

 

-import java.awt.Color;

-import java.awt.Dimension;

-import java.awt.Toolkit;

-import java.awt.event.MouseEvent;

-import java.awt.event.MouseListener;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Vector;

-

-import javax.swing.JList;

-import javax.swing.event.ListSelectionEvent;

-import javax.swing.event.ListSelectionListener;

-

-public class DeleteStepOne extends IDialog implements ListSelectionListener, MouseListener {

+public class DeleteStepOne extends IDialog implements ListSelectionListener {

 

     /**

      * 

@@ -100,7 +98,7 @@ public class DeleteStepOne extends IDialog implements ListSelectionListener, Mou
             jButtonCancel = new JButton();

             jButtonCancel.setBounds(new java.awt.Rectangle(570, 330, 90, 20));

             jButtonCancel.setText("Cancel");

-            jButtonCancel.addMouseListener(this);

+            jButtonCancel.addActionListener(this);

         }

         return jButtonCancel;

     }

@@ -116,6 +114,7 @@ public class DeleteStepOne extends IDialog implements ListSelectionListener, Mou
             jButtonNext.setBounds(new java.awt.Rectangle(470, 330, 90, 20));

             jButtonNext.setText("Next");

             jButtonNext.setEnabled(false);

+            jButtonNext.addActionListener(this);

         }

         return jButtonNext;

     }

@@ -147,7 +146,7 @@ public class DeleteStepOne extends IDialog implements ListSelectionListener, Mou
     private JScrollPane getJScrollPane() {

         if (jScrollPane == null) {

             jScrollPane = new JScrollPane();

-            jScrollPane.setBounds(new java.awt.Rectangle(139, 64, 500, 104));

+            jScrollPane.setBounds(new java.awt.Rectangle(140, 65, 530, 100));

             jScrollPane.setViewportView(getJListFar());

         }

         return jScrollPane;

@@ -161,7 +160,7 @@ public class DeleteStepOne extends IDialog implements ListSelectionListener, Mou
     private JScrollPane getJScrollPane1() {

         if (jScrollPane1 == null) {

             jScrollPane1 = new JScrollPane();

-            jScrollPane1.setBounds(new java.awt.Rectangle(40, 195, 300, 115));

+            jScrollPane1.setBounds(new java.awt.Rectangle(30, 195, 300, 115));

             jScrollPane1.setViewportView(getJListPackage());

         }

         return jScrollPane1;

@@ -175,7 +174,7 @@ public class DeleteStepOne extends IDialog implements ListSelectionListener, Mou
     private JScrollPane getJScrollPane2() {

         if (jScrollPane2 == null) {

             jScrollPane2 = new JScrollPane();

-            jScrollPane2.setBounds(new java.awt.Rectangle(360, 195, 300, 115));

+            jScrollPane2.setBounds(new java.awt.Rectangle(360, 195, 310, 115));

             jScrollPane2.setViewportView(getJListPlatform());

         }

         return jScrollPane2;

@@ -218,7 +217,6 @@ public class DeleteStepOne extends IDialog implements ListSelectionListener, Mou
             jButtonDetail.setBounds(new java.awt.Rectangle(367, 325, 69, 20));

             jButtonDetail.setText("Detail");

             jButtonDetail.setVisible(false);

-            jButtonDetail.addMouseListener(this);

         }

         return jButtonDetail;

     }

@@ -275,10 +273,10 @@ public class DeleteStepOne extends IDialog implements ListSelectionListener, Mou
             jLabel3.setBounds(new java.awt.Rectangle(360, 170, 113, 20));

             jLabel3.setText("FAR's Platforms");

             jLabel2 = new JLabel();

-            jLabel2.setBounds(new java.awt.Rectangle(40, 170, 113, 20));

+            jLabel2.setBounds(new java.awt.Rectangle(30, 170, 113, 20));

             jLabel2.setText("FAR's Packages");

             jLabel = new JLabel();

-            jLabel.setBounds(new java.awt.Rectangle(30, 64, 100, 20));

+            jLabel.setBounds(new java.awt.Rectangle(30, 65, 100, 20));

             jLabel.setText("Select one FAR: ");

             jContentPane = new JPanel();

             jContentPane.setLayout(null);

@@ -342,18 +340,16 @@ public class DeleteStepOne extends IDialog implements ListSelectionListener, Mou
                 jLabel4.setText("Without any remain packages depend on this FAR. ");

                 jButtonDetail.setVisible(false);

                 jButtonNext.setEnabled(true);

-                jButtonNext.addMouseListener(this);

             } else {

                 jLabelImage.setIcon(new ImageIcon(getClass().getResource("/resources/images/No.JPG")));

                 jLabel4.setText("Some remain packages still depend on this FAR. ");

                 //        jButtonDetail.setVisible(true);

                 jButtonNext.setEnabled(false);

-                jButtonNext.removeMouseListener(this);

             }

         }

     }

-

-    public void mouseClicked(MouseEvent e) {

+    

+    public void actionPerformed(ActionEvent e) {

         if (e.getSource() == jButtonCancel) {

             this.setVisible(false);

         } else if (e.getSource() == jButtonNext) {

@@ -367,25 +363,6 @@ public class DeleteStepOne extends IDialog implements ListSelectionListener, Mou
             this.setVisible(false);

             stepTwo.setVisible(true);

         }

-    }

-

-    public void mousePressed(MouseEvent e) {

-        // TODO Auto-generated method stub

-

-    }

-

-    public void mouseReleased(MouseEvent e) {

-        // TODO Auto-generated method stub

-

-    }

-

-    public void mouseEntered(MouseEvent e) {

-        // TODO Auto-generated method stub

-

-    }

-

-    public void mouseExited(MouseEvent e) {

-        // TODO Auto-generated method stub

 

     }

 

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepTwo.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepTwo.java
index 17a565d858..012d23bb6c 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepTwo.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepTwo.java
@@ -137,7 +137,7 @@ public class DeleteStepTwo extends IDialog implements MouseListener {
     private JRadioButton getJRadioButton() {

         if (jRadioButton == null) {

             jRadioButton = new JRadioButton();

-            jRadioButton.setBounds(new java.awt.Rectangle(100, 100, 340, 20));

+            jRadioButton.setBounds(new java.awt.Rectangle(40,100,340,20));

             jRadioButton.setSelected(true);

             jRadioButton.setText("Mode 1: Only remove from framework database");

         }

@@ -152,7 +152,7 @@ public class DeleteStepTwo extends IDialog implements MouseListener {
     private JRadioButton getJRadioButton1() {

         if (jRadioButton1 == null) {

             jRadioButton1 = new JRadioButton();

-            jRadioButton1.setBounds(new java.awt.Rectangle(100, 140, 358, 20));

+            jRadioButton1.setBounds(new java.awt.Rectangle(40,140,358,20));

             jRadioButton1.setText("Mode 2: Delete all related files from workspace");

         }

         return jRadioButton1;

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepOne.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepOne.java
index aa8afcd8a2..3c76c0fd18 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepOne.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepOne.java
@@ -131,7 +131,7 @@ public class InstallStepOne extends IDialog implements MouseListener {
     private JTextField getJTextFieldFarFile() {

         if (jTextFieldFarFile == null) {

             jTextFieldFarFile = new JTextField();

-            jTextFieldFarFile.setBounds(new java.awt.Rectangle(139, 100, 400, 20));

+            jTextFieldFarFile.setBounds(new java.awt.Rectangle(140, 80, 423, 20));

         }

         return jTextFieldFarFile;

     }

@@ -144,7 +144,7 @@ public class InstallStepOne extends IDialog implements MouseListener {
     private JButton getJButtonBrowser() {

         if (jButtonBrowser == null) {

             jButtonBrowser = new JButton();

-            jButtonBrowser.setBounds(new java.awt.Rectangle(542, 100, 97, 20));

+            jButtonBrowser.setBounds(new java.awt.Rectangle(570, 80, 100, 20));

             jButtonBrowser.setText("Browser...");

             jButtonBrowser.addMouseListener(this);

         }

@@ -159,7 +159,7 @@ public class InstallStepOne extends IDialog implements MouseListener {
     private JScrollPane getJScrollPane() {

         if (jScrollPane == null) {

             jScrollPane = new JScrollPane();

-            jScrollPane.setBounds(new java.awt.Rectangle(27, 166, 511, 143));

+            jScrollPane.setBounds(new java.awt.Rectangle(30, 165, 642, 140));

             jScrollPane.setViewportView(getJTable());

         }

         jScrollPane.setVisible(false);

@@ -233,11 +233,11 @@ public class InstallStepOne extends IDialog implements MouseListener {
     private JPanel getJContentPane() {

         if (jContentPane == null) {

             jLabelWarning = new JLabel();

-            jLabelWarning.setBounds(new java.awt.Rectangle(29, 134, 410, 20));

+            jLabelWarning.setBounds(new java.awt.Rectangle(30, 125, 410, 20));

             jLabelWarning.setText("Can't install this FAR, lack following packages in current workspace");

             jLabelWarning.setVisible(false);

             jLabel = new JLabel();

-            jLabel.setBounds(new java.awt.Rectangle(30, 80, 220, 20));

+            jLabel.setBounds(new java.awt.Rectangle(30, 80, 97, 20));

             jLabel.setText("Choose FAR file: ");

             jContentPane = new JPanel();

             jContentPane.setLayout(null);

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepTwo.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepTwo.java
index 33b407316c..347824cc01 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepTwo.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepTwo.java
@@ -160,7 +160,7 @@ public class InstallStepTwo extends IDialog implements MouseListener {
     private JScrollPane getJScrollPane() {

         if (jScrollPane == null) {

             jScrollPane = new JScrollPane();

-            jScrollPane.setBounds(new java.awt.Rectangle(35, 81, 600, 113));

+            jScrollPane.setBounds(new java.awt.Rectangle(30, 80, 642, 110));

             jScrollPane.setViewportView(getJTablePackage());

         }

         return jScrollPane;

@@ -219,7 +219,7 @@ public class InstallStepTwo extends IDialog implements MouseListener {
     private JScrollPane getJScrollPane1() {

         if (jScrollPane1 == null) {

             jScrollPane1 = new JScrollPane();

-            jScrollPane1.setBounds(new java.awt.Rectangle(35, 214, 596, 112));

+            jScrollPane1.setBounds(new java.awt.Rectangle(30, 215, 642, 110));

             jScrollPane1.setViewportView(getJTablePlatform());

         }

         return jScrollPane1;

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepOne.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepOne.java
index f6864cb891..afe0fbe9e8 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepOne.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepOne.java
@@ -134,7 +134,7 @@ public class UpdateStepOne extends IDialog implements MouseListener {
     private JTextField getJTextFieldFarFile() {

         if (jTextFieldFarFile == null) {

             jTextFieldFarFile = new JTextField();

-            jTextFieldFarFile.setBounds(new java.awt.Rectangle(130, 100, 400, 20));

+            jTextFieldFarFile.setBounds(new java.awt.Rectangle(130,80,436,20));

         }

         return jTextFieldFarFile;

     }

@@ -147,7 +147,7 @@ public class UpdateStepOne extends IDialog implements MouseListener {
     private JButton getJButtonBrowser() {

         if (jButtonBrowser == null) {

             jButtonBrowser = new JButton();

-            jButtonBrowser.setBounds(new java.awt.Rectangle(542, 100, 97, 20));

+            jButtonBrowser.setBounds(new java.awt.Rectangle(570, 80, 100, 20));

             jButtonBrowser.setText("Browser...");

             jButtonBrowser.addMouseListener(this);

         }

@@ -162,7 +162,7 @@ public class UpdateStepOne extends IDialog implements MouseListener {
     private JScrollPane getJScrollPane() {

         if (jScrollPane == null) {

             jScrollPane = new JScrollPane();

-            jScrollPane.setBounds(new java.awt.Rectangle(130, 164, 500, 160));

+            jScrollPane.setBounds(new java.awt.Rectangle(30, 135, 642, 160));

             jScrollPane.setViewportView(getJListFarFromDb());

         }

         return jScrollPane;

@@ -212,10 +212,10 @@ public class UpdateStepOne extends IDialog implements MouseListener {
     private JPanel getJContentPane() {

         if (jContentPane == null) {

             jLabel1 = new JLabel();

-            jLabel1.setBounds(new java.awt.Rectangle(30, 138, 355, 18));

+            jLabel1.setBounds(new java.awt.Rectangle(30, 110, 355, 18));

             jLabel1.setText("Choose FAR from current framework database");

             jLabel = new JLabel();

-            jLabel.setBounds(new java.awt.Rectangle(30, 80, 220, 20));

+            jLabel.setBounds(new java.awt.Rectangle(30,80,97,20));

             jLabel.setText("Choose FAR file: ");

             jContentPane = new JPanel();

             jContentPane.setLayout(null);

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepTwo.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepTwo.java
index f455604f62..77c8d370ce 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepTwo.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepTwo.java
@@ -146,7 +146,7 @@ public class UpdateStepTwo extends IDialog implements MouseListener {
     private JScrollPane getJScrollPane() {

         if (jScrollPane == null) {

             jScrollPane = new JScrollPane();

-            jScrollPane.setBounds(new java.awt.Rectangle(30, 98, 570, 170));

+            jScrollPane.setBounds(new java.awt.Rectangle(30, 100, 642, 170));

             jScrollPane.setViewportView(getJTablePackage());

         }

         return jScrollPane;