diff --git a/bin/config.xml b/bin/config.xml index d3d6c5cd16fb90cd74d1aa58869bb67a99c54e21..0458862dbbec46edeef4269f5f223173c8f7e5b5 100755 --- a/bin/config.xml +++ b/bin/config.xml @@ -63,6 +63,8 @@ <ExternalCommand2Host data="localhost"/> <ExternalCommand2 data="/packages/uppaal(4.0.11/uppaal ../uppaal/spec.xml"/> +<PLUGIN_JAVA_CODE_GENERATOR data="../plugins/CustomizerAvatarCodeGeneration.jar" /> + <LastOpenFile data="/home/dblouin/Projets/TTool/git/TTool/modeling/AVATAR/CoffeeMachine_Avatar.xml"/> diff --git a/plugins/testPluginCodeGeneration/CustomizerAvatarJavaCodeGeneration.java b/plugins/testPluginCodeGeneration/CustomizerAvatarJavaCodeGeneration.java new file mode 100644 index 0000000000000000000000000000000000000000..dbcfc2dd81c95aed5ac617cb793cb551d3029072 --- /dev/null +++ b/plugins/testPluginCodeGeneration/CustomizerAvatarJavaCodeGeneration.java @@ -0,0 +1,53 @@ +/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille +* +* ludovic.apvrille AT enst.fr +* +* This software is a computer program whose purpose is to allow the +* edition of TURTLE analysis, design and deployment diagrams, to +* allow the generation of RT-LOTOS or Java code from this diagram, +* and at last to allow the analysis of formal validation traces +* obtained from external tools, e.g. RTL from LAAS-CNRS and CADP +* from INRIA Rhone-Alpes. +* +* This software is governed by the CeCILL license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL +* license as circulated by CEA, CNRS and INRIA at the following URL +* "http://www.cecill.info". +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited +* liability. +* +* In this respect, the user's attention is drawn to the risks associated +* with loading, using, modifying and/or developing or reproducing the +* software by the user in light of its specific status of free software, +* that may mean that it is complicated to manipulate, and that also +* therefore means that it is reserved for developers and experienced +* professionals having in-depth computer knowledge. Users are therefore +* encouraged to load and test the software's suitability as regards their +* requirements in conditions enabling the security of their systems and/or +* data to be ensured and, more generally, to use and operate it in the +* same conditions as regards security. +* +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL license and that you accept its terms. +* +* /** +* Class CustomizerAvatarJavaCodeGeneration +* Creation: 23/05/2017 +* @version 1.0 23/05/2017 +* @author Ludovic APVRILLE +* @see +*/ + + public class CustomizerAvatarJavaCodeGeneration { + public static String getMainDeclaration() { + return ("/* This is the main *\nint main(int argc, char *argv[]) {\n"); + } + + public static void main(String[] args) { + } + } diff --git a/plugins/testPluginCodeGeneration/Makefile b/plugins/testPluginCodeGeneration/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..0f0a835cd731cd12e6be4579a00658de9cbfdde1 --- /dev/null +++ b/plugins/testPluginCodeGeneration/Makefile @@ -0,0 +1,8 @@ +JAVAC = javac +JAR = jar +JAR_TXT = customizer.txt +JAR_TARGET = ../CustomizerAvatarCodeGeneration.jar + +all: + javac *.java + $(JAR) cmf $(JAR_TXT) $(JAR_TARGET) CustomizerAvatarJavaCodeGeneration.class diff --git a/src/myutil/BoolExpressionEvaluator.java b/src/myutil/BoolExpressionEvaluator.java index 7e8e2bdc13db0248822dad85c4240c58fbb904db..2ee9572f098b76b21e8545e5be955eb128b25184 100755 --- a/src/myutil/BoolExpressionEvaluator.java +++ b/src/myutil/BoolExpressionEvaluator.java @@ -1705,12 +1705,10 @@ public class BoolExpressionEvaluator { public IntBoolRes parseAndMakeTree(IntBoolRes current, String token) { ID = 0; IntBoolRes newElt; - //TraceManager.addDev(current.getTop().toString()); //TraceManager.addDev("<><><><><><> Dealing with token:" + token + " current=" + current); - char c1 = token.charAt(0); // Space symbol