aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java')
-rw-r--r--tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java b/tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java
index 9b2dbbb..6c9cdd4 100644
--- a/tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java
+++ b/tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java
@@ -56,8 +56,8 @@ public class ProcessWrapper {
private List<String> args;
private File dir;
- private final List<ContentReaderListener> stdoutl = new ArrayList(1);
- private final List<ContentReaderListener> stderrl = new ArrayList(1);
+ private final List<ContentReaderListener> stdoutl = new ArrayList<ContentReaderListener>(1);
+ private final List<ContentReaderListener> stderrl = new ArrayList<ContentReaderListener>(1);
private String[] vars;
private ReactingProcess reactingProcess;
@@ -73,9 +73,9 @@ public class ProcessWrapper {
Assert.assertNotNull(toBeExecuted);
Assert.assertTrue(toBeExecuted.trim().length() > 1);
if (otherargs == null) {
- otherargs = new ArrayList(1);
+ otherargs = new ArrayList<String>(1);
}
- List<String> urledArgs = new ArrayList(otherargs);
+ List<String> urledArgs = new ArrayList<String>(otherargs);
urledArgs.add(0, toBeExecuted);
urledArgs.add(s);
this.args = urledArgs;
@@ -201,7 +201,7 @@ public class ProcessWrapper {
this.vars = vars;
}
- public ServerAccess.ProcessResult execute() throws Exception {
+ public ProcessResult execute() throws Exception {
if (reactingProcess !=null ){
reactingProcess.beforeProcess("");
};
@@ -222,7 +222,7 @@ public class ProcessWrapper {
}
if (t.deadlyException != null) {
pa.setCanRun(false);
- return new ServerAccess.ProcessResult("", "", null, true, Integer.MIN_VALUE, t.deadlyException);
+ return new ProcessResult("", "", null, true, Integer.MIN_VALUE, t.deadlyException);
}
ContentReader crs = new ContentReader(t.getP().getInputStream(), stdoutl);
ContentReader cre = new ContentReader(t.getP().getErrorStream(), stderrl);
@@ -244,7 +244,7 @@ public class ProcessWrapper {
pa.setCanRun(false);
// ServerAccess.logOutputReprint(t.getP().exitValue()); when process is killed, this throws exception
- ServerAccess.ProcessResult pr = new ServerAccess.ProcessResult(crs.getContent(), cre.getContent(), t.getP(), pa.wasTerminated(), t.getExitCode(), null);
+ ProcessResult pr = new ProcessResult(crs.getContent(), cre.getContent(), t.getP(), pa.wasTerminated(), t.getExitCode(), null);
if (ServerAccess.PROCESS_LOG) {
ServerAccess.log(pr.stdout, true, false);
ServerAccess.log(pr.stderr, false, true);