Remove some unuseful imports.

amend some incorrect use of EdkLog.

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

diff --git a/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/CreateMtFileTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/CreateMtFileTask.java
index bdc492c0dc7d54d92f8cbc7809bfd121752516fc..773df8e13b96a68666238ade485a7e3141617a19 100644 (file)
--- a/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/CreateMtFileTask.java
+++ b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/CreateMtFileTask.java
@@ -113,7 +113,7 @@ public class CreateMtFileTask extends Task implements EfiDefine {
                 //\r
                 // command execution fail\r
                 //\r
                 //\r
                 // command execution fail\r
                 //\r

-                EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
+                EdkLog.log(this, EdkLog.EDK_ERROR, "ERROR = " + Integer.toHexString(revl));\r

                 throw new BuildException(toolName + " failed!");\r
             }\r
         } catch (Exception e) {\r
                 throw new BuildException(toolName + " failed!");\r
             }\r
         } catch (Exception e) {\r

diff --git a/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiCompressTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiCompressTask.java
index 1ffd61f0158303ffa4cb8ecc4a78b4c15d8694ca..f36aad6481cdc1c8dd01a64b0b6eb01b78030b89 100644 (file)
--- a/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiCompressTask.java
+++ b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiCompressTask.java
@@ -114,7 +114,7 @@ public class EfiCompressTask extends Task implements EfiDefine {
                 //\r
                 // command execution fail\r
                 //\r
                 //\r
                 // command execution fail\r
                 //\r

-                EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
+                EdkLog.log(this, EdkLog.EDK_ERROR, "ERROR = " + Integer.toHexString(revl));\r

                 throw new BuildException(toolName + " failed!");\r
 \r
             }\r
                 throw new BuildException(toolName + " failed!");\r
 \r
             }\r

diff --git a/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java
index 4cbbfab8c6ec34c1a8a07d962015b853726425fd..3fdeb8d76aa5b74bde31d5b84dfb7e37cb9d921e 100644 (file)
--- a/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java
+++ b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java
@@ -735,7 +735,7 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
        try {\r
            value = Integer.parseInt(intStringNoPrefix, radix);\r
        } catch (NumberFormatException e) {\r
        try {\r
            value = Integer.parseInt(intStringNoPrefix, radix);\r
        } catch (NumberFormatException e) {\r

-           log("Incorrect format of int [" + intString + "]. -1 is assumed");\r
+           EdkLog.log(this, EdkLog.EDK_ERROR, "Incorrect format of int [" + intString + "]. -1 is assumed");\r

            return -1;\r
        }\r
 \r
            return -1;\r
        }\r
 \r


@@ -942,7 +942,7 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
             //\r
             ffsBuffer.close();\r
         } catch (Exception e) {\r
             //\r
             ffsBuffer.close();\r
         } catch (Exception e) {\r

-            log("genffsfile failed!");\r
+            EdkLog.log(this, EdkLog.EDK_ERROR, "genffsfile failed!");\r

             throw new BuildException (e.getMessage());\r
         }\r
 \r
             throw new BuildException (e.getMessage());\r
         }\r
 \r

diff --git a/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
index 27e0ed7be5b7476b9dc4349e117395c77faac8d1..20cf44b95dfe44880cacf314607dcf06b4afec38 100644 (file)
--- a/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
+++ b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
@@ -32,11 +32,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;\r
 \r
 import org.apache.tools.ant.BuildException;\r
 import java.util.regex.Pattern;\r
 \r
 import org.apache.tools.ant.BuildException;\r

-import org.apache.tools.ant.Project;\r

 import org.apache.tools.ant.Task;\r
 import org.apache.tools.ant.Task;\r

-import org.apache.tools.ant.taskdefs.Execute;\r
-import org.apache.tools.ant.taskdefs.LogStreamHandler;\r
-import org.apache.tools.ant.types.Commandline;\r

 import org.tianocore.common.cache.FileTimeStamp;\r
 import org.tianocore.common.logger.EdkLog;\r
 \r
 import org.tianocore.common.cache.FileTimeStamp;\r
 import org.tianocore.common.logger.EdkLog;\r
 \r

diff --git a/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java
index 5897bd2b09a5a6e1bb54fa007181905dffab0fe0..178e92ae664bbbc0c7654675d2594467ede3f6f4 100644 (file)
--- a/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java
+++ b/Tools/Java/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java
@@ -15,8 +15,6 @@ package org.tianocore.framework.tasks;
 \r
 import java.io.File;\r
 import java.io.IOException;\r
 \r
 import java.io.File;\r
 import java.io.IOException;\r

-import java.util.ArrayList;\r
-import java.util.List;\r

 \r
 import org.apache.tools.ant.BuildException;\r
 import org.apache.tools.ant.Project;\r
 \r
 import org.apache.tools.ant.BuildException;\r
 import org.apache.tools.ant.Project;\r