Changed EdkException to GenBuildException for consistency

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

diff --git a/Tools/Source/GenBuild/org/tianocore/build/toolchain/ConfigReader.java b/Tools/Source/GenBuild/org/tianocore/build/toolchain/ConfigReader.java
index b6f58ce5f2575421d141bbdee703876a905b92cc..6ad4d44388aa14b6ca0419e2d1de4de3c8e847f0 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/toolchain/ConfigReader.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/toolchain/ConfigReader.java
@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/\r
 package org.tianocore.build.toolchain;\r
 \r
 **/\r
 package org.tianocore.build.toolchain;\r
 \r

-import org.tianocore.common.exception.EdkException;\r
+import org.tianocore.build.exception.GenBuildException;\r

 \r
 import java.io.BufferedReader;\r
 import java.io.File;\r
 \r
 import java.io.BufferedReader;\r
 import java.io.File;\r


@@ -38,7 +38,7 @@ public class ConfigReader {
 \r
       @return String[][]    The definition array\r
     **/\r
 \r
       @return String[][]    The definition array\r
     **/\r

-    public static synchronized String[][] parse(String filename) throws EdkException {\r
+    public static synchronized String[][] parse(String filename) throws GenBuildException {\r

         return parse(new File(filename));\r
     }\r
 \r
         return parse(new File(filename));\r
     }\r
 \r


@@ -53,7 +53,7 @@ public class ConfigReader {
       @throws   EdkException\r
                 Config file's format is not valid\r
     **/\r
       @throws   EdkException\r
                 Config file's format is not valid\r
     **/\r

-    public static synchronized String[][] parse(File configFile) throws EdkException {\r
+    public static synchronized String[][] parse(File configFile) throws GenBuildException {\r

         List<String> keyList = new ArrayList<String>(256);\r
         List<String> valueList = new ArrayList<String>(256);\r
         int lines = 0;\r
         List<String> keyList = new ArrayList<String>(256);\r
         List<String> valueList = new ArrayList<String>(256);\r
         int lines = 0;\r


@@ -78,7 +78,7 @@ public class ConfigReader {
                 // \r
                 int index;\r
                 if ((index = str.indexOf('=')) <= 0) {\r
                 // \r
                 int index;\r
                 if ((index = str.indexOf('=')) <= 0) {\r

-                    throw new EdkException("ERROR Processing file [" + configFile.getAbsolutePath() \r
+                    throw new GenBuildException("ERROR Processing file [" + configFile.getAbsolutePath() \r

                         + "] (line " + lines + ").\n");\r
                 }\r
 \r
                         + "] (line " + lines + ").\n");\r
                 }\r
 \r


@@ -89,7 +89,7 @@ public class ConfigReader {
                 valueList.add(str.substring(index + 1).trim());\r
             }\r
         } catch (Exception e) {\r
                 valueList.add(str.substring(index + 1).trim());\r
             }\r
         } catch (Exception e) {\r

-            throw new EdkException("ERROR Processing file [" + configFile.getAbsolutePath() \r
+            throw new GenBuildException("ERROR Processing file [" + configFile.getAbsolutePath() \r

                 + "] (line " + lines + ").\n" + e.getMessage());\r
         }\r
 \r
                 + "] (line " + lines + ").\n" + e.getMessage());\r
         }\r
 \r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainConfig.java b/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainConfig.java
index 73e66151c1e38141283218e0aadb09f0a02fe608..b12c43662c5ab884ad628dd279eec9c1507a5bdd 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainConfig.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainConfig.java
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/\r
 package org.tianocore.build.toolchain;\r
 \r
 **/\r
 package org.tianocore.build.toolchain;\r
 \r

-import org.tianocore.common.exception.EdkException;\r
+import org.tianocore.build.exception.GenBuildException;\r

 import org.tianocore.build.toolchain.ToolChainKey;\r
 import org.tianocore.build.toolchain.ToolChainMap;\r
 \r
 import org.tianocore.build.toolchain.ToolChainKey;\r
 import org.tianocore.build.toolchain.ToolChainMap;\r
 \r


@@ -44,7 +44,7 @@ public class ToolChainConfig {
       \r
       @param toolChainFile File object representing the tool chain configuration file\r
     **/\r
       \r
       @param toolChainFile File object representing the tool chain configuration file\r
     **/\r

-    public ToolChainConfig (File toolChainFile) throws EdkException {\r
+    public ToolChainConfig (File toolChainFile) throws GenBuildException {\r

         config = getToolChainConfig(toolChainFile);\r
         parseToolChainDefKey(config.keySet());\r
     }\r
         config = getToolChainConfig(toolChainFile);\r
         parseToolChainDefKey(config.keySet());\r
     }\r


@@ -57,7 +57,7 @@ public class ToolChainConfig {
        \r
        @return ToolChainMap\r
      **/\r
        \r
        @return ToolChainMap\r
      **/\r

-    private ToolChainMap getToolChainConfig(File ConfigFile) throws EdkException {\r
+    private ToolChainMap getToolChainConfig(File ConfigFile) throws GenBuildException {\r

         ToolChainMap map = new ToolChainMap();\r
         String[][] toolChainDef = ConfigReader.parse(ConfigFile);\r
     \r
         ToolChainMap map = new ToolChainMap();\r
         String[][] toolChainDef = ConfigReader.parse(ConfigFile);\r
     \r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainKey.java b/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainKey.java
index 11ba4aaee026bb489f2e1408e2a92e7c0e1441d7..1bedf3c6854e32b3e8c54e5269023a154c5adbf8 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainKey.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainKey.java
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 package org.tianocore.build.toolchain;\r
 \r
 \r
 package org.tianocore.build.toolchain;\r
 \r

-import org.tianocore.common.exception.EdkException;\r
+import org.tianocore.build.exception.GenBuildException;\r

 \r
 /**\r
    ToolChainKey class is the java class form of the "name" of tool chain definition.\r
 \r
 /**\r
    ToolChainKey class is the java class form of the "name" of tool chain definition.\r


@@ -56,7 +56,7 @@ public class ToolChainKey implements java.io.Serializable, Comparable<ToolChainK
        @param keyString     The key string value\r
        @param delimiter     Delimiter charater concatenating the key parts\r
      **/\r
        @param keyString     The key string value\r
        @param delimiter     Delimiter charater concatenating the key parts\r
      **/\r

-    public ToolChainKey(String keyString, String delimiter) throws EdkException {\r
+    public ToolChainKey(String keyString, String delimiter) throws GenBuildException {\r

         setKey(keyString, delimiter);\r
     }\r
 \r
         setKey(keyString, delimiter);\r
     }\r
 \r


@@ -65,7 +65,7 @@ public class ToolChainKey implements java.io.Serializable, Comparable<ToolChainK
 \r
        @param keyString     The key string value\r
      **/\r
 \r
        @param keyString     The key string value\r
      **/\r

-    public ToolChainKey(String keyString) throws EdkException {\r
+    public ToolChainKey(String keyString) throws GenBuildException {\r

         setKey(keyString);\r
     }\r
 \r
         setKey(keyString);\r
     }\r
 \r


@@ -74,7 +74,7 @@ public class ToolChainKey implements java.io.Serializable, Comparable<ToolChainK
 \r
        @param keySet\r
      **/\r
 \r
        @param keySet\r
      **/\r

-    public ToolChainKey(String[] keySet) throws EdkException {\r
+    public ToolChainKey(String[] keySet) throws GenBuildException {\r

         setKey(keySet);\r
     }\r
 \r
         setKey(keySet);\r
     }\r
 \r


@@ -156,9 +156,9 @@ public class ToolChainKey implements java.io.Serializable, Comparable<ToolChainK
 \r
        @param keySet    The string array of key value\r
      **/\r
 \r
        @param keySet    The string array of key value\r
      **/\r

-    public void setKey(String[] keySet) throws EdkException {\r
+    public void setKey(String[] keySet) throws GenBuildException {\r

         if (keySet.length != ToolChainKey.keyLength) {\r
         if (keySet.length != ToolChainKey.keyLength) {\r

-            throw new EdkException("Invalid ToolChain key");\r
+            throw new GenBuildException("Invalid ToolChain key");\r

         }\r
 \r
         //\r
         }\r
 \r
         //\r


@@ -185,9 +185,9 @@ public class ToolChainKey implements java.io.Serializable, Comparable<ToolChainK
        @param keySetString      The new value of "index" part of key\r
        @param index             The key part index\r
      **/\r
        @param keySetString      The new value of "index" part of key\r
        @param index             The key part index\r
      **/\r

-    public void setKey(String keySetString, int index) throws EdkException {\r
+    public void setKey(String keySetString, int index) throws GenBuildException {\r

         if (index >= ToolChainKey.keyLength) {\r
         if (index >= ToolChainKey.keyLength) {\r

-            throw new EdkException("Invalid ToolChain key index");\r
+            throw new GenBuildException("Invalid ToolChain key index");\r

         }\r
 \r
         //\r
         }\r
 \r
         //\r


@@ -210,11 +210,11 @@ public class ToolChainKey implements java.io.Serializable, Comparable<ToolChainK
        \r
        @param keyString     The key value string\r
      **/\r
        \r
        @param keyString     The key value string\r
      **/\r

-    public void setKey(String keyString) throws EdkException {\r
+    public void setKey(String keyString) throws GenBuildException {\r

         this.keySet = keyString.split(this.delimiter);\r
 \r
         if (this.keySet.length != ToolChainKey.keyLength) {\r
         this.keySet = keyString.split(this.delimiter);\r
 \r
         if (this.keySet.length != ToolChainKey.keyLength) {\r

-            throw new EdkException("Invalid ToolChain key");\r
+            throw new GenBuildException("Invalid ToolChain key");\r

         }\r
 \r
         this.keyString = keyString;\r
         }\r
 \r
         this.keyString = keyString;\r


@@ -230,11 +230,11 @@ public class ToolChainKey implements java.io.Serializable, Comparable<ToolChainK
        @param keyString     The key value string\r
        @param delimiter     The delimiter concatenating the key string\r
      **/\r
        @param keyString     The key value string\r
        @param delimiter     The delimiter concatenating the key string\r
      **/\r

-    public void setKey(String keyString, String delimiter) throws EdkException {\r
+    public void setKey(String keyString, String delimiter) throws GenBuildException {\r

         this.keySet = keyString.split(delimiter);\r
 \r
         if (this.keySet.length != ToolChainKey.keyLength) {\r
         this.keySet = keyString.split(delimiter);\r
 \r
         if (this.keySet.length != ToolChainKey.keyLength) {\r

-            throw new EdkException("Invalid ToolChain key");\r
+            throw new GenBuildException("Invalid ToolChain key");\r

         }\r
 \r
         this.keyString = keyString;\r
         }\r
 \r
         this.keyString = keyString;\r