Refactoring: rename duplicated Util classes

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

diff --git a/engine/compbio/engine/cluster/drmaa/ClusterUtil.java b/engine/compbio/engine/cluster/drmaa/ClusterEngineUtil.java
similarity index 76%
rename from engine/compbio/engine/cluster/drmaa/ClusterUtil.java
rename to engine/compbio/engine/cluster/drmaa/ClusterEngineUtil.java
index 803b169..e9ca1d7 100644 (file)
--- a/engine/compbio/engine/cluster/drmaa/ClusterUtil.java
+++ b/engine/compbio/engine/cluster/drmaa/ClusterEngineUtil.java
@@ -26,16 +26,15 @@ import org.ggf.drmaa.JobInfo;
 import org.ggf.drmaa.Session;\r
 \r
 import compbio.engine.Configurator;\r
-import compbio.engine.client.Util;\r
+import compbio.engine.client.EngineUtil;\r
 import compbio.metadata.JobExecutionException;\r
 import compbio.metadata.JobStatus;\r
 \r
-public class ClusterUtil {\r
+public class ClusterEngineUtil {\r
 \r
-       private static final Logger log = Logger.getLogger(ClusterUtil.class);\r
+       private static final Logger log = Logger.getLogger(ClusterEngineUtil.class);\r
 \r
-       public static final NumberFormat CLUSTER_STAT_IN_SEC = NumberFormat\r
-                       .getInstance();\r
+       public static final NumberFormat CLUSTER_STAT_IN_SEC = NumberFormat.getInstance();\r
 \r
        static {\r
                CLUSTER_STAT_IN_SEC.setMinimumFractionDigits(4);\r
@@ -43,30 +42,23 @@ public class ClusterUtil {
 \r
        public static final boolean cancelJob(final String jobId,\r
                        ClusterSession csession) {\r
-               assert Util.isValidJobId(jobId);\r
+               assert EngineUtil.isValidJobId(jobId);\r
                boolean cancelled = true;\r
                Session session = csession.getSession();\r
                try {\r
                        log.info("Job " + jobId + " is successfully cancelled");\r
-                       compbio.engine.client.Util.writeMarker(Configurator.getWorkDirectory(jobId),\r
-                                       JobStatus.CANCELLED);\r
-                       session.control(ClusterSession.getClusterJobId(jobId).getJobId(),\r
-                                       Session.TERMINATE);\r
+                       EngineUtil.writeMarker(Configurator.getWorkDirectory(jobId), JobStatus.CANCELLED);\r
+                       session.control(ClusterSession.getClusterJobId(jobId).getJobId(), Session.TERMINATE);\r
                } catch (DrmaaException e) {\r
                        // Log silently\r
                        log.error("Job " + jobId + " cancellation failed!");\r
                        log.error("Cause: " + e.getLocalizedMessage(), e.getCause());\r
                        cancelled = false;\r
                } catch (IOException e) {\r
-                       log.error(\r
-                                       "Could not read JOBID file to determine cluster jobid for taskid: "\r
-                                                       + jobId + " Message: " + e.getLocalizedMessage(), e\r
-                                                       .getCause());\r
+                       log.error("Could not read JOBID file to determine cluster jobid for taskid: "\r
+                                                       + jobId + " Message: " + e.getLocalizedMessage(), e.getCause());\r
                } finally {\r
-                       log\r
-                                       .trace("Job "\r
-                                                       + jobId\r
-                                                       + " has been successfully removed from the cluster engine job list");\r
+                       log.trace("Job " + jobId + " has been successfully removed from the cluster engine job list");\r
                        csession.removeJob(jobId);\r
                }\r
                return cancelled;\r
@@ -75,7 +67,7 @@ public class ClusterUtil {
        public static final JobInfo waitForResult(ClusterSession csession,\r
                        String jobId) throws JobExecutionException {\r
                JobInfo jinfo = null;\r
-               assert Util.isValidJobId(jobId);\r
+               assert EngineUtil.isValidJobId(jobId);\r
                try {\r
                        jinfo = csession.waitForJob(jobId);\r
                } catch (DrmaaException e) {\r