diff --git a/de.prob.core/src/de/prob/cli/CliStarter.java b/de.prob.core/src/de/prob/cli/CliStarter.java index 5890e08e7cf19c1bc12483e6873aa615e5bb576d..fa9b381b8afad892af541a5aca878f0aa0116289 100644 --- a/de.prob.core/src/de/prob/cli/CliStarter.java +++ b/de.prob.core/src/de/prob/cli/CliStarter.java @@ -8,7 +8,6 @@ package de.prob.cli; import java.io.*; import java.net.*; -import java.security.*; import java.util.*; import org.eclipse.core.filesystem.EFS; @@ -26,7 +25,6 @@ public final class CliStarter { "ParserAspects.jar", "aspectjrt.jar", "prolog.jar" }; private Process prologProcess; - private String debuggingKey; private int port = -1; private Long userInterruptReference = null; @@ -59,10 +57,6 @@ public final class CliStarter { } } - public String getDebuggingKey() { - return debuggingKey; - } - // Based on org.eventb.core.seqprover.xprover.BundledFileExtractor.BundledFileDescriptor#makeExecutable // (from rodin-b-sharp/rodincore/org.eventb.core.seqprover) private void setExecutable(final File path, final boolean executable) throws CliException { @@ -78,7 +72,6 @@ public final class CliStarter { private void startProlog(final File file) throws CliException { prologProcess = null; - debuggingKey = null; final String os = Platform.getOS(); final File applicationPath = getCliPath(); @@ -110,11 +103,8 @@ public final class CliStarter { command.add(file.getAbsolutePath()); } - createDebuggingKey(); - final ProcessBuilder pb = new ProcessBuilder(); pb.command(command); - pb.environment().put("PROB_DEBUGGING_KEY", debuggingKey); pb.environment().put("TRAILSTKSIZE", "1M"); pb.environment().put("PROLOGINCSIZE", "50M"); pb.environment().put("PROB_HOME", osPath); @@ -213,16 +203,6 @@ public final class CliStarter { errLogger.start(); } - private void createDebuggingKey() { - Random random; - try { - random = SecureRandom.getInstance("SHA1PRNG"); - } catch (NoSuchAlgorithmException e) { - random = new Random(); - } - debuggingKey = Long.toHexString(random.nextLong()); - } - private void analyseStdout(final BufferedReader input, Collection<? extends CliPattern<?>> patterns) throws CliException { patterns = new ArrayList<CliPattern<?>>(patterns); diff --git a/de.prob.core/src/de/prob/core/Animator.java b/de.prob.core/src/de/prob/core/Animator.java index e9b4566400a2b243093ca6bbfc7574a26d3c3f25..1d49c94b2ecf95be9d2399d2d66bd8f93285d341 100644 --- a/de.prob.core/src/de/prob/core/Animator.java +++ b/de.prob.core/src/de/prob/core/Animator.java @@ -322,10 +322,6 @@ public final class Animator { return getImplementation().isMachineLoaded(); } - public String getDebuggingKey() { - return getImplementation().getDebuggingKey(); - } - public LanguageDependendAnimationPart getLanguageDependendPart() { return getImplementation().getLangdep(); } diff --git a/de.prob.core/src/de/prob/core/IServerConnection.java b/de.prob.core/src/de/prob/core/IServerConnection.java index 45e7155f87a5b2b687d15a1e56afb80650d3bd6c..5b7dc30444cfc344f2a5c36be818110047fa76ba 100644 --- a/de.prob.core/src/de/prob/core/IServerConnection.java +++ b/de.prob.core/src/de/prob/core/IServerConnection.java @@ -43,7 +43,5 @@ public interface IServerConnection { public abstract void startup(File file) throws CliException; - String getDebuggingKey(); - void sendUserInterruptSignal(); } \ No newline at end of file diff --git a/de.prob.core/src/de/prob/core/internal/AnimatorImpl.java b/de.prob.core/src/de/prob/core/internal/AnimatorImpl.java index d0932e6d54dd3cd732ae9dc7f0c7a03954af7111..639180e70eb1f2ba2ec190354abab376ef2aa2ea 100644 --- a/de.prob.core/src/de/prob/core/internal/AnimatorImpl.java +++ b/de.prob.core/src/de/prob/core/internal/AnimatorImpl.java @@ -145,10 +145,6 @@ public class AnimatorImpl { return this.description != null; } - public synchronized String getDebuggingKey() { - return connector == null ? null : connector.getDebuggingKey(); - } - public void execute(final IComposableCommand command) throws ProBException { checkConnector(command.getClass().getName()); 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 3809881c60ff4efd5bd51c2a2d9117e6eee4ad52..67bbd193f3ce0d40426967c675570543a1bb1a54 100644 --- a/de.prob.core/src/de/prob/core/internal/ServerConnection.java +++ b/de.prob.core/src/de/prob/core/internal/ServerConnection.java @@ -50,11 +50,6 @@ public class ServerConnection implements IServerConnection { return lastCommand; } - @Override - public String getDebuggingKey() { - return cli == null ? null : cli.getDebuggingKey(); - } - private void establishConnection(final int port) throws CliException { try { socket = new Socket(InetAddress.getByName(null), port);