Fixed grammar in text messages.

[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / far / updateui / UpdateStepOne.java

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 755dbf33690dbeb48afd4c10e82934ae3ab41fed..5ae496672a17b9eccfff2649f806866306081062 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
@@ -19,6 +19,7 @@ import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;\r
 import java.io.File;\r
 import java.util.Vector;\r
+import java.util.jar.JarFile;\r
 \r
 import javax.swing.JFileChooser;\r
 import javax.swing.JPanel;\r
@@ -35,6 +36,7 @@ import org.tianocore.frameworkwizard.common.ui.IDialog;
 import org.tianocore.frameworkwizard.common.ui.IFrame;\r
 import org.tianocore.frameworkwizard.far.Far;\r
 import org.tianocore.frameworkwizard.far.FarIdentification;\r
+import org.tianocore.frameworkwizard.far.FarStringDefinition;\r
 import org.tianocore.frameworkwizard.workspace.Workspace;\r
 import org.tianocore.frameworkwizard.workspace.WorkspaceTools;\r
 \r
@@ -133,7 +135,7 @@ public class UpdateStepOne extends IDialog implements MouseListener {
     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
@@ -146,7 +148,7 @@ public class UpdateStepOne extends IDialog implements MouseListener {
     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
@@ -161,7 +163,7 @@ public class UpdateStepOne extends IDialog implements MouseListener {
     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
@@ -178,6 +180,7 @@ public class UpdateStepOne extends IDialog implements MouseListener {
             WorkspaceTools wt = new WorkspaceTools();\r
             farVector = wt.getAllFars();\r
             jListFarFromDb.setListData(farVector);\r
+            jListFarFromDb.setSelectionMode(0);\r
         }\r
         return jListFarFromDb;\r
     }\r
@@ -198,7 +201,7 @@ public class UpdateStepOne extends IDialog implements MouseListener {
     private void initialize() {\r
         this.setSize(700, 400);\r
         this.setContentPane(getJContentPane());\r
-        this.setTitle("Update Framework Archive(FAR) - Step 1: Choose FAR File");\r
+        this.setTitle(FarStringDefinition.UPDATE_STEP_ONE_TITLE);\r
         Dimension d = Toolkit.getDefaultToolkit().getScreenSize();\r
         this.setLocation((d.width - this.getSize().width) / 2, (d.height - this.getSize().height) / 2);\r
     }\r
@@ -211,10 +214,10 @@ public class UpdateStepOne extends IDialog implements MouseListener {
     private JPanel getJContentPane() {\r
         if (jContentPane == null) {\r
             jLabel1 = new JLabel();\r
-            jLabel1.setBounds(new java.awt.Rectangle(30, 138, 355, 18));\r
-            jLabel1.setText("Choose FAR from current framework database");\r
+            jLabel1.setBounds(new java.awt.Rectangle(30, 110, 355, 18));\r
+            jLabel1.setText("Choose FAR from current WORKSPACE.");\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
@@ -239,19 +242,26 @@ public class UpdateStepOne extends IDialog implements MouseListener {
             //\r
             farFile = new File(jTextFieldFarFile.getText());\r
             if (!farFile.exists() || !farFile.isFile()) {\r
-                Log.err("Please choose a FAR file already exists. ");\r
+                Log.wrn("Update far", "Please choose a FAR file that already exists.");\r
                 return;\r
             }\r
 \r
             //\r
             // Judge FAR is valid\r
             //\r
+            try {\r
+                JarFile file = new JarFile(farFile);\r
+                this.far = new Far(file);\r
+            } catch (Exception ex) {\r
+                Log.wrn("Update far", ex.getMessage());\r
+                Log.err("Update far", ex.getMessage());\r
+            }\r
 \r
             //\r
             // Add more logic process here\r
             //\r
             if (jListFarFromDb.getSelectedValue() == null) {\r
-                Log.err("Please choose a FAR from framework database. ");\r
+                Log.wrn("Update far", "Please choose a FAR from current WORKSPACE.");\r
                 return;\r
             }\r
 \r
@@ -267,7 +277,7 @@ public class UpdateStepOne extends IDialog implements MouseListener {
             fc.addChoosableFileFilter(new IFileFilter(DataType.FAR_SURFACE_AREA_EXT));\r
             fc.setCurrentDirectory(new File(Workspace.getCurrentWorkspace()));\r
 \r
-            int result = fc.showSaveDialog(new JPanel());\r
+            int result = fc.showOpenDialog(new JPanel());\r
             if (result == JFileChooser.APPROVE_OPTION) {\r
                 this.jTextFieldFarFile.setText(Tools.addPathExt(fc.getSelectedFile().getPath(),\r
                                                                 DataType.RETURN_TYPE_FAR_SURFACE_AREA));\r