Update on configuration and TMLTask

.idea/misc.xml

@@ -38,7 +38,7 @@
       <property name="caretWidth" class="java.lang.Integer" />
     </properties>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="1.7" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build" />
   </component>
 </project>
\ No newline at end of file

doc/config.xml

+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<TURTLECONFIGURATION>
+<DOTTYPath data="/bin/dotty" />
+<DOTTYHost data="localhost" />
+<FILEPath data="../modeling/" />
+<DownloadedFILEPath data="../modeling/" />
+<LIBPath data="../lib" />
+<IMGPath data="../figures" />
+<IMGPath data="../doc" />
+<LOTOSPath data="../lotos/" />
+<GGraphPath data="../graphs" />
+<TGraphPath data="../graphs" />
+<TToolUpdateProxy data="false" />
+<TToolUpdateProxyPort data="8080" />
+<TToolUpdateProxyHost data="To Be Completed" />
+<JavaCodeDirectory data="../javacode" />
+<JavaCompilerPath data="/usr/bin/javac" />
+<TToolClassPath data="../javacode" />
+<JavaExecutePath data="/usr/bin/java" />
+<JavaHeader data="import java.sql.*;" />
+<SystemCCodeDirectory data="../simulators/c++2/" />
+<SystemCHost data="localhost"/>
+<SystemCCodeCompileCommand data="make" />
+<SystemCCodeExecuteCommand data="../simulators/c++2/run.x -ovcd ../simulators/c++2/vcddump.vcd" />
+<SystemCCodeInteractiveExecuteCommand data="../simulators/c++2/run.x -server" />
+<TMLCodeDirectory data="../tmlcode/" />
+<GTKWavePath data="/usr/bin/gtkwave" />
+<VCDPath data="../vcd/" />
+<UPPAALCodeDirectory data="../uppaal/" />
+<UPPAALVerifierPath data="../../uppaal/bin-Linux/verifyta" />
+<UPPAALVerifierHost data="localhost" />
+<ProVerifCodeDirectory data="../proverif/" />
+<ProVerifVerifierPath data="../../proverif/proverif" />
+<ProVerifVerifierHost data="localhost" />
+<AVATARExecutableCodeDirectory data="../executablecode/" />
+<AVATARMPSoCCodeDirectory data="../MPSoC/" />
+<AVATARExecutableCodeHost data="localhost"/>
+<AVATARExecutableCodeCompileCommand data="make" />
+<AVATARExecutableCodeExecuteCommand data="run.x" />
+<AVATARExecutableSoclibCodeCompileCommand data="make -C ../executablecode updategeneratedcode compilesoclib" />
+<AVATARExecutableSoclibCodeExecuteCommand data="make -C ../executablecode runsoclib" />
+
+
+<ExternalCommand1Host data="localhost"/>
+<ExternalCommand1 data="/usr/bin/gtkwave ../simulators/c++2/vcddump.vcd"/>
+
+
+<ExternalServer data="localhost:12345"/>
+
+<LastWindowAttributes x="240" y="107" width="1414" height="777" max="false" />
+
+
+</TURTLECONFIGURATION>

doc/config_linux.xml

@@ -7,6 +7,7 @@
 <DownloadedFILEPath data="../modeling/" />
 <LIBPath data="../lib" />
 <IMGPath data="../figures" />
+<IMGPath data="../doc" />
 <LOTOSPath data="../lotos/" />
 <GGraphPath data="../graphs" />
 <TGraphPath data="../graphs" />

doc/config_macosx.xml

@@ -7,6 +7,7 @@
 <DownloadedFILEPath data="../modeling/" />
 <LIBPath data="../lib" />
 <IMGPath data="../figures" />
+<DocGenPath data="../doc" />
 <LOTOSPath data="../lotos/" />
 <GGraphPath data="../graphs" />
 <TGraphPath data="../graphs" />

doc/config_windows.xml

@@ -7,6 +7,7 @@
 <DownloadedFILEPath data="../modeling/" />
 <LIBPath data="../lib" />
 <IMGPath data="../figures" />
+<DocGenPath data="../doc" />
 <LOTOSPath data="../lotos/" />
 <GGraphPath data="../graphs" />
 <TGraphPath data="../graphs" />

src/main/java/common/ConfigurationTTool.java

@@ -83,7 +83,7 @@ public class ConfigurationTTool {
     public static String LOTOSPath = "";
     public static String LIBPath = "";
     public static String IMGPath = "";
-    public static String DocGenPath = "";
+    public static String DocGenPath = ".";
     public static String GGraphPath = "";
     public static String TGraphPath = "";
     public static String TToolUpdateURL = "";

src/main/java/tmltranslator/TMLTask.java

@@ -51,15 +51,18 @@ import java.util.*;
  */
 public class TMLTask extends TMLElement {
     private TMLActivity activity;
+
     private boolean isRequested = false;
     private TMLRequest request;
     private List<TMLAttribute> attributes;
     private boolean mustExit = false;
     private int priority;
+
     private Set<TMLChannel> channelsList;
     private Set<TMLChannel> readTMLChannelsList;
     private Set<TMLChannel> writeTMLChannelsList;
     private Set<TMLEvent> eventsList;
+
     private int operationType;
 	private boolean isAttacker;