Refactoring: rename duplicated Util classes

[jabaws.git] / engine / compbio / engine / local / LocalEngineUtil.java

diff --git a/engine/compbio/engine/local/LocalEngineUtil.java b/engine/compbio/engine/local/LocalEngineUtil.java
index 6ecdc32..c00c6df 100644 (file)
--- a/engine/compbio/engine/local/LocalEngineUtil.java
+++ b/engine/compbio/engine/local/LocalEngineUtil.java
@@ -27,7 +27,7 @@ import compbio.engine.Cleaner;
 import compbio.engine.Configurator;\r
 import compbio.engine.SubmissionManager;\r
 import compbio.engine.client.ConfiguredExecutable;\r
-import compbio.engine.client.Util;\r
+import compbio.engine.client.EngineUtil;\r
 import compbio.metadata.JobStatus;\r
 import compbio.metadata.ResultNotAvailableException;\r
 \r
@@ -56,8 +56,7 @@ public final class LocalEngineUtil {
 \r
        public static boolean cancelJob(Future<ConfiguredExecutable<?>> future,\r
                        String workDirectory) {\r
-               compbio.engine.client.Util.writeMarker(workDirectory,\r
-                               JobStatus.CANCELLED);\r
+               EngineUtil.writeMarker(workDirectory, JobStatus.CANCELLED);\r
                log.debug("Cancelling local job from work directory " + workDirectory);\r
                return future.cancel(true);\r
        }\r
@@ -80,14 +79,14 @@ public final class LocalEngineUtil {
                // job has been removed from the task list\r
                // but there may be status written to the disk\r
                String workDir = Configurator.getWorkDirectory(jobId);\r
-               if (Util.isMarked(workDir, JobStatus.FINISHED)\r
-                               || Util.isMarked(workDir, JobStatus.COLLECTED)) {\r
+               if (EngineUtil.isMarked(workDir, JobStatus.FINISHED)\r
+                               || EngineUtil.isMarked(workDir, JobStatus.COLLECTED)) {\r
                        return JobStatus.FINISHED;\r
                }\r
-               if (Util.isMarked(workDir, JobStatus.CANCELLED)) {\r
+               if (EngineUtil.isMarked(workDir, JobStatus.CANCELLED)) {\r
                        return JobStatus.CANCELLED;\r
                }\r
-               if (Util.isMarked(workDir, JobStatus.FAILED)) {\r
+               if (EngineUtil.isMarked(workDir, JobStatus.FAILED)) {\r
                        return JobStatus.FAILED;\r
                }\r
                return JobStatus.UNDEFINED;\r
@@ -112,13 +111,11 @@ public final class LocalEngineUtil {
                                                                + Configurator.getWorkDirectory(taskId)\r
                                                                + " Job id is " + taskId);\r
                        }\r
-                       compbio.engine.client.Util.writeMarker(Configurator\r
-                                       .getWorkDirectory(taskId), JobStatus.COLLECTED);\r
+                       EngineUtil.writeMarker(Configurator.getWorkDirectory(taskId), JobStatus.COLLECTED);\r
                } catch (InterruptedException e) {\r
                        // reassert threads interrupted status\r
                        Thread.currentThread().interrupt();\r
-                       compbio.engine.client.Util.writeMarker(Configurator\r
-                                       .getWorkDirectory(taskId), JobStatus.FAILED);\r
+                       EngineUtil.writeMarker(Configurator.getWorkDirectory(taskId), JobStatus.FAILED);\r
                        // Cancel the job\r
                        log.debug("Cancelling job due to Interruption");\r
                        future.cancel(true);\r
@@ -126,10 +123,8 @@ public final class LocalEngineUtil {
                        // this.cleanup(taskId);\r
                } catch (ExecutionException e) {\r
                        // this.cleanup(taskId);\r
-                       compbio.engine.client.Util.writeMarker(Configurator\r
-                                       .getWorkDirectory(taskId), JobStatus.FAILED);\r
-                       log.debug("Job execution exception: " + e.getLocalizedMessage(), e\r
-                                       .getCause());\r
+                       EngineUtil.writeMarker(Configurator     .getWorkDirectory(taskId), JobStatus.FAILED);\r
+                       log.debug("Job execution exception: " + e.getLocalizedMessage(), e.getCause());\r
                        // ExecutionException returned as thus Throwable needs unwrapping\r
                        LocalEngineUtil.launderThrowable(e.getCause());\r
                } finally {\r