diff --git a/build.gradle b/build.gradle index 009dfcf466567ed7c321048fab20484b43ad10e4..c99ac0a4c4983f42f39c208009f51022fc2c69da 100644 --- a/build.gradle +++ b/build.gradle @@ -100,11 +100,14 @@ signing { sign configurations.archives } +javadoc { + failOnError = false +} -//task javadocJar(type: Jar) { -// classifier = 'javadoc' -// from javadoc -//} +task javadocJar(type: Jar) { + classifier = 'javadoc' + from javadoc +} task sourcesJar(type: Jar) { classifier = 'sources' diff --git a/src/main/java/de/tla2b/analysis/InstanceTransformation.java b/src/main/java/de/tla2b/analysis/InstanceTransformation.java index c8987c0997f9f243cf1919dbdda6e6e433c58571..e8ab4c5b0da06d2937ac603bf05313184814bb4c 100644 --- a/src/main/java/de/tla2b/analysis/InstanceTransformation.java +++ b/src/main/java/de/tla2b/analysis/InstanceTransformation.java @@ -35,11 +35,10 @@ public class InstanceTransformation extends BuiltInOPs implements ASTConstants { /** - * @param con + * @param moduleNode */ - public InstanceTransformation(ModuleNode n) { - defs = n.getOpDefs(); - + public InstanceTransformation(ModuleNode moduleNode) { + defs = moduleNode.getOpDefs(); defsHash = new Hashtable<String, OpDefNode>(); for (int i = 0; i < defs.length; i++) { OpDefNode def = defs[i]; @@ -47,10 +46,6 @@ public class InstanceTransformation extends BuiltInOPs implements ASTConstants { } } - /** - * @throws AbortException - * - */ public void start() { for (int i = 0; i < defs.length; i++) { OpDefNode def = defs[i]; diff --git a/src/main/java/de/tla2b/analysis/SymbolRenamer.java b/src/main/java/de/tla2b/analysis/SymbolRenamer.java index af5d946f4998a5efa975fe3b9014bfac8c274a0e..0471c862499adaabe7887f9a8574c761c5981af9 100644 --- a/src/main/java/de/tla2b/analysis/SymbolRenamer.java +++ b/src/main/java/de/tla2b/analysis/SymbolRenamer.java @@ -124,7 +124,7 @@ public class SymbolRenamer extends BuiltInOPs implements TranslationGlobals, private Hashtable<OpDefNode, Set<String>> usedNamesTable = new Hashtable<OpDefNode, Set<String>>(); /** - * @param moduleNode2 + * @param moduleNode * @param specAnalyser */ public SymbolRenamer(ModuleNode moduleNode, SpecAnalyser specAnalyser) { diff --git a/src/main/java/de/tla2b/analysis/TypeChecker.java b/src/main/java/de/tla2b/analysis/TypeChecker.java index c742b5f730e33c0075587e9f0cb101cbf7b0ccf8..2a7463b92f013bc6f7fd5e5227efdf20a1980efd 100644 --- a/src/main/java/de/tla2b/analysis/TypeChecker.java +++ b/src/main/java/de/tla2b/analysis/TypeChecker.java @@ -64,7 +64,7 @@ public class TypeChecker extends BuiltInOPs implements ASTConstants, BBuildIns, private ConfigfileEvaluator conEval; /** - * @param moduleNode2 + * @param moduleNode * @param conEval * @param specAnalyser */ diff --git a/src/main/java/de/tla2b/config/ModuleOverrider.java b/src/main/java/de/tla2b/config/ModuleOverrider.java index 477db1ef0b5e819e8a1ad353782f19b4f41d854f..40b92b254de36eaa91b40aeba64230fac193c673 100644 --- a/src/main/java/de/tla2b/config/ModuleOverrider.java +++ b/src/main/java/de/tla2b/config/ModuleOverrider.java @@ -41,7 +41,7 @@ public class ModuleOverrider extends BuiltInOPs implements ASTConstants { } /** - * @param moduleNode2 + * @param moduleNode * @param conEval */ public ModuleOverrider(ModuleNode moduleNode, ConfigfileEvaluator conEval) { diff --git a/src/main/java/de/tla2b/config/TLCValueNode.java b/src/main/java/de/tla2b/config/TLCValueNode.java index 7f47a062423b0f1e7a30e21812e2f0f6fa836db1..f8d9d0e9b0295e520073a9de1c2aaee4c515cbe4 100644 --- a/src/main/java/de/tla2b/config/TLCValueNode.java +++ b/src/main/java/de/tla2b/config/TLCValueNode.java @@ -17,7 +17,7 @@ public class TLCValueNode extends NumeralNode implements TranslationGlobals { private TLAType type; /** - * @param kind + * @param valObj * @param stn * @throws AbortException */ diff --git a/src/test/java/de/tla2b/util/TestUtil.java b/src/test/java/de/tla2b/util/TestUtil.java index 280953886818616a20bd788c26bf076738e504bb..bed39e6b08c32cf9355fbeadae61cfde8dcfc768 100644 --- a/src/test/java/de/tla2b/util/TestUtil.java +++ b/src/test/java/de/tla2b/util/TestUtil.java @@ -54,7 +54,7 @@ public class TestUtil { System.out.println("-------------------"); // compare the generated AST and the AST of the pretty print - //assertEquals(result, ppResult); + // assertEquals(result, ppResult); // System.out.println(t.getBDefinitions().getDefinitionNames()); } @@ -199,20 +199,20 @@ public class TestUtil { final String string = ast2String.toString(); return string; } - - public static void load_TLA_File(String tlaFile) throws Exception{ + + public static void load_TLA_File(String tlaFile) throws Exception { Api api = de.prob.Main.getInjector().getInstance(Api.class); - //TODO translate here and then pass the AST to api + // TODO translate here and then pass the AST to api // Currently B definitions are not recognized by the api load command -// Translator t = new Translator(tlaFile); -// Start start = t.translate(); -// ASTPrettyPrinter aP = new ASTPrettyPrinter(start); -// start.apply(aP); -// System.out.println(aP.getResultString()); + // Translator t = new Translator(tlaFile); + // Start start = t.translate(); + // ASTPrettyPrinter aP = new ASTPrettyPrinter(start); + // start.apply(aP); + // System.out.println(aP.getResultString()); + // StateSpace stateSpace = api.b_load(start); - //StateSpace stateSpace = api.b_load(start); StateSpace stateSpace = api.tla_load(tlaFile); - Trace trace= new Trace(stateSpace); + Trace trace = new Trace(stateSpace); Set<Transition> nextTransitions = trace.getNextTransitions(); assertTrue(nextTransitions.size() > 0); }