Refactoring: rename duplicated Util classes

[jabaws.git] / engine / compbio / engine / Configurator.java

diff --git a/engine/compbio/engine/Configurator.java b/engine/compbio/engine/Configurator.java
index 96c232d..1aa18ea 100644 (file)
--- a/engine/compbio/engine/Configurator.java
+++ b/engine/compbio/engine/Configurator.java
@@ -29,6 +29,7 @@ import compbio.engine.client.ConfExecutable;
 import compbio.engine.client.ConfiguredExecutable;\r
 import compbio.engine.client.Executable;\r
 import compbio.engine.client.PathValidator;\r
+import compbio.engine.client.EngineUtil;\r
 import compbio.engine.cluster.drmaa.AsyncJobRunner;\r
 import compbio.engine.cluster.drmaa.JobRunner;\r
 import compbio.engine.conf.DirectoryManager;\r
@@ -90,7 +91,7 @@ public class Configurator {
                }\r
                if (!PathValidator.isAbsolutePath(tmp_dir)) {\r
                        log.debug("local.tmp.directory path is relative! " + tmp_dir);\r
-                       tmp_dir = compbio.engine.client.Util.convertToAbsolute(tmp_dir);\r
+                       tmp_dir = EngineUtil.convertToAbsolute(tmp_dir);\r
                        log.debug("local.tmp.directory path changed to absolute: " + tmp_dir);\r
                }\r
                return tmp_dir.trim();\r
@@ -303,7 +304,7 @@ public class Configurator {
                if (Util.isEmpty(taskId)) {\r
                        throw new NullPointerException("TaskId must be provided!");\r
                }\r
-               if (!compbio.engine.client.Util.isValidJobId(taskId)) {\r
+               if (!EngineUtil.isValidJobId(taskId)) {\r
                        throw new InvalidParameterException("TaskId is not valid!");\r
                }\r
                return !taskId.startsWith(ConfExecutable.CLUSTER_TASK_ID_PREFIX);\r
@@ -311,7 +312,7 @@ public class Configurator {
 \r
        public static String getWorkDirectory(String taskId) {\r
                assert !compbio.util.Util.isEmpty(taskId);\r
-               assert compbio.engine.client.Util.isValidJobId(taskId);\r
+               assert EngineUtil.isValidJobId(taskId);\r
                log.info("Getting workdirectory for TaskID: " + taskId);\r
                if (taskId.startsWith(ConfExecutable.CLUSTER_TASK_ID_PREFIX)) {\r
                        return CLUSTER_WORK_DIRECTORY + File.separator + taskId;\r