1. Fix EDKT306 Output different error message for different condition in workspace...

[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / workspace / ui / SwitchWorkspace.java

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/ui/SwitchWorkspace.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/ui/SwitchWorkspace.java
index f81bfceeb1cbb3abe96166226a8c7ae14f86b1d5..e5f28c56c484b1c15e28e638a80c7e278d1409e6 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/ui/SwitchWorkspace.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/ui/SwitchWorkspace.java
@@ -2,11 +2,11 @@ package org.tianocore.frameworkwizard.workspace.ui;
 \r
 import java.awt.event.ActionEvent;\r
 \r
+import javax.swing.JButton;\r
 import javax.swing.JFileChooser;\r
-import javax.swing.JPanel;\r
 import javax.swing.JLabel;\r
+import javax.swing.JPanel;\r
 import javax.swing.JTextField;\r
-import javax.swing.JButton;\r
 \r
 import org.tianocore.frameworkwizard.common.DataType;\r
 import org.tianocore.frameworkwizard.common.Log;\r
@@ -51,7 +51,8 @@ public class SwitchWorkspace extends IDialog {
             jTextFieldOld = new JTextField();\r
             jTextFieldOld.setBounds(new java.awt.Rectangle(140, 10, 320, 20));\r
             jTextFieldOld.setEditable(false);\r
-            jTextFieldOld.setText(Workspace.getCurrentWorkspace());\r
+            jTextFieldOld.setText(Workspace.getCurrentWorkspace() == null ? "Not Defined"\r
+                                                                         : Workspace.getCurrentWorkspace());\r
         }\r
         return jTextFieldOld;\r
     }\r
@@ -114,16 +115,6 @@ public class SwitchWorkspace extends IDialog {
         return jButtonBrowse;\r
     }\r
 \r
-    /**\r
-     \r
-     @param args\r
-     \r
-     **/\r
-    public static void main(String[] args) {\r
-        // TODO Auto-generated method stub\r
-\r
-    }\r
-\r
     /**\r
      * This is the default constructor\r
      * \r
@@ -150,7 +141,7 @@ public class SwitchWorkspace extends IDialog {
     private void initialize() {\r
         this.setSize(472, 132);\r
         this.setContentPane(getJContentPane());\r
-        this.setTitle("Change workspace");\r
+        this.setTitle("Select workspace");\r
         this.centerWindow();\r
     }\r
 \r
@@ -185,7 +176,7 @@ public class SwitchWorkspace extends IDialog {
             Log.wrn("Switch Workspace", "New workspace must be entered!");\r
             return false;\r
         }\r
-        if (!Workspace.checkWorkspace(this.jTextFieldNew.getText())) {\r
+        if (Workspace.checkWorkspace(this.jTextFieldNew.getText()) != Workspace.WORKSPACE_VALID) {\r
             Log.wrn("Switch Workspace", "Please select a valid workspace!");\r
             return false;\r
         }\r
@@ -207,9 +198,9 @@ public class SwitchWorkspace extends IDialog {
             if (!check()) {\r
                 return;\r
             } else {\r
-                this.setVisible(false);\r
                 Workspace.setCurrentWorkspace(this.jTextFieldNew.getText());\r
                 returnType = DataType.RETURN_TYPE_OK;\r
+                this.setVisible(false);\r
             }\r
         }\r
 \r