From b93d010f821560a3527d62266aa5ad1cd7d9115e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Bigaret?= <sebastien.bigaret@telecom-bretagne.eu> Date: Wed, 31 May 2017 14:04:04 +0200 Subject: [PATCH] misc. / code simplification --- .../praxis/client/SimpleCommandLine.java | 2 +- .../praxis/common/SplashWindow.java | 4 +--- .../praxis/common/ThreadMonitor.java | 16 ++++------------ src/eu/telecom_bretagne/praxis/common/Utile.java | 1 - .../praxis/core/execution/ResultStore.java | 2 +- .../execution/platform/SGEExecutionEngine.java | 2 +- 6 files changed, 8 insertions(+), 19 deletions(-) diff --git a/src/eu/telecom_bretagne/praxis/client/SimpleCommandLine.java b/src/eu/telecom_bretagne/praxis/client/SimpleCommandLine.java index 2ffd8bdc..ccb50a62 100644 --- a/src/eu/telecom_bretagne/praxis/client/SimpleCommandLine.java +++ b/src/eu/telecom_bretagne/praxis/client/SimpleCommandLine.java @@ -348,7 +348,7 @@ public class SimpleCommandLine extends StorageListenerAdapter { exitOnError(16, "Error: workflow has no input for id: " + inputID, null); } - wfInput.setContent(Arrays.asList(new String[] { options.inputMap.get(inputID) })); + wfInput.setContent(Arrays.asList(options.inputMap.get(inputID))); } } System.setProperty("SIMPLE_COMMAND_LINE", "Y"); diff --git a/src/eu/telecom_bretagne/praxis/common/SplashWindow.java b/src/eu/telecom_bretagne/praxis/common/SplashWindow.java index cb003d28..98bb38d4 100644 --- a/src/eu/telecom_bretagne/praxis/common/SplashWindow.java +++ b/src/eu/telecom_bretagne/praxis/common/SplashWindow.java @@ -284,9 +284,7 @@ public class SplashWindow } catch (Exception e) { - InternalError error = new InternalError("Failed to invoke main method"); - error.initCause(e); - throw error; + throw new InternalError("Failed to invoke main method", e); } } } diff --git a/src/eu/telecom_bretagne/praxis/common/ThreadMonitor.java b/src/eu/telecom_bretagne/praxis/common/ThreadMonitor.java index 174849fb..b7ac1abc 100644 --- a/src/eu/telecom_bretagne/praxis/common/ThreadMonitor.java +++ b/src/eu/telecom_bretagne/praxis/common/ThreadMonitor.java @@ -87,9 +87,7 @@ public class ThreadMonitor { objname = new ObjectName(THREAD_MXBEAN_NAME); } catch (MalformedObjectNameException e) { // should not reach here - InternalError ie = new InternalError(e.getMessage()); - ie.initCause(e); - throw ie; + throw new InternalError(e.getMessage(), e); } parseMBeanInfo(); } @@ -258,17 +256,11 @@ public class ThreadMonitor { canDumpLocks = false; } } catch (IntrospectionException e) { - InternalError ie = new InternalError(e.getMessage()); - ie.initCause(e); - throw ie; + throw new InternalError(e.getMessage(), e); } catch (InstanceNotFoundException e) { - InternalError ie = new InternalError(e.getMessage()); - ie.initCause(e); - throw ie; + throw new InternalError(e.getMessage(), e); } catch (ReflectionException e) { - InternalError ie = new InternalError(e.getMessage()); - ie.initCause(e); - throw ie; + throw new InternalError(e.getMessage(), e); } } } diff --git a/src/eu/telecom_bretagne/praxis/common/Utile.java b/src/eu/telecom_bretagne/praxis/common/Utile.java index debcc098..7ffb51c2 100644 --- a/src/eu/telecom_bretagne/praxis/common/Utile.java +++ b/src/eu/telecom_bretagne/praxis/common/Utile.java @@ -26,7 +26,6 @@ import java.util.GregorianCalendar; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; -import java.util.Locale; import java.util.Map; import java.util.StringTokenizer; import java.util.logging.Level; diff --git a/src/eu/telecom_bretagne/praxis/core/execution/ResultStore.java b/src/eu/telecom_bretagne/praxis/core/execution/ResultStore.java index e7ab800f..82aa3616 100644 --- a/src/eu/telecom_bretagne/praxis/core/execution/ResultStore.java +++ b/src/eu/telecom_bretagne/praxis/core/execution/ResultStore.java @@ -696,7 +696,7 @@ public class ResultStore */ public boolean deleteResult(WorkflowID workflowID, ExecutionID executionID, String username) { - return deleteResults(workflowID, Arrays.asList(new ExecutionID[] {executionID}), username); + return deleteResults(workflowID, Arrays.asList(executionID), username); } } diff --git a/src/eu/telecom_bretagne/praxis/server/execution/platform/SGEExecutionEngine.java b/src/eu/telecom_bretagne/praxis/server/execution/platform/SGEExecutionEngine.java index 8053685f..381570eb 100644 --- a/src/eu/telecom_bretagne/praxis/server/execution/platform/SGEExecutionEngine.java +++ b/src/eu/telecom_bretagne/praxis/server/execution/platform/SGEExecutionEngine.java @@ -133,7 +133,7 @@ public class SGEExecutionEngine session.init(""); JobTemplate jt = session.createJobTemplate(); jt.setRemoteCommand(scriptPath); - jt.setArgs(Arrays.asList(new String[]{})); + jt.setArgs(Arrays.asList()); jt.setWorkingDirectory(executionDir); jt.setErrorPath(":"+stderr_filename); jt.setOutputPath(":"+stdout_filename); -- GitLab