Refactoring: rename duplicated Util classes

[jabaws.git] / engine / compbio / engine / cluster / drmaa / ClusterSession.java

diff --git a/engine/compbio/engine/cluster/drmaa/ClusterSession.java b/engine/compbio/engine/cluster/drmaa/ClusterSession.java
index ca2f531..431c39f 100644 (file)
--- a/engine/compbio/engine/cluster/drmaa/ClusterSession.java
+++ b/engine/compbio/engine/cluster/drmaa/ClusterSession.java
@@ -33,8 +33,10 @@ import org.ggf.drmaa.SessionFactory;
 \r
 import compbio.engine.ClusterJobId;\r
 import compbio.engine.Job;\r
+import compbio.engine.Configurator;\r
 import compbio.engine.client.ConfiguredExecutable;\r
 import compbio.engine.client.PathValidator;\r
+import compbio.engine.client.EngineUtil;\r
 import compbio.engine.conf.PropertyHelperManager;\r
 import compbio.metadata.JobStatus;\r
 import compbio.metadata.ResultNotAvailableException;\r
@@ -136,18 +138,16 @@ public final class ClusterSession {
                                + taskDirectory;\r
                assert !Util.isEmpty(jobId);\r
 \r
-               compbio.engine.client.Util.writeStatFile(executable.getWorkDirectory(),\r
-                               JobStatus.SUBMITTED.toString());\r
-               compbio.engine.client.Util.writeFile(executable.getWorkDirectory(),\r
-                               JOBID, jobId, false);\r
+               EngineUtil.writeStatFile(executable.getWorkDirectory(), JobStatus.SUBMITTED.toString());\r
+               EngineUtil.writeFile(executable.getWorkDirectory(), JOBID, jobId, false);\r
                log.debug("Adding taskId: " + taskDirectory + " to cluster job list");\r
-               assert compbio.engine.client.Util.isValidJobId(taskDirectory);\r
+               assert EngineUtil.isValidJobId(taskDirectory);\r
                jobs.add(new Job(taskDirectory, jobId, executable));\r
        }\r
 \r
        public void removeJob(String taskId) {\r
                assert !Util.isEmpty(taskId);\r
-               assert compbio.engine.client.Util.isValidJobId(taskId);\r
+               assert EngineUtil.isValidJobId(taskId);\r
                removeJobFromListbyTaskId(taskId);\r
        }\r
 \r
@@ -207,9 +207,7 @@ public final class ClusterSession {
                // Once the job has been waited for it will be finished\r
                // Next time it will not be found in the session, so removed from the\r
                // job list\r
-               compbio.engine.client.Util.writeStatFile(\r
-                               compbio.engine.Configurator.getWorkDirectory(jobId),\r
-                               JobStatus.FINISHED.toString());\r
+               EngineUtil.writeStatFile(Configurator.getWorkDirectory(jobId), JobStatus.FINISHED.toString());\r
 \r
                return status;\r
        }\r
@@ -226,7 +224,7 @@ public final class ClusterSession {
        public ConfiguredExecutable<?> getResults(String taskId)\r
                        throws DrmaaException, ResultNotAvailableException {\r
 \r
-               compbio.engine.client.Util.isValidJobId(taskId);\r
+               EngineUtil.isValidJobId(taskId);\r
                try {\r
                        JobInfo status = waitForJob(taskId);\r
                } catch (InvalidJobException e) {\r
@@ -249,10 +247,10 @@ public final class ClusterSession {
                        // If task was not find in the list of jobs, than it must have been\r
                        // collected already\r
                        // Resurrect the job to find out there the output is\r
-                       exec = compbio.engine.client.Util.loadExecutable(taskId);\r
+                       exec = EngineUtil.loadExecutable(taskId);\r
                }\r
                if (exec != null) {\r
-                       compbio.engine.client.Util.writeMarker(exec.getWorkDirectory(),\r
+                       EngineUtil.writeMarker(exec.getWorkDirectory(),\r
                                        JobStatus.COLLECTED);\r
                }\r
                return exec;\r