Commit d04cb439 authored by Daniela Genius's avatar Daniela Genius

Merge branch 'master' of gitlab.enst.fr:mbe-tools/TTool

parents 74bd3a8f 86ed9cc8

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -71,7 +71,7 @@ TTOOL_PATH := $(shell /bin/pwd)
TTOOL_SRC = $(TTOOL_PATH)/src
TTOOL_WEBCRAWLER_SRC = $(TTOOL_PATH)/src/web/crawler
TTOOL_BIN = $(TTOOL_PATH)/bin
TTOOL_CLASSPATH_BINARY = $(TTOOL_BIN)/JavaPlot.jar:$(TTOOL_BIN)/commons-codec-1.10.jar:$(TTOOL_BIN)/commons-io-2.4-javadoc.jar:$(TTOOL_BIN)/commons-io-2.4.jar:$(TTOOL_BIN)/derby.jar:$(TTOOL_BIN)/derbyclient-10.9.1.0.jar:$(TTOOL_BIN)/derbynet.jar:$(TTOOL_BIN)/dom4j-1.6.1.jar:$(TTOOL_BIN)/jaxen-1.1.6.jar:$(TTOOL_BIN)/jsoup-1.8.1.jar:$(TTOOL_BIN)/opencloud.jar:$(TTOOL_BIN)/gs-core-1.3.jar:.
TTOOL_CLASSPATH_BINARY = $(TTOOL_BIN)/JavaPlot.jar:$(TTOOL_BIN)/commons-codec-1.10.jar:$(TTOOL_BIN)/commons-io-2.5-javadoc.jar:$(TTOOL_BIN)/commons-io-2.5.jar:$(TTOOL_BIN)/derby.jar:$(TTOOL_BIN)/derbyclient-10.9.1.0.jar:$(TTOOL_BIN)/derbynet.jar:$(TTOOL_BIN)/dom4j-1.6.1.jar:$(TTOOL_BIN)/jaxen-1.1.6.jar:$(TTOOL_BIN)/jsoup-1.8.1.jar:$(TTOOL_BIN)/opencloud.jar:$(TTOOL_BIN)/gs-core-1.3.jar:.
TTOOL_MODELING = $(TTOOL_PATH)/modeling
#TTOOL_MODELING = $(TTOOL_PATH)/figures
TTOOL_EXECUTABLECODE = $(TTOOL_PATH)/executablecode
......
......@@ -63,7 +63,9 @@
<ExternalCommand2Host data="localhost"/>
<ExternalCommand2 data="/packages/uppaal(4.0.11/uppaal ../uppaal/spec.xml"/>
<LastOpenFile data="/home/dblouin/Projets/TTool/git/TTool/modeling/AVATAR/CoffeeMachine_Avatar.xml"/>
<PLUGIN_JAVA_CODE_GENERATOR data="../plugins/CustomizerAvatarCodeGeneration.jar" />
<LastOpenFile data="/home/dblouin/Projets/TTool/git/TTool/modeling/DIPLODOCUS/ZigBeeDEMO.xml"/>
......
12231
\ No newline at end of file
12244
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<?xml version="1.0" encoding="ISO-8859-1"?>
<TURTLEGMODELING version="0.98-beta4">
<TURTLEGMODELING version="0.99-beta4">
<Modeling type="Avatar Analysis" nameTab="Analysis" >
<SequenceDiagramPanel name="MyScenario0" minX="10" maxX="2500" minY="10" maxY="1500" >
<COMPONENT type="301" id="17" >
<cdparam x="668" y="566" />
<sizeparam width="260" height="51" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<sizeparam width="286" height="51" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="UML Note" value="We create an overall statement based
......@@ -40,7 +40,7 @@ This &quot;creation&quot; is a a dynamic webpage
<COMPONENT type="301" id="34" >
<cdparam x="904" y="315" />
<sizeparam width="192" height="27" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<sizeparam width="209" height="27" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="UML Note" value="Creation of a token specific to
......@@ -130,7 +130,7 @@ the Banque Courtois
<SUBCOMPONENT type="602" id="43" >
<father id="93" num="0" />
<cdparam x="807" y="319" />
<sizeparam width="131" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<sizeparam width="141" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="470" />
<infoparam name="action state" value="m = {Id_BC}_BCpubK" />
......@@ -206,7 +206,7 @@ the Banque Courtois
<SUBCOMPONENT type="602" id="102" >
<father id="152" num="0" />
<cdparam x="476" y="555" />
<sizeparam width="226" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<sizeparam width="245" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="470" />
<infoparam name="action state" value="m1 = s1 + statementBanqueCourtois" />
......@@ -382,7 +382,7 @@ the Banque Courtois
<SequenceDiagramPanel name="MyScenario1" minX="10" maxX="2500" minY="10" maxY="1500" >
<COMPONENT type="301" id="231" >
<cdparam x="186" y="591" />
<sizeparam width="300" height="51" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<sizeparam width="335" height="51" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="UML Note" value="The statement of the other bank is unciphered
......@@ -416,7 +416,7 @@ Banque courtois has no access to this statement.
<COMPONENT type="301" id="248" >
<cdparam x="889" y="478" />
<sizeparam width="198" height="27" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<sizeparam width="214" height="27" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="UML Note" value="The statement is ciphered with
......@@ -446,7 +446,7 @@ the public key of the client
<COMPONENT type="301" id="265" >
<cdparam x="966" y="281" />
<sizeparam width="192" height="27" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<sizeparam width="209" height="27" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="UML Note" value="Creation of a token specific to
......@@ -536,7 +536,7 @@ the Banque Courtois
<SUBCOMPONENT type="602" id="274" >
<father id="324" num="0" />
<cdparam x="869" y="285" />
<sizeparam width="131" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<sizeparam width="141" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="470" />
<infoparam name="action state" value="m = {Id_BC}_BCpubK" />
......@@ -612,7 +612,7 @@ the Banque Courtois
<SUBCOMPONENT type="602" id="333" >
<father id="383" num="0" />
<cdparam x="538" y="521" />
<sizeparam width="216" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<sizeparam width="235" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="5" maxX="5" minY="10" maxY="470" />
<infoparam name="action state" value="m1 = s1, statementBanqueCourtois" />
......
# To test plugins:
If you want to test plugins:
$cd testPluginCodeGeneration
$make
Then, edit the configuration file of TTool (default: TTool/bin/config.xml) and add:
<PLUGIN_JAVA_CODE_GENERATOR data="../plugins/CustomizerAvatarCodeGeneration.jar" />
Then, start TTool, and generate Java code from an avatar design model.
# To create a new plugin
1) Create your plugin and put it in this directory (preferably) under a jar file
2) Add the plugin reference in config.xml
For example:
<PLUGIN_JAVA_CODE_GENERATOR data="../plugins/CustomizerAvatarCodeGeneration.jar" />
3) Load the configuration information in ConfigurationTTool.java
4) Use the plugin facility located in myutil/Plugin and myutil/PluginManager. An example on how to use the PluginManager is shown in src/avatartranslator/toexecutable/MainFile.java
/**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) {
}
}
JAVAC = javac
JAR = jar
JAR_TXT = customizer.txt
JAR_TARGET = ../CustomizerAvatarCodeGeneration.jar
all:
javac *.java
$(JAR) cmf $(JAR_TXT) $(JAR_TARGET) CustomizerAvatarJavaCodeGeneration.class
Main-Class: CustomizerAvatarJavaCodeGeneration
......@@ -46,9 +46,11 @@
* @see
*/
import myutil.FileUtils;
import myutil.TraceManager;
import ui.graph.AUTGraph;
import java.io.File;
import myutil.*;
import ui.graph.*;
public class GraphMinimize {
......
......@@ -46,11 +46,11 @@
* @see
*/
import java.io.File;
import myutil.FileUtils;
import myutil.TraceManager;
import ui.graph.AUTGraph;
import ui.graph.AUTGraph;
import java.io.File;
public class GraphShow {
......