1. Fix EDKT215: [Wizard] "Previous" button is not supported in step 4 of Create FAR

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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepFour.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepFour.java
index 3d3fdde2e910e5e837ee7e38cdb4c910a63b5bdc..ab2ffd07eef1307845ccf2716ea7463ea71cc761 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepFour.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepFour.java
@@ -174,7 +174,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.setVisible(false);\r
+            jButtonPrevious.setVisible(true);\r
         }\r
         return jButtonPrevious;\r
     }\r
@@ -260,9 +260,6 @@ public class CreateStepFour extends IDialog implements MouseListener {
             getPreviousStep().dispose();\r
             this.setVisible(false);\r
             this.dispose();\r
-        } else if (e.getSource() == jButtonPrevious) {\r
-            stepThree.setVisible(true);\r
-            this.setVisible(false);\r
         } else if (e.getSource() == jButtonBrowser) {\r
             JFileChooser fc = new JFileChooser();\r
             fc.setAcceptAllFileFilterUsed(false);\r
@@ -274,6 +271,9 @@ public class CreateStepFour extends IDialog implements MouseListener {
                 this.jTextFieldSaveToFile.setText(Tools.addPathExt(fc.getSelectedFile().getPath(),\r
                                                                    DataType.RETURN_TYPE_FAR_SURFACE_AREA));\r
             }\r
+        } else if (e.getSource() == jButtonPrevious) {\r
+            this.setVisible(false);\r
+            stepThree.setVisible(true);\r
         }\r
     }\r
 \r
@@ -301,29 +301,6 @@ public class CreateStepFour extends IDialog implements MouseListener {
         return stepThree;\r
     }\r
 \r
-    /**\r
-     * This method initializes jTable  \r
-     *         \r
-     * @return javax.swing.JTable      \r
-     */\r
-    //  private JTable getJTable() {\r
-    //    if (jTable == null) {\r
-    //      jTable = new JTable();\r
-    //      model = new PartialTableModel();\r
-    //      jTable = new JTable(model);\r
-    //      jTable.setRowHeight(20);\r
-    //      jTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_SUBSEQUENT_COLUMNS);\r
-    //      model.addColumn("GUID");\r
-    //      model.addColumn("Version");\r
-    //      model.addColumn("Name");\r
-    //      \r
-    //      jTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
-    //    }\r
-    //    if (this.stepThree != null) {\r
-    //      prepareTable();\r
-    //    }\r
-    //    return jTable;\r
-    //  }\r
     public void prepareTable() {\r
         model.setRowCount(0);\r
 \r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepThree.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepThree.java
index 1e95cc35ffd0440848f0693f5e01f751f5b508bf..666082d3d4e74e0077f7009b773ab14327937f2e 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepThree.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepThree.java
@@ -237,11 +237,10 @@ public class CreateStepThree extends IDialog implements MouseListener {
 \r
             if (stepFour == null) {\r
                 stepFour = new CreateStepFour(this, true, this);\r
-                stepFour.setVisible(true);\r
-            } else {\r
-                stepFour.setVisible(true);\r
             }\r
+            \r
             this.setVisible(false);\r
+            stepFour.setVisible(true);\r
         } else if (e.getSource() == jButtonPrevious) {\r
             this.setVisible(false);\r
             stepTwo.setVisible(true);\r