From 20fbf7e2de28233fa6770de2870f7eaa57f22ff4 Mon Sep 17 00:00:00 2001
From: hansen <dominik_hansen@web.de>
Date: Tue, 12 May 2015 17:18:55 +0200
Subject: [PATCH] adapted code to the new TLC interface
---
src/main/java/de/tlc4b/TLCRunner.java | 10 +++++++++-
src/test/java/de/tlc4b/util/TestUtil.java | 12 +++---------
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/main/java/de/tlc4b/TLCRunner.java b/src/main/java/de/tlc4b/TLCRunner.java
index 0838dff..8be4aad 100644
--- a/src/main/java/de/tlc4b/TLCRunner.java
+++ b/src/main/java/de/tlc4b/TLCRunner.java
@@ -2,9 +2,11 @@ package de.tlc4b;
import java.io.BufferedReader;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
@@ -27,7 +29,13 @@ public class TLCRunner {
for (int i = 0; i < parameters.length; i++) {
parameters[i] = args[i + 1];
}
- TLC.main(parameters);
+ try {
+ TLC.main(parameters);
+ } catch (UnknownHostException e) {
+ e.printStackTrace();
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ }
}
private static Process startJVM(final String optionsAsString,
diff --git a/src/test/java/de/tlc4b/util/TestUtil.java b/src/test/java/de/tlc4b/util/TestUtil.java
index 58f66e0..dcbfc4c 100644
--- a/src/test/java/de/tlc4b/util/TestUtil.java
+++ b/src/test/java/de/tlc4b/util/TestUtil.java
@@ -5,7 +5,6 @@ import static org.junit.Assert.fail;
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -15,15 +14,10 @@ import java.util.List;
import de.be4.classicalb.core.parser.exceptions.BException;
import de.be4.classicalb.core.parser.node.Start;
-import de.tla2b.exceptions.FrontEndException;
import de.tla2b.exceptions.TLA2BException;
-import de.tla2b.output.ASTPrettyPrinter;
-import de.tla2b.output.Renamer;
import de.tlc4b.TLC4B;
import de.tlc4b.TLC4BGlobals;
-import de.tlc4b.TLCRunner;
import de.tlc4b.Translator;
-import de.tlc4b.tlc.TLCResults;
import de.tlc4b.tlc.TLCResults.TLCResult;
public class TestUtil {
@@ -75,7 +69,7 @@ public class TestUtil {
Translator b2tlaTranslator = new Translator(machine, ltlFormula);
b2tlaTranslator.translate();
System.out.println(b2tlaTranslator.getModuleString());
- String name = b2tlaTranslator.getMachineName();
+ // String name = b2tlaTranslator.getMachineName();
// de.tla2b.translation.Tla2BTranslator.translateString(name,
// b2tlaTranslator.getModuleString(), null);
assertEquals(expectedModule, b2tlaTranslator.getModuleString());
@@ -87,7 +81,7 @@ public class TestUtil {
System.out.println(b2tlaTranslator.getModuleString());
String name = b2tlaTranslator.getMachineName();
- String str1 = translateTLA2B(name, b2tlaTranslator.getModuleString());
+ translateTLA2B(name, b2tlaTranslator.getModuleString());
// de.tla2b.translation.Tla2BTranslator.translateString(name,
// b2tlaTranslator.getModuleString(), null);
}
@@ -124,7 +118,7 @@ public class TestUtil {
System.out.println(b2tlaTranslator.getModuleString());
System.out.println(b2tlaTranslator.getConfigString());
- String name = b2tlaTranslator.getMachineName();
+ // String name = b2tlaTranslator.getMachineName();
// StringBuilder sb1 = de.tla2b.translation.Tla2BTranslator
// .translateString(name, b2tlaTranslator.getModuleString(),
// b2tlaTranslator.getConfigString());
--
GitLab