Fixed grammar in text messages.

[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / far / createui / CreateStepFour.java

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..3d3fdde2e910e5e837ee7e38cdb4c910a63b5bdc 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,15 +26,16 @@ import javax.swing.JLabel;
 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
+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.ui.IDialog;\r
 import org.tianocore.frameworkwizard.far.AggregationOperation;\r
 import org.tianocore.frameworkwizard.far.Far;\r
+import org.tianocore.frameworkwizard.far.FarStringDefinition;\r
 import org.tianocore.frameworkwizard.far.PackageQuery;\r
 import org.tianocore.frameworkwizard.far.PackageQueryInterface;\r
 import org.tianocore.frameworkwizard.packaging.PackageIdentification;\r
@@ -66,7 +67,7 @@ public class CreateStepFour extends IDialog implements MouseListener {
 \r
     private JButton jButtonPrevious = null;\r
 \r
-    private PartialTableModel model = null;\r
+    private IDefaultTableModel model = null;\r
 \r
     private CreateStepThree stepThree = null;\r
 \r
@@ -99,7 +100,7 @@ public class CreateStepFour extends IDialog implements MouseListener {
     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
@@ -112,7 +113,7 @@ public class CreateStepFour extends IDialog implements MouseListener {
     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
@@ -173,6 +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
         }\r
         return jButtonPrevious;\r
     }\r
@@ -193,7 +195,7 @@ public class CreateStepFour extends IDialog implements MouseListener {
     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(FarStringDefinition.CREATE_STEP_FOUR_TITLE);\r
         this.centerWindow();\r
     }\r
 \r
@@ -205,11 +207,11 @@ public class CreateStepFour extends IDialog implements MouseListener {
     private JPanel getJContentPane() {\r
         if (jContentPane == null) {\r
             jLabel2 = new JLabel();\r
-            jLabel2.setBounds(new java.awt.Rectangle(30, 70, 220, 18));\r
-            jLabel2.setText("Select File to Save:  ");\r
+            jLabel2.setBounds(new java.awt.Rectangle(30,70,111,18));\r
+            jLabel2.setText("File to Save:  ");\r
             jLabel = new JLabel();\r
-            jLabel.setBounds(new java.awt.Rectangle(30, 64, 320, 20));\r
-            jLabel.setText("This FAR will depend on following packages: ");\r
+            jLabel.setBounds(new java.awt.Rectangle(29,108,320,20));\r
+            jLabel.setText("This FAR will depend on the following packages: ");\r
             jLabel.setVisible(false);\r
             jContentPane = new JPanel();\r
             jContentPane.setLayout(null);\r
@@ -235,7 +237,7 @@ public class CreateStepFour extends IDialog implements MouseListener {
             // Guid Check, File Check etc.\r
             //\r
             if (this.jTextFieldSaveToFile.getText() == null) {\r
-                Log.err("Please input the Far name!");\r
+                Log.wrn("Create far", "Please input the Far name!");\r
             }\r
             try {\r
                 //\r
@@ -249,7 +251,8 @@ public class CreateStepFour extends IDialog implements MouseListener {
                                                                                                   .getFileFilter(),\r
                              this.getPreviousStep().getPreviousStep().getPreviousStep().getFarHeader());\r
             } catch (Exception exp) {\r
-                Log.err("Create error! ");\r
+                Log.wrn("Create far", exp.getMessage());\r
+                Log.err("Create far", exp.getMessage());\r
                 return;\r
             }\r
             getPreviousStep().getPreviousStep().getPreviousStep().returnType = DataType.RETURN_TYPE_OK;\r
@@ -258,8 +261,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
             stepThree.setVisible(true);\r
+            this.setVisible(false);\r
         } else if (e.getSource() == jButtonBrowser) {\r
             JFileChooser fc = new JFileChooser();\r
             fc.setAcceptAllFileFilterUsed(false);\r
@@ -352,16 +355,3 @@ public class CreateStepFour extends IDialog implements MouseListener {
     }\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