diff --git a/de.prob.core/src/de/prob/core/internal/ServerConnection.java b/de.prob.core/src/de/prob/core/internal/ServerConnection.java index 5488c452ef929bf51d05d5279a84cd041498d525..8f7db95c2df2765f76bdd454a7b92a690399145f 100644 --- a/de.prob.core/src/de/prob/core/internal/ServerConnection.java +++ b/de.prob.core/src/de/prob/core/internal/ServerConnection.java @@ -27,22 +27,12 @@ public class ServerConnection { private CliStarter cli = null; - private String lastCommand; - private volatile boolean shutdown = true; - // private static final ScheduledExecutorService exec = new - // ScheduledThreadPoolExecutor( - // 1); - private void startcli(final File file) throws CliException { cli = new CliStarter(file); } - public String getLastCommand() { - return lastCommand; - } - private void establishConnection(final int port) throws CliException { try { socket = new Socket(InetAddress.getByName(null), port); @@ -75,7 +65,6 @@ public class ServerConnection { } private void sendQuery(final String commandString) throws ProBException { - lastCommand = commandString; Logger.assertProB("commandString.trim().endsWith(\".\")", commandString .trim().endsWith(".")); @@ -99,24 +88,6 @@ public class ServerConnection { return input; } - // private String timedRun(final Callable<String> r, final long timeOut, - // final TimeUnit unit) throws InterruptedException, ProBException { - // String s = null; - // Future<String> task = exec.submit(r); - // try { - // s = task.get(timeOut, unit); - // } catch (TimeoutException e) { - // final String message = "Timeout while waiting for ProB's answer"; - // ProblemHandler.handleCliException(message, e); - // } catch (ExecutionException e) { - // final String message = e.getCause().getLocalizedMessage(); - // ProblemHandler.handleCliException(message, e.getCause()); - // } finally { - // task.cancel(true); - // } - // return s; - // } - protected String readAnswer() throws IOException { final StringBuilder result = new StringBuilder(); final byte[] buffer = new byte[1024]; @@ -190,10 +161,6 @@ public class ServerConnection { } } - public int getCliPortNumber() { - return cli.getPort(); - } - public void sendUserInterruptSignal() { if (cli != null) { cli.sendUserInterruptReference();