Refactoring (renaming) 2 classes: AsyncJobRunner.java -> AsyncClusterRunner.java...

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

diff --git a/engine/compbio/engine/cluster/drmaa/AsyncJobRunner.java b/engine/compbio/engine/cluster/drmaa/AsyncClusterRunner.java
similarity index 77%
rename from engine/compbio/engine/cluster/drmaa/AsyncJobRunner.java
rename to engine/compbio/engine/cluster/drmaa/AsyncClusterRunner.java
index 1cd3197..9cd4b4f 100644 (file)
--- a/engine/compbio/engine/cluster/drmaa/AsyncJobRunner.java
+++ b/engine/compbio/engine/cluster/drmaa/AsyncClusterRunner.java
@@ -39,32 +39,32 @@ import compbio.metadata.ResultNotAvailableException;
  *          template gets deleted, this needs to be taken into account in this\r
  *          class design!\r
  */\r
-public class AsyncJobRunner implements AsyncExecutor {\r
+public class AsyncClusterRunner implements AsyncExecutor {\r
 \r
-       private static Logger log = Logger.getLogger(AsyncJobRunner.class);\r
+       private static Logger log = Logger.getLogger(AsyncClusterRunner.class);\r
 \r
        @Override\r
-       public String submitJob(ConfiguredExecutable<?> executable)\r
-                       throws JobSubmissionException {\r
-               JobRunner jr = new JobRunner(executable);\r
-               jr.submitJob(); // ignore cluster job id as it could be retrieved from fs\r
+       public String submitJob(ConfiguredExecutable<?> executable) throws JobSubmissionException {\r
+               ClusterRunner jr = new ClusterRunner(executable);\r
+               jr.submitJob();\r
+               // ignore cluster job id as it could be retrieved from fs\r
                return executable.getTaskId();\r
        }\r
 \r
        @Override\r
        public boolean cancelJob(String jobId) {\r
                ClusterSession clustSession = ClusterSession.getInstance();\r
-               return compbio.engine.cluster.drmaa.ClusterEngineUtil.cancelJob(jobId,\r
-                               clustSession);\r
+               return compbio.engine.cluster.drmaa.ClusterEngineUtil.cancelJob(jobId, clustSession);\r
        }\r
 \r
        /*\r
-        * This will never return clust.engine.JobStatus.CANCELLED as for sun grid engine \r
-        * cancelled job is the same as failed. Cancelled jobs needs to be tracked manually!\r
+        * This will never return clust.engine.JobStatus.CANCELLED as for sun grid\r
+        * engine cancelled job is the same as failed. Cancelled jobs needs to be\r
+        * tracked manually!\r
         */\r
        @Override\r
        public compbio.metadata.JobStatus getJobStatus(String jobId) {\r
-               return JobRunner.getJobStatus(jobId);\r
+               return ClusterRunner.getJobStatus(jobId);\r
        }\r
 \r
        @Override\r
@@ -74,11 +74,8 @@ public class AsyncJobRunner implements AsyncExecutor {
        }\r
 \r
        @Override\r
-       public ConfiguredExecutable<?> getResults(String jobId)\r
-                       throws ResultNotAvailableException {\r
-\r
+       public ConfiguredExecutable<?> getResults(String jobId) throws ResultNotAvailableException {\r
                assert EngineUtil.isValidJobId(jobId);\r
-\r
                ClusterSession csession = ClusterSession.getInstance();\r
                ConfiguredExecutable<?> exec;\r
                try {\r