Refactoring: rename duplicated Util classes

[jabaws.git] / engine / compbio / engine / client / EngineUtil.java

diff --git a/engine/compbio/engine/client/Util.java b/engine/compbio/engine/client/EngineUtil.java
similarity index 94%
rename from engine/compbio/engine/client/Util.java
rename to engine/compbio/engine/client/EngineUtil.java
index 5eda4b6..e5eb946 100644 (file)
--- a/engine/compbio/engine/client/Util.java
+++ b/engine/compbio/engine/client/EngineUtil.java
@@ -38,12 +38,12 @@ import compbio.util.FileUtil;
 import compbio.util.PropertyHelper;\r
 import compbio.util.SysPrefs;\r
 \r
-public final class Util {\r
+public final class EngineUtil {\r
 \r
        private static final PropertyHelper ph = PropertyHelperManager\r
                        .getPropertyHelper();\r
 \r
-       private static final Logger log = Logger.getLogger(Util.class);\r
+       private static final Logger log = Logger.getLogger(EngineUtil.class);\r
 \r
        public static boolean isValidJobId(final String key) {\r
                if (compbio.util.Util.isEmpty(key)) {\r
@@ -184,7 +184,7 @@ public final class Util {
                String absolute = relativePath;\r
                if (!PathValidator.isAbsolutePath(relativePath)) {\r
                        absolute = PropertyHelperManager.getLocalPath() + relativePath;\r
-                       Util.log.trace("Changing local path in enviromental variable to absolute: FROM "\r
+                       EngineUtil.log.trace("Changing local path in enviromental variable to absolute: FROM "\r
                                        + relativePath + " TO " + absolute);\r
                }\r
                return absolute;\r
@@ -193,7 +193,7 @@ public final class Util {
        public static String getExecProperty(String propertySpec, Executable<?> exec) {\r
                assert !compbio.util.Util.isEmpty(propertySpec);\r
                assert exec != null;\r
-               return Util.getExecProperty(propertySpec, exec.getClass());\r
+               return EngineUtil.getExecProperty(propertySpec, exec.getClass());\r
        }\r
 \r
        public static String getExecProperty(String propertySpec, Class<?> clazz) {\r
@@ -403,11 +403,11 @@ public final class Util {
                try {\r
                        limits = ConfExecutable.getRunnerLimits(clazz);\r
                } catch (FileNotFoundException e) {\r
-                       Util.log.warn("No limits are found for " + clazz + " executable! "\r
+                       EngineUtil.log.warn("No limits are found for " + clazz + " executable! "\r
                                        + e.getLocalizedMessage(), e.getCause());\r
                        // its ok, limit may not be initialized\r
                } catch (IOException e) {\r
-                       Util.log.warn("IO exception while attempting to read limits for "\r
+                       EngineUtil.log.warn("IO exception while attempting to read limits for "\r
                                        + clazz + " executable! " + e.getLocalizedMessage(),\r
                                        e.getCause());\r
                }\r