1. Adjust UI for far operations

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

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 55475431a15abfd47ef72b7d3b98d1e65e9651c7..2ce541a27623e084288ad47a89a36eeee4d7e680 100644 (file)
--- 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;\r
 import javax.swing.JTextArea;\r
 import javax.swing.JTextField;\r
 import javax.swing.JPanel;\r
 import javax.swing.JTextArea;\r
 import javax.swing.JTextField;\r

-import javax.swing.table.DefaultTableModel;\r

 \r
 import org.tianocore.frameworkwizard.common.DataType;\r
 \r
 import org.tianocore.frameworkwizard.common.DataType;\r

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

 import org.tianocore.frameworkwizard.common.IFileFilter;\r
 import org.tianocore.frameworkwizard.common.Log;\r
 import org.tianocore.frameworkwizard.common.Tools;\r
 import org.tianocore.frameworkwizard.common.IFileFilter;\r
 import org.tianocore.frameworkwizard.common.Log;\r
 import org.tianocore.frameworkwizard.common.Tools;\r


@@ -66,7 +66,7 @@ public class CreateStepFour extends IDialog implements MouseListener {
 \r
     private JButton jButtonPrevious = null;\r
 \r
 \r
     private JButton jButtonPrevious = null;\r
 \r

-    private PartialTableModel model = null;\r
+    private IDefaultTableModel model = null;\r

 \r
     private CreateStepThree stepThree = null;\r
 \r
 \r
     private CreateStepThree stepThree = null;\r
 \r


@@ -99,7 +99,7 @@ public class CreateStepFour extends IDialog implements MouseListener {
     private JTextField getJTextField1() {\r
         if (jTextFieldSaveToFile == null) {\r
             jTextFieldSaveToFile = new JTextField();\r
     private JTextField getJTextField1() {\r
         if (jTextFieldSaveToFile == null) {\r
             jTextFieldSaveToFile = new JTextField();\r

-            jTextFieldSaveToFile.setBounds(new java.awt.Rectangle(139, 70, 400, 20));\r
+            jTextFieldSaveToFile.setBounds(new java.awt.Rectangle(147,70,412,20));\r

         }\r
         return jTextFieldSaveToFile;\r
     }\r
         }\r
         return jTextFieldSaveToFile;\r
     }\r


@@ -112,7 +112,7 @@ public class CreateStepFour extends IDialog implements MouseListener {
     private JButton getJButtonBrower() {\r
         if (jButtonBrowser == null) {\r
             jButtonBrowser = new JButton();\r
     private JButton getJButtonBrower() {\r
         if (jButtonBrowser == null) {\r
             jButtonBrowser = new JButton();\r

-            jButtonBrowser.setBounds(new java.awt.Rectangle(542, 70, 97, 20));\r
+            jButtonBrowser.setBounds(new java.awt.Rectangle(570, 70, 100, 20));\r

             jButtonBrowser.setText("Browser...");\r
             jButtonBrowser.addMouseListener(this);\r
         }\r
             jButtonBrowser.setText("Browser...");\r
             jButtonBrowser.addMouseListener(this);\r
         }\r


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

+            jButtonPrevious.setVisible(false);\r

         }\r
         return jButtonPrevious;\r
     }\r
         }\r
         return jButtonPrevious;\r
     }\r


@@ -193,7 +194,7 @@ public class CreateStepFour extends IDialog implements MouseListener {
     private void initialize() {\r
         this.setSize(700, 400);\r
         this.setContentPane(getJContentPane());\r
     private void initialize() {\r
         this.setSize(700, 400);\r
         this.setContentPane(getJContentPane());\r

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

         this.centerWindow();\r
     }\r
 \r
         this.centerWindow();\r
     }\r
 \r


@@ -205,10 +206,10 @@ public class CreateStepFour extends IDialog implements MouseListener {
     private JPanel getJContentPane() {\r
         if (jContentPane == null) {\r
             jLabel2 = new JLabel();\r
     private JPanel getJContentPane() {\r
         if (jContentPane == null) {\r
             jLabel2 = new JLabel();\r

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

             jLabel2.setText("Select File to Save:  ");\r
             jLabel = new JLabel();\r
             jLabel2.setText("Select File to Save:  ");\r
             jLabel = new JLabel();\r

-            jLabel.setBounds(new java.awt.Rectangle(30, 64, 320, 20));\r
+            jLabel.setBounds(new java.awt.Rectangle(29,108,320,20));\r

             jLabel.setText("This FAR will depend on following packages: ");\r
             jLabel.setVisible(false);\r
             jContentPane = new JPanel();\r
             jLabel.setText("This FAR will depend on following packages: ");\r
             jLabel.setVisible(false);\r
             jContentPane = new JPanel();\r


@@ -258,8 +259,8 @@ public class CreateStepFour extends IDialog implements MouseListener {
             this.setVisible(false);\r
             this.dispose();\r
         } else if (e.getSource() == jButtonPrevious) {\r
             this.setVisible(false);\r
             this.dispose();\r
         } else if (e.getSource() == jButtonPrevious) {\r

-            this.setVisible(false);\r

             stepThree.setVisible(true);\r
             stepThree.setVisible(true);\r

+            this.setVisible(false);\r

         } else if (e.getSource() == jButtonBrowser) {\r
             JFileChooser fc = new JFileChooser();\r
             fc.setAcceptAllFileFilterUsed(false);\r
         } else if (e.getSource() == jButtonBrowser) {\r
             JFileChooser fc = new JFileChooser();\r
             fc.setAcceptAllFileFilterUsed(false);\r


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

-class PartialTableModel extends DefaultTableModel {\r
-    /**\r
-     * \r
-     */\r
-    private static final long serialVersionUID = 1L;\r
-\r
-    public boolean isCellEditable(int row, int col) {\r
-        switch (col) {\r
-        default:\r
-            return false;\r
-        }\r
-    }\r
-}\r

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 6e11a5a455db1a1f291833bd7a96ad47ea0c276b..54baaeb102260a06c51c065c6b44f7cf9d731f5f 100644 (file)
--- 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() {\r
         if (jTextFieldBaseName == null) {\r
             jTextFieldBaseName = new JTextField();\r
     private JTextField getJTextFieldBaseName() {\r
         if (jTextFieldBaseName == null) {\r
             jTextFieldBaseName = new JTextField();\r

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

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


@@ -137,7 +137,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
     private JTextField getJTextFieldGuid() {\r
         if (jTextFieldGuid == null) {\r
             jTextFieldGuid = new JTextField();\r
     private JTextField getJTextFieldGuid() {\r
         if (jTextFieldGuid == null) {\r
             jTextFieldGuid = new JTextField();\r

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

             jTextFieldGuid.setToolTipText("Guaranteed Unique Identification Number (8-4-4-4-12)");\r
         }\r
         return jTextFieldGuid;\r
             jTextFieldGuid.setToolTipText("Guaranteed Unique Identification Number (8-4-4-4-12)");\r
         }\r
         return jTextFieldGuid;\r


@@ -152,7 +152,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
     private JTextField getJTextFieldVersion() {\r
         if (jTextFieldVersion == null) {\r
             jTextFieldVersion = new JTextField();\r
     private JTextField getJTextFieldVersion() {\r
         if (jTextFieldVersion == null) {\r
             jTextFieldVersion = new JTextField();\r

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

             jTextFieldVersion.setToolTipText("A Version Number, 1.0, 1, 1.01");\r
         }\r
         return jTextFieldVersion;\r
             jTextFieldVersion.setToolTipText("A Version Number, 1.0, 1, 1.01");\r
         }\r
         return jTextFieldVersion;\r


@@ -167,7 +167,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
     private JButton getJButtonGenerateGuid() {\r
         if (jButtonGenerateGuid == null) {\r
             jButtonGenerateGuid = new JButton();\r
     private JButton getJButtonGenerateGuid() {\r
         if (jButtonGenerateGuid == null) {\r
             jButtonGenerateGuid = new JButton();\r

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

             jButtonGenerateGuid.setText("Generate");\r
             jButtonGenerateGuid.addMouseListener(this);\r
         }\r
             jButtonGenerateGuid.setText("Generate");\r
             jButtonGenerateGuid.addMouseListener(this);\r
         }\r


@@ -215,7 +215,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
         if (jTextFieldSpecification == null) {\r
             jTextFieldSpecification = new JTextField();\r
             jTextFieldSpecification.setText("FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052");\r
         if (jTextFieldSpecification == null) {\r
             jTextFieldSpecification = new JTextField();\r
             jTextFieldSpecification.setText("FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052");\r

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

             jTextFieldSpecification.setEditable(false);\r
         }\r
         return jTextFieldSpecification;\r
             jTextFieldSpecification.setEditable(false);\r
         }\r
         return jTextFieldSpecification;\r


@@ -231,7 +231,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
         if (jScrollPaneLicense == null) {\r
             jScrollPaneLicense = new JScrollPane();\r
             jScrollPaneLicense.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);\r
         if (jScrollPaneLicense == null) {\r
             jScrollPaneLicense = new JScrollPane();\r
             jScrollPaneLicense.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);\r

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

             jScrollPaneLicense.setViewportView(getJTextAreaLicense());\r
         }\r
         return jScrollPaneLicense;\r
             jScrollPaneLicense.setViewportView(getJTextAreaLicense());\r
         }\r
         return jScrollPaneLicense;\r


@@ -247,7 +247,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
         if (jScrollPaneDescription == null) {\r
             jScrollPaneDescription = new JScrollPane();\r
             jScrollPaneDescription.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);\r
         if (jScrollPaneDescription == null) {\r
             jScrollPaneDescription = new JScrollPane();\r
             jScrollPaneDescription.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);\r

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

             jScrollPaneDescription.setViewportView(getJTextAreaDescription());\r
         }\r
         return jScrollPaneDescription;\r
             jScrollPaneDescription.setViewportView(getJTextAreaDescription());\r
         }\r
         return jScrollPaneDescription;\r


@@ -262,7 +262,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
     private JTextField getJTextFieldAbstract() {\r
         if (jTextFieldAbstract == null) {\r
             jTextFieldAbstract = new JTextField();\r
     private JTextField getJTextFieldAbstract() {\r
         if (jTextFieldAbstract == null) {\r
             jTextFieldAbstract = new JTextField();\r

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

             jTextFieldAbstract.setToolTipText("A one sentence description of this module");\r
         }\r
         return jTextFieldAbstract;\r
             jTextFieldAbstract.setToolTipText("A one sentence description of this module");\r
         }\r
         return jTextFieldAbstract;\r


@@ -277,7 +277,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
     private JTextField getJTextFieldCopyright() {\r
         if (jTextFieldCopyright == null) {\r
             jTextFieldCopyright = new JTextField();\r
     private JTextField getJTextFieldCopyright() {\r
         if (jTextFieldCopyright == null) {\r
             jTextFieldCopyright = new JTextField();\r

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

             jTextFieldCopyright.setToolTipText("One or more copyright lines");\r
         }\r
         return jTextFieldCopyright;\r
             jTextFieldCopyright.setToolTipText("One or more copyright lines");\r
         }\r
         return jTextFieldCopyright;\r


@@ -291,7 +291,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
     private JTextField getJTextFieldURL() {\r
         if (jTextFieldURL == null) {\r
             jTextFieldURL = new JTextField();\r
     private JTextField getJTextFieldURL() {\r
         if (jTextFieldURL == null) {\r
             jTextFieldURL = new JTextField();\r

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

             jTextFieldURL.setToolTipText("A URL for the latest version of the license");\r
         }\r
         return jTextFieldURL;\r
             jTextFieldURL.setToolTipText("A URL for the latest version of the license");\r
         }\r
         return jTextFieldURL;\r


@@ -318,7 +318,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
     private JButton getJButtonCancel() {\r
         if (jButtonCancel == null) {\r
             jButtonCancel = new JButton();\r
     private JButton getJButtonCancel() {\r
         if (jButtonCancel == null) {\r
             jButtonCancel = new JButton();\r

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

             jButtonCancel.setText("Cancel");\r
             jButtonCancel.addMouseListener(this);\r
         }\r
             jButtonCancel.setText("Cancel");\r
             jButtonCancel.addMouseListener(this);\r
         }\r


@@ -333,7 +333,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
     private JButton getJButtonNext() {\r
         if (jButtonNext == null) {\r
             jButtonNext = new JButton();\r
     private JButton getJButtonNext() {\r
         if (jButtonNext == null) {\r
             jButtonNext = new JButton();\r

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

             jButtonNext.setText("Next");\r
             jButtonNext.addMouseListener(this);\r
         }\r
             jButtonNext.setText("Next");\r
             jButtonNext.addMouseListener(this);\r
         }\r


@@ -398,31 +398,31 @@ public class CreateStepOne extends IDialog implements MouseListener {
 \r
             jLabelURL = new JLabel();\r
             jLabelURL.setText("License URL");\r
 \r
             jLabelURL = new JLabel();\r
             jLabelURL.setText("License URL");\r

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

             jLabelBaseName = new JLabel();\r
             jLabelBaseName.setText("FAR Name");\r
             jLabelBaseName = new JLabel();\r
             jLabelBaseName.setText("FAR Name");\r

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

             jLabelGuid = new JLabel();\r
             jLabelGuid.setText("Guid Value");\r
             jLabelGuid = new JLabel();\r
             jLabelGuid.setText("Guid Value");\r

-            jLabelGuid.setBounds(new java.awt.Rectangle(35, 35, 140, 20));\r
+            jLabelGuid.setBounds(new java.awt.Rectangle(35, 35, 120, 20));\r

             jLabelVersion = new JLabel();\r
             jLabelVersion.setText("Version");\r
             jLabelVersion = new JLabel();\r
             jLabelVersion.setText("Version");\r

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

             jLabelAbstract = new JLabel();\r
             jLabelAbstract.setText("Abstract");\r
             jLabelAbstract = new JLabel();\r
             jLabelAbstract.setText("Abstract");\r

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

             jLabelDescription = new JLabel();\r
             jLabelDescription.setText("Description");\r
             jLabelDescription = new JLabel();\r
             jLabelDescription.setText("Description");\r

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

             jLabelCopyright = new JLabel();\r
             jLabelCopyright.setText("Copyright");\r
             jLabelCopyright = new JLabel();\r
             jLabelCopyright.setText("Copyright");\r

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

             jLabelLicense = new JLabel();\r
             jLabelLicense.setText("License");\r
             jLabelLicense = new JLabel();\r
             jLabelLicense.setText("License");\r

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

             jLabelSpecification = new JLabel();\r
             jLabelSpecification.setText("Specification");\r
             jLabelSpecification = new JLabel();\r
             jLabelSpecification.setText("Specification");\r

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

 \r
             jContentPane = new JPanel();\r
             jContentPane.setLayout(null);\r
 \r
             jContentPane = new JPanel();\r
             jContentPane.setLayout(null);\r

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 fd7def76e8411fd49401b90b46361205b8bc557f..53a6f6f519fbd655bcb537a9111c0c9bd0c17794 100644 (file)
--- 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() {\r
         if (jScrollPane == null) {\r
             jScrollPane = new JScrollPane();\r
     private JScrollPane getJScrollPane() {\r
         if (jScrollPane == null) {\r
             jScrollPane = new JScrollPane();\r

-            jScrollPane.setBounds(new java.awt.Rectangle(139, 85, 500, 130));\r
+            jScrollPane.setBounds(new java.awt.Rectangle(30, 85, 640, 130));\r

             jScrollPane.setViewportView(getJComboBoxFileFilter());\r
         }\r
         return jScrollPane;\r
             jScrollPane.setViewportView(getJComboBoxFileFilter());\r
         }\r
         return jScrollPane;\r


@@ -167,7 +167,7 @@ public class CreateStepThree extends IDialog implements MouseListener {
     private JTextField getJTextField() {\r
         if (jTextField == null) {\r
             jTextField = new JTextField();\r
     private JTextField getJTextField() {\r
         if (jTextField == null) {\r
             jTextField = new JTextField();\r

-            jTextField.setBounds(new java.awt.Rectangle(139, 250, 500, 20));\r
+            jTextField.setBounds(new java.awt.Rectangle(30, 250, 640, 20));\r

         }\r
         return jTextField;\r
     }\r
         }\r
         return jTextField;\r
     }\r

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 c1d1d3a1ae51275e2ff48287f2aff42c4c53f3c4..5763963e049dcf6fb30dabad1762839b766bd30e 100644 (file)
--- 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() {\r
         if (jScrollPanePackage == null) {\r
             jScrollPanePackage = new JScrollPane();\r
     private JScrollPane getJScrollPanePackage() {\r
         if (jScrollPanePackage == null) {\r
             jScrollPanePackage = new JScrollPane();\r

-            jScrollPanePackage.setBounds(new java.awt.Rectangle(139, 64, 500, 130));\r
+            jScrollPanePackage.setBounds(new java.awt.Rectangle(140,65,535,130));\r

             jScrollPanePackage.setViewportView(getJComboBoxPackage());\r
         }\r
         return jScrollPanePackage;\r
             jScrollPanePackage.setViewportView(getJComboBoxPackage());\r
         }\r
         return jScrollPanePackage;\r


@@ -187,7 +187,7 @@ public class CreateStepTwo extends IDialog implements MouseListener {
     private JScrollPane getJScrollPanePlatform() {\r
         if (jScrollPanePlatform == null) {\r
             jScrollPanePlatform = new JScrollPane();\r
     private JScrollPane getJScrollPanePlatform() {\r
         if (jScrollPanePlatform == null) {\r
             jScrollPanePlatform = new JScrollPane();\r

-            jScrollPanePlatform.setBounds(new java.awt.Rectangle(139, 200, 500, 100));\r
+            jScrollPanePlatform.setBounds(new java.awt.Rectangle(140,200,535,110));\r

             jScrollPanePlatform.setViewportView(getJComboBoxPlatform());\r
         }\r
         return jScrollPanePlatform;\r
             jScrollPanePlatform.setViewportView(getJComboBoxPlatform());\r
         }\r
         return jScrollPanePlatform;\r

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 ecb71c3a0ed101869f3160b45b30a84d613072ca..f861eeed064094c20634570fe8cbb0ae2b0a1696 100644 (file)
--- 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 @@
 \r
 package org.tianocore.frameworkwizard.far.deleteui;\r
 \r
 \r
 package org.tianocore.frameworkwizard.far.deleteui;\r
 \r

+import java.awt.Color;\r
+import java.awt.Dimension;\r
+import java.awt.Toolkit;\r
+import java.awt.event.ActionEvent;\r
+import java.util.Iterator;\r
+import java.util.List;\r
+import java.util.Vector;\r
+\r

 import javax.swing.ImageIcon;\r
 import javax.swing.ImageIcon;\r

-import javax.swing.JPanel;\r

 import javax.swing.JButton;\r
 import javax.swing.JButton;\r

-import javax.swing.JTextArea;\r

 import javax.swing.JLabel;\r
 import javax.swing.JLabel;\r

+import javax.swing.JList;\r
+import javax.swing.JPanel;\r

 import javax.swing.JScrollPane;\r
 import javax.swing.JScrollPane;\r

+import javax.swing.JTextArea;\r
+import javax.swing.event.ListSelectionEvent;\r
+import javax.swing.event.ListSelectionListener;\r

 \r
 import org.tianocore.frameworkwizard.common.ui.IDialog;\r
 import org.tianocore.frameworkwizard.common.ui.IFrame;\r
 \r
 import org.tianocore.frameworkwizard.common.ui.IDialog;\r
 import org.tianocore.frameworkwizard.common.ui.IFrame;\r


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

-import java.awt.Color;\r
-import java.awt.Dimension;\r
-import java.awt.Toolkit;\r
-import java.awt.event.MouseEvent;\r
-import java.awt.event.MouseListener;\r
-import java.util.Iterator;\r
-import java.util.List;\r
-import java.util.Vector;\r
-\r
-import javax.swing.JList;\r
-import javax.swing.event.ListSelectionEvent;\r
-import javax.swing.event.ListSelectionListener;\r
-\r
-public class DeleteStepOne extends IDialog implements ListSelectionListener, MouseListener {\r
+public class DeleteStepOne extends IDialog implements ListSelectionListener {\r

 \r
     /**\r
      * \r
 \r
     /**\r
      * \r


@@ -100,7 +98,7 @@ public class DeleteStepOne extends IDialog implements ListSelectionListener, Mou
             jButtonCancel = new JButton();\r
             jButtonCancel.setBounds(new java.awt.Rectangle(570, 330, 90, 20));\r
             jButtonCancel.setText("Cancel");\r
             jButtonCancel = new JButton();\r
             jButtonCancel.setBounds(new java.awt.Rectangle(570, 330, 90, 20));\r
             jButtonCancel.setText("Cancel");\r

-            jButtonCancel.addMouseListener(this);\r
+            jButtonCancel.addActionListener(this);\r

         }\r
         return jButtonCancel;\r
     }\r
         }\r
         return jButtonCancel;\r
     }\r


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

+            jButtonNext.addActionListener(this);\r

         }\r
         return jButtonNext;\r
     }\r
         }\r
         return jButtonNext;\r
     }\r


@@ -147,7 +146,7 @@ public class DeleteStepOne extends IDialog implements ListSelectionListener, Mou
     private JScrollPane getJScrollPane() {\r
         if (jScrollPane == null) {\r
             jScrollPane = new JScrollPane();\r
     private JScrollPane getJScrollPane() {\r
         if (jScrollPane == null) {\r
             jScrollPane = new JScrollPane();\r

-            jScrollPane.setBounds(new java.awt.Rectangle(139, 64, 500, 104));\r
+            jScrollPane.setBounds(new java.awt.Rectangle(140, 65, 530, 100));\r

             jScrollPane.setViewportView(getJListFar());\r
         }\r
         return jScrollPane;\r
             jScrollPane.setViewportView(getJListFar());\r
         }\r
         return jScrollPane;\r


@@ -161,7 +160,7 @@ public class DeleteStepOne extends IDialog implements ListSelectionListener, Mou
     private JScrollPane getJScrollPane1() {\r
         if (jScrollPane1 == null) {\r
             jScrollPane1 = new JScrollPane();\r
     private JScrollPane getJScrollPane1() {\r
         if (jScrollPane1 == null) {\r
             jScrollPane1 = new JScrollPane();\r

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

             jScrollPane1.setViewportView(getJListPackage());\r
         }\r
         return jScrollPane1;\r
             jScrollPane1.setViewportView(getJListPackage());\r
         }\r
         return jScrollPane1;\r


@@ -175,7 +174,7 @@ public class DeleteStepOne extends IDialog implements ListSelectionListener, Mou
     private JScrollPane getJScrollPane2() {\r
         if (jScrollPane2 == null) {\r
             jScrollPane2 = new JScrollPane();\r
     private JScrollPane getJScrollPane2() {\r
         if (jScrollPane2 == null) {\r
             jScrollPane2 = new JScrollPane();\r

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

             jScrollPane2.setViewportView(getJListPlatform());\r
         }\r
         return jScrollPane2;\r
             jScrollPane2.setViewportView(getJListPlatform());\r
         }\r
         return jScrollPane2;\r


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

-            jButtonDetail.addMouseListener(this);\r

         }\r
         return jButtonDetail;\r
     }\r
         }\r
         return jButtonDetail;\r
     }\r


@@ -275,10 +273,10 @@ public class DeleteStepOne extends IDialog implements ListSelectionListener, Mou
             jLabel3.setBounds(new java.awt.Rectangle(360, 170, 113, 20));\r
             jLabel3.setText("FAR's Platforms");\r
             jLabel2 = new JLabel();\r
             jLabel3.setBounds(new java.awt.Rectangle(360, 170, 113, 20));\r
             jLabel3.setText("FAR's Platforms");\r
             jLabel2 = new JLabel();\r

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

             jLabel2.setText("FAR's Packages");\r
             jLabel = new JLabel();\r
             jLabel2.setText("FAR's Packages");\r
             jLabel = new JLabel();\r

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

             jLabel.setText("Select one FAR: ");\r
             jContentPane = new JPanel();\r
             jContentPane.setLayout(null);\r
             jLabel.setText("Select one FAR: ");\r
             jContentPane = new JPanel();\r
             jContentPane.setLayout(null);\r


@@ -342,18 +340,16 @@ public class DeleteStepOne extends IDialog implements ListSelectionListener, Mou
                 jLabel4.setText("Without any remain packages depend on this FAR. ");\r
                 jButtonDetail.setVisible(false);\r
                 jButtonNext.setEnabled(true);\r
                 jLabel4.setText("Without any remain packages depend on this FAR. ");\r
                 jButtonDetail.setVisible(false);\r
                 jButtonNext.setEnabled(true);\r

-                jButtonNext.addMouseListener(this);\r

             } else {\r
                 jLabelImage.setIcon(new ImageIcon(getClass().getResource("/resources/images/No.JPG")));\r
                 jLabel4.setText("Some remain packages still depend on this FAR. ");\r
                 //        jButtonDetail.setVisible(true);\r
                 jButtonNext.setEnabled(false);\r
             } else {\r
                 jLabelImage.setIcon(new ImageIcon(getClass().getResource("/resources/images/No.JPG")));\r
                 jLabel4.setText("Some remain packages still depend on this FAR. ");\r
                 //        jButtonDetail.setVisible(true);\r
                 jButtonNext.setEnabled(false);\r

-                jButtonNext.removeMouseListener(this);\r

             }\r
         }\r
     }\r
             }\r
         }\r
     }\r

-\r
-    public void mouseClicked(MouseEvent e) {\r
+    \r
+    public void actionPerformed(ActionEvent e) {\r

         if (e.getSource() == jButtonCancel) {\r
             this.setVisible(false);\r
         } else if (e.getSource() == jButtonNext) {\r
         if (e.getSource() == jButtonCancel) {\r
             this.setVisible(false);\r
         } else if (e.getSource() == jButtonNext) {\r


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

-    }\r
-\r
-    public void mousePressed(MouseEvent e) {\r
-        // TODO Auto-generated method stub\r
-\r
-    }\r
-\r
-    public void mouseReleased(MouseEvent e) {\r
-        // TODO Auto-generated method stub\r
-\r
-    }\r
-\r
-    public void mouseEntered(MouseEvent e) {\r
-        // TODO Auto-generated method stub\r
-\r
-    }\r
-\r
-    public void mouseExited(MouseEvent e) {\r
-        // TODO Auto-generated method stub\r

 \r
     }\r
 \r
 \r
     }\r
 \r

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 17a565d858e3ed995edc0d0a1141a47b92986cbf..012d23bb6c03fc4b664b0c9ccf3c88df325201d0 100644 (file)
--- 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() {\r
         if (jRadioButton == null) {\r
             jRadioButton = new JRadioButton();\r
     private JRadioButton getJRadioButton() {\r
         if (jRadioButton == null) {\r
             jRadioButton = new JRadioButton();\r

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

             jRadioButton.setSelected(true);\r
             jRadioButton.setText("Mode 1: Only remove from framework database");\r
         }\r
             jRadioButton.setSelected(true);\r
             jRadioButton.setText("Mode 1: Only remove from framework database");\r
         }\r


@@ -152,7 +152,7 @@ public class DeleteStepTwo extends IDialog implements MouseListener {
     private JRadioButton getJRadioButton1() {\r
         if (jRadioButton1 == null) {\r
             jRadioButton1 = new JRadioButton();\r
     private JRadioButton getJRadioButton1() {\r
         if (jRadioButton1 == null) {\r
             jRadioButton1 = new JRadioButton();\r

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

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

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 aa8afcd8a2181784f39d1ceb9eff08d8dd20d7f4..3c76c0fd18e0e3fa6ca8da447a7d458a9d2e94c4 100644 (file)
--- 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() {\r
         if (jTextFieldFarFile == null) {\r
             jTextFieldFarFile = new JTextField();\r
     private JTextField getJTextFieldFarFile() {\r
         if (jTextFieldFarFile == null) {\r
             jTextFieldFarFile = new JTextField();\r

-            jTextFieldFarFile.setBounds(new java.awt.Rectangle(139, 100, 400, 20));\r
+            jTextFieldFarFile.setBounds(new java.awt.Rectangle(140, 80, 423, 20));\r

         }\r
         return jTextFieldFarFile;\r
     }\r
         }\r
         return jTextFieldFarFile;\r
     }\r


@@ -144,7 +144,7 @@ public class InstallStepOne extends IDialog implements MouseListener {
     private JButton getJButtonBrowser() {\r
         if (jButtonBrowser == null) {\r
             jButtonBrowser = new JButton();\r
     private JButton getJButtonBrowser() {\r
         if (jButtonBrowser == null) {\r
             jButtonBrowser = new JButton();\r

-            jButtonBrowser.setBounds(new java.awt.Rectangle(542, 100, 97, 20));\r
+            jButtonBrowser.setBounds(new java.awt.Rectangle(570, 80, 100, 20));\r

             jButtonBrowser.setText("Browser...");\r
             jButtonBrowser.addMouseListener(this);\r
         }\r
             jButtonBrowser.setText("Browser...");\r
             jButtonBrowser.addMouseListener(this);\r
         }\r


@@ -159,7 +159,7 @@ public class InstallStepOne extends IDialog implements MouseListener {
     private JScrollPane getJScrollPane() {\r
         if (jScrollPane == null) {\r
             jScrollPane = new JScrollPane();\r
     private JScrollPane getJScrollPane() {\r
         if (jScrollPane == null) {\r
             jScrollPane = new JScrollPane();\r

-            jScrollPane.setBounds(new java.awt.Rectangle(27, 166, 511, 143));\r
+            jScrollPane.setBounds(new java.awt.Rectangle(30, 165, 642, 140));\r

             jScrollPane.setViewportView(getJTable());\r
         }\r
         jScrollPane.setVisible(false);\r
             jScrollPane.setViewportView(getJTable());\r
         }\r
         jScrollPane.setVisible(false);\r


@@ -233,11 +233,11 @@ public class InstallStepOne extends IDialog implements MouseListener {
     private JPanel getJContentPane() {\r
         if (jContentPane == null) {\r
             jLabelWarning = new JLabel();\r
     private JPanel getJContentPane() {\r
         if (jContentPane == null) {\r
             jLabelWarning = new JLabel();\r

-            jLabelWarning.setBounds(new java.awt.Rectangle(29, 134, 410, 20));\r
+            jLabelWarning.setBounds(new java.awt.Rectangle(30, 125, 410, 20));\r

             jLabelWarning.setText("Can't install this FAR, lack following packages in current workspace");\r
             jLabelWarning.setVisible(false);\r
             jLabel = new JLabel();\r
             jLabelWarning.setText("Can't install this FAR, lack following packages in current workspace");\r
             jLabelWarning.setVisible(false);\r
             jLabel = new JLabel();\r

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

             jLabel.setText("Choose FAR file: ");\r
             jContentPane = new JPanel();\r
             jContentPane.setLayout(null);\r
             jLabel.setText("Choose FAR file: ");\r
             jContentPane = new JPanel();\r
             jContentPane.setLayout(null);\r

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 33b407316c2f5c4f47fa4f6b8cffb41e05c5e57f..347824cc018205ce1409d7f2fdcfd5c0f37492a4 100644 (file)
--- 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() {\r
         if (jScrollPane == null) {\r
             jScrollPane = new JScrollPane();\r
     private JScrollPane getJScrollPane() {\r
         if (jScrollPane == null) {\r
             jScrollPane = new JScrollPane();\r

-            jScrollPane.setBounds(new java.awt.Rectangle(35, 81, 600, 113));\r
+            jScrollPane.setBounds(new java.awt.Rectangle(30, 80, 642, 110));\r

             jScrollPane.setViewportView(getJTablePackage());\r
         }\r
         return jScrollPane;\r
             jScrollPane.setViewportView(getJTablePackage());\r
         }\r
         return jScrollPane;\r


@@ -219,7 +219,7 @@ public class InstallStepTwo extends IDialog implements MouseListener {
     private JScrollPane getJScrollPane1() {\r
         if (jScrollPane1 == null) {\r
             jScrollPane1 = new JScrollPane();\r
     private JScrollPane getJScrollPane1() {\r
         if (jScrollPane1 == null) {\r
             jScrollPane1 = new JScrollPane();\r

-            jScrollPane1.setBounds(new java.awt.Rectangle(35, 214, 596, 112));\r
+            jScrollPane1.setBounds(new java.awt.Rectangle(30, 215, 642, 110));\r

             jScrollPane1.setViewportView(getJTablePlatform());\r
         }\r
         return jScrollPane1;\r
             jScrollPane1.setViewportView(getJTablePlatform());\r
         }\r
         return jScrollPane1;\r

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 f6864cb891340edf70c92dc5d52241b32046e7a8..afe0fbe9e8971ec8a08185540c835eff37bb2e32 100644 (file)
--- 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() {\r
         if (jTextFieldFarFile == null) {\r
             jTextFieldFarFile = new JTextField();\r
     private JTextField getJTextFieldFarFile() {\r
         if (jTextFieldFarFile == null) {\r
             jTextFieldFarFile = new JTextField();\r

-            jTextFieldFarFile.setBounds(new java.awt.Rectangle(130, 100, 400, 20));\r
+            jTextFieldFarFile.setBounds(new java.awt.Rectangle(130,80,436,20));\r

         }\r
         return jTextFieldFarFile;\r
     }\r
         }\r
         return jTextFieldFarFile;\r
     }\r


@@ -147,7 +147,7 @@ public class UpdateStepOne extends IDialog implements MouseListener {
     private JButton getJButtonBrowser() {\r
         if (jButtonBrowser == null) {\r
             jButtonBrowser = new JButton();\r
     private JButton getJButtonBrowser() {\r
         if (jButtonBrowser == null) {\r
             jButtonBrowser = new JButton();\r

-            jButtonBrowser.setBounds(new java.awt.Rectangle(542, 100, 97, 20));\r
+            jButtonBrowser.setBounds(new java.awt.Rectangle(570, 80, 100, 20));\r

             jButtonBrowser.setText("Browser...");\r
             jButtonBrowser.addMouseListener(this);\r
         }\r
             jButtonBrowser.setText("Browser...");\r
             jButtonBrowser.addMouseListener(this);\r
         }\r


@@ -162,7 +162,7 @@ public class UpdateStepOne extends IDialog implements MouseListener {
     private JScrollPane getJScrollPane() {\r
         if (jScrollPane == null) {\r
             jScrollPane = new JScrollPane();\r
     private JScrollPane getJScrollPane() {\r
         if (jScrollPane == null) {\r
             jScrollPane = new JScrollPane();\r

-            jScrollPane.setBounds(new java.awt.Rectangle(130, 164, 500, 160));\r
+            jScrollPane.setBounds(new java.awt.Rectangle(30, 135, 642, 160));\r

             jScrollPane.setViewportView(getJListFarFromDb());\r
         }\r
         return jScrollPane;\r
             jScrollPane.setViewportView(getJListFarFromDb());\r
         }\r
         return jScrollPane;\r


@@ -212,10 +212,10 @@ public class UpdateStepOne extends IDialog implements MouseListener {
     private JPanel getJContentPane() {\r
         if (jContentPane == null) {\r
             jLabel1 = new JLabel();\r
     private JPanel getJContentPane() {\r
         if (jContentPane == null) {\r
             jLabel1 = new JLabel();\r

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

             jLabel1.setText("Choose FAR from current framework database");\r
             jLabel = new JLabel();\r
             jLabel1.setText("Choose FAR from current framework database");\r
             jLabel = new JLabel();\r

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

             jLabel.setText("Choose FAR file: ");\r
             jContentPane = new JPanel();\r
             jContentPane.setLayout(null);\r
             jLabel.setText("Choose FAR file: ");\r
             jContentPane = new JPanel();\r
             jContentPane.setLayout(null);\r

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 f455604f6215d80c9249e741abe7e121f753f963..77c8d370ce00f7c73a5e3cd48ba3542e83b8093a 100644 (file)
--- 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() {\r
         if (jScrollPane == null) {\r
             jScrollPane = new JScrollPane();\r
     private JScrollPane getJScrollPane() {\r
         if (jScrollPane == null) {\r
             jScrollPane = new JScrollPane();\r

-            jScrollPane.setBounds(new java.awt.Rectangle(30, 98, 570, 170));\r
+            jScrollPane.setBounds(new java.awt.Rectangle(30, 100, 642, 170));\r

             jScrollPane.setViewportView(getJTablePackage());\r
         }\r
         return jScrollPane;\r
             jScrollPane.setViewportView(getJTablePackage());\r
         }\r
         return jScrollPane;\r