diff --git a/src/main/java/de/b2tla/B2TLA.java b/src/main/java/de/b2tla/B2TLA.java index 09066df215c810717dc8a157f63639788d574903..15a896e2ab3c4641435ccdec5d4338390a28b4c9 100644 --- a/src/main/java/de/b2tla/B2TLA.java +++ b/src/main/java/de/b2tla/B2TLA.java @@ -121,12 +121,12 @@ public class B2TLA { TLCResults results = new TLCResults(b2tla.tlcOutputInfo); results.evalResults(); TLCResult result = results.getTLCResult(); - System.out.println("Result: " + result); + //System.out.println("Result: " + result); - //b2tla.printResults(results, B2TLAGlobals.isCreateTraceFile()); - //System.exit(0); + b2tla.printResults(results, B2TLAGlobals.isCreateTraceFile()); + System.exit(0); } - //System.exit(1); + System.exit(1); } diff --git a/src/main/java/de/b2tla/TLCRunner.java b/src/main/java/de/b2tla/TLCRunner.java index 824ff3dc3835161b247662a5e5ec69a7b9193255..e23483374e00f52c09dd2479ae87fd5d2524fd26 100644 --- a/src/main/java/de/b2tla/TLCRunner.java +++ b/src/main/java/de/b2tla/TLCRunner.java @@ -85,14 +85,14 @@ public class TLCRunner { return stdOut.getLog(); } - public static ArrayList<String> runTLC(String machineName, String path) { + public static void runTLC(String machineName, String path) { System.out.println("--------------------------------"); - BTLCPrintStream btlcStream = new BTLCPrintStream(); - PrintStream systemOut = System.out; + //BTLCPrintStream btlcStream = new BTLCPrintStream(); + //PrintStream systemOut = System.out; //System.setErr(btlcStream); - System.setOut(btlcStream); + //System.setOut(btlcStream); ToolIO.setMode(ToolIO.SYSTEM); ArrayList<String> list = new ArrayList<String>(); @@ -110,8 +110,6 @@ public class TLCRunner { ToolIO.setUserDir(path); String[] args = list.toArray(new String[list.size()]); - - TLC tlc = new TLC(); // handle parameters @@ -124,16 +122,12 @@ public class TLCRunner { } } - - - System.setOut(systemOut); - - - ArrayList<String> messages = btlcStream.getArrayList(); + //System.setOut(systemOut); + //ArrayList<String> messages = btlcStream.getArrayList(); System.out.println("--------------------------------"); closeThreads(); - return messages; + //return messages; } private static void closeThreads() { diff --git a/src/main/java/de/b2tla/util/BTLCPrintStream.java b/src/main/java/de/b2tla/util/BTLCPrintStream.java index ed3fc87aaab2ad28a9bd11a1ba2586e984edf3ba..33592cd8088fa62f494f5f88caf3d3cc1e760d0f 100644 --- a/src/main/java/de/b2tla/util/BTLCPrintStream.java +++ b/src/main/java/de/b2tla/util/BTLCPrintStream.java @@ -32,7 +32,7 @@ public class BTLCPrintStream extends PrintStream { public void println(String str){ synchronized (BTLCPrintStream.class){ if(!B2TLAGlobals.isTool()){ - console.println(str); + //console.println(str); } array.add(str); } @@ -44,7 +44,7 @@ public class BTLCPrintStream extends PrintStream { if(!B2TLAGlobals.isTool()){ console.println(str); } - console.println(str); + //console.println(str); array.add(str); } } @@ -52,7 +52,7 @@ public class BTLCPrintStream extends PrintStream { @Override public void print(Object obj){ synchronized (BTLCPrintStream.class){ - console.println(obj.toString()); + //console.println(obj.toString()); array.add(obj.toString()); } } diff --git a/src/test/java/de/b2tla/util/TestUtil.java b/src/test/java/de/b2tla/util/TestUtil.java index 84b18c2ff676c1a94040f9d87b01764c8c33616e..282eb7843357b884e714350e8db8c48a4c5e86ff 100644 --- a/src/test/java/de/b2tla/util/TestUtil.java +++ b/src/test/java/de/b2tla/util/TestUtil.java @@ -173,9 +173,9 @@ public class TestUtil { e.printStackTrace(); } - for (int i = stdOut.getLog().size()-1; i > 1 ; i--) { String s = stdOut.getLog().get(i); + //System.out.println(s); if(s.startsWith("Result:")){ String resultString = s.substring(s.indexOf(':') + 2); System.out.println(resultString); @@ -184,6 +184,7 @@ public class TestUtil { return TLCResult.valueOf(resultString); } } + System.out.println("No result found."); return null; }