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

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/Workspace.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/Workspace.java
index 40692c652608c80b5d4feba6c812ce82d77bdc75..5785aaf8aad0316ab6d691180c6f9f133dfad356 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/Workspace.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/Workspace.java
@@ -20,6 +20,19 @@ import java.io.File;
 import org.tianocore.frameworkwizard.common.DataType;\r
 \r
 public class Workspace {\r
+    //\r
+    // Define static return value\r
+    //\r
+    public final static int WORKSPACE_VALID = 0;\r
+    \r
+    public final static int WORKSPACE_NOT_DEFINED = 1;\r
+    \r
+    public final static int WORKSPACE_NOT_EXIST = 2;\r
+    \r
+    public final static int WORKSPACE_NOT_DIRECTORY = 3;\r
+    \r
+    public final static int WORKSPACE_NOT_VALID = 4;\r
+    \r
     //\r
     // Define class members\r
     //\r
@@ -66,7 +79,7 @@ public class Workspace {
      @retval false - The current WORKSPACE doesn't exist\r
      \r
      */\r
-    public static boolean checkCurrentWorkspace() {\r
+    public static int checkCurrentWorkspace() {\r
         return checkWorkspace(getCurrentWorkspace());\r
     }\r
 \r
@@ -79,30 +92,38 @@ public class Workspace {
      @retval false - The current WORKSPACE doesn't exist\r
      \r
      */\r
-    public static boolean checkWorkspace(String strWorkspace) {\r
+    public static int checkWorkspace(String strWorkspace) {\r
+        //\r
+        // Check if WORKSPACE Environment is defined\r
+        //\r
         if (strWorkspace == null || strWorkspace == "") {\r
-            return false;\r
+            return Workspace.WORKSPACE_NOT_DEFINED;\r
         }\r
+        \r
         //\r
-        // Check workspace directory\r
+        // Check if WORKSPACE Environment exists\r
         //\r
         File f = new File(strWorkspace);\r
-        if (!f.isDirectory()) {\r
-            return false;\r
-        }\r
         if (!f.exists()) {\r
-            return false;\r
+            return Workspace.WORKSPACE_NOT_EXIST;\r
+        }\r
+        \r
+        //\r
+        // Check if WORKSPACE Environment is a directory\r
+        //\r
+        if (!f.isDirectory()) {\r
+            return Workspace.WORKSPACE_NOT_DIRECTORY;\r
         }\r
         \r
         //\r
-        // Check FrameworkDatabase.db\r
+        // Check if FrameworkDatabase.db exists\r
         //\r
         f = new File(strWorkspace + Workspace.getStrWorkspaceDatabaseFile());\r
         if (!f.exists()) {\r
-            return false;\r
+            return Workspace.WORKSPACE_NOT_VALID;\r
         }\r
         \r
-        return true;\r
+        return Workspace.WORKSPACE_VALID;\r
     }\r
 \r
     public static String getStrWorkspaceDatabaseFile() {\r