Refactoring and code style improving

[jabaws.git] / engine / compbio / engine / local / ExecutableWrapper.java

diff --git a/engine/compbio/engine/local/ExecutableWrapper.java b/engine/compbio/engine/local/ExecutableWrapper.java
index 597af4e..9e652f9 100644 (file)
--- a/engine/compbio/engine/local/ExecutableWrapper.java
+++ b/engine/compbio/engine/local/ExecutableWrapper.java
@@ -75,17 +75,14 @@ public final class ExecutableWrapper implements
 \r
        pbuilder = new ProcessBuilder(params);\r
        if (executable.getEnvironment() != null) {\r
-           log.debug("Setting command environment variables: "\r
-                   + pbuilder.environment());\r
-           Util.mergeEnvVariables(pbuilder.environment(), executable\r
-                   .getEnvironment());\r
+           log.debug("Setting command environment variables: " + pbuilder.environment());\r
+           Util.mergeEnvVariables(pbuilder.environment(), executable.getEnvironment());\r
            log.debug("Process environment:" + pbuilder.environment());\r
        }\r
        log.debug("Setting command: " + pbuilder.command());\r
        PathValidator.validateDirectory(workDirectory);\r
        pbuilder.directory(new File(workDirectory));\r
-       log.debug("Current working directory is "\r
-               + SysPrefs.getCurrentDirectory());\r
+       log.debug("Current working directory is " + SysPrefs.getCurrentDirectory());\r
        log.debug("Setting working directory: " + workDirectory);\r
        // Initialize private executor to dump processes output if any to the\r
        // file system\r
@@ -98,8 +95,7 @@ public final class ExecutableWrapper implements
                // get access to the thread efficiently deadlocking the\r
                // proccess!\r
                this.es = Executors.newCachedThreadPool();\r
-               log\r
-                       .debug("Initializing executor for local processes output dump");\r
+               log.debug("Initializing executor for local processes output dump");\r
                // Make sure that the executors are going to be properly closed\r
                Runtime.getRuntime().addShutdownHook(new Thread() {\r
                    @Override\r
@@ -119,7 +115,7 @@ public final class ExecutableWrapper implements
      */\r
     public static final void shutdownService() {\r
        if (es != null) {\r
-           es.shutdownNow();\r
+               es.shutdownNow();\r
        }\r
     }\r
 \r