Refactoring: rename duplicated Util classes

[jabaws.git] / engine / compbio / engine / conf / DirectoryManager.java

diff --git a/engine/compbio/engine/conf/DirectoryManager.java b/engine/compbio/engine/conf/DirectoryManager.java
index 10427dd..6b59d20 100644 (file)
--- a/engine/compbio/engine/conf/DirectoryManager.java
+++ b/engine/compbio/engine/conf/DirectoryManager.java
@@ -22,6 +22,7 @@ import org.apache.log4j.Logger;
 \r
 import compbio.engine.client.ConfExecutable;\r
 import compbio.engine.client.Executable;\r
+import compbio.engine.client.EngineUtil;\r
 import compbio.util.Util;\r
 \r
 public class DirectoryManager {\r
@@ -41,11 +42,11 @@ public class DirectoryManager {
                // to make sure that the resulting number fits into long value\r
                String longNum = new Long(System.nanoTime()).toString();\r
                return Long.parseLong(Util.getRandomNumber(100, 999)\r
-                               + longNum.substring(3));\r
+                               + longNum.substring(4));\r
        }\r
 \r
        public static Class<Executable<?>> getClass(String taskId) {\r
-               assert compbio.engine.client.Util.isValidJobId(taskId);\r
+               assert EngineUtil.isValidJobId(taskId);\r
                String className = null;\r
                if (taskId.startsWith(ConfExecutable.CLUSTER_TASK_ID_PREFIX)) {\r
                        className = taskId.substring(1, taskId.indexOf(DELIM));\r
@@ -55,8 +56,7 @@ public class DirectoryManager {
                try {\r
                        return (Class<Executable<?>>) Class.forName(className);\r
                } catch (ClassNotFoundException e) {\r
-                       log.error("Could not parse taskId " + taskId + " Message "\r
-                                       + e.getLocalizedMessage(), e.getCause());\r
+                       log.error("Could not parse taskId " + taskId + " Message " + e.getLocalizedMessage(), e.getCause());\r
                }\r
                return null;\r
        }\r