Commit fc393cbb authored by Florian Lugou's avatar Florian Lugou

fixed problem in Makefile with javadoc

parent ed12c969
...@@ -156,7 +156,7 @@ $(JTTOOL_BINARY): FORCE ...@@ -156,7 +156,7 @@ $(JTTOOL_BINARY): FORCE
TTOOL_DOC = $(TTOOL_PATH)/doc TTOOL_DOC = $(TTOOL_PATH)/doc
export TTOOL_DOC_HTML = $(TTOOL_DOC)/html export TTOOL_DOC_HTML = $(TTOOL_DOC)/html
DOCFLAGS = $(GLOBAL_CFLAGS) -quiet -J-Xmx256m -classpath $(TTOOL_CLASSPATH) -d $(TTOOL_DOC_HTML) DOCFLAGS = -encoding "UTF8" -quiet -J-Xmx256m -classpath $(TTOOL_CLASSPATH) -d $(TTOOL_DOC_HTML)
documentation: $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA)) documentation: $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA))
@echo "$(PREFIX) Generating Javadoc" @echo "$(PREFIX) Generating Javadoc"
......
...@@ -86,8 +86,8 @@ public class AvatarLibraryFunctionCall extends AvatarStateMachineElement { ...@@ -86,8 +86,8 @@ public class AvatarLibraryFunctionCall extends AvatarStateMachineElement {
* @param referenceObject * @param referenceObject
* The graphical element that this function is related to. * The graphical element that this function is related to.
*/ */
public AvatarLibraryFunctionCall (String _name, AvatarLibraryFunction libraryFunction, Object _referenceObject) { public AvatarLibraryFunctionCall (String name, AvatarLibraryFunction libraryFunction, Object referenceObject) {
super(_name, _referenceObject); super(name, referenceObject);
this.libraryFunction = libraryFunction; this.libraryFunction = libraryFunction;
this.counter = this.libraryFunction.getCounter(); this.counter = this.libraryFunction.getCounter();
......
/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille /* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
ludovic.apvrille AT enst.fr ludovic.apvrille AT enst.fr
...@@ -34,23 +34,23 @@ ...@@ -34,23 +34,23 @@
The fact that you are presently reading this means that you have had The fact that you are presently reading this means that you have had
knowledge of the CeCILL license and that you accept its terms. knowledge of the CeCILL license and that you accept its terms.
/**
* Class AvatarStateMachine
* State machine, with composite states
* Creation: 20/05/2010
* @version 1.0 20/05/2010
* @author Ludovic APVRILLE
* @see
*/ */
package avatartranslator; package avatartranslator;
import myutil.TraceManager; import myutil.TraceManager;
import java.util.*; import java.util.*;
/**
* Class AvatarStateMachine
* State machine, with composite states
* Creation: 20/05/2010
* @version 1.0 20/05/2010
* @author Ludovic APVRILLE
*/
public class AvatarStateMachine extends AvatarElement { public class AvatarStateMachine extends AvatarElement {
// to be used by code generator for fast access to states // to be used by code generator for fast access to states
public AvatarStateElement [] allStates; public AvatarStateElement [] allStates;
...@@ -1518,8 +1518,8 @@ public class AvatarStateMachine extends AvatarElement { ...@@ -1518,8 +1518,8 @@ public class AvatarStateMachine extends AvatarElement {
/** /**
* Removes all function calls by inlining them. * Removes all function calls by inlining them.
* *
* @param avspec * @param block
* The specification used to query library functions. * The block from which library function calls should be removed.
*/ */
public void removeLibraryFunctionCalls (AvatarBlock block) { public void removeLibraryFunctionCalls (AvatarBlock block) {
/* Perform BFS for AvatarLibraryFunctionCall elements. When one is found, replace it by the state machine and fix the links */ /* Perform BFS for AvatarLibraryFunctionCall elements. When one is found, replace it by the state machine and fix the links */
...@@ -1594,7 +1594,7 @@ public class AvatarStateMachine extends AvatarElement { ...@@ -1594,7 +1594,7 @@ public class AvatarStateMachine extends AvatarElement {
* @param block * @param block
* The block containing the state machine * The block containing the state machine
*/ */
public void removeEmptyTransitions (AvatarBlock _block, boolean _canOptimize) { public void removeEmptyTransitions (AvatarBlock block, boolean _canOptimize) {
TraceManager.addDev("Remove empty transitions with optimize=" + _canOptimize); TraceManager.addDev("Remove empty transitions with optimize=" + _canOptimize);
...@@ -1645,7 +1645,7 @@ public class AvatarStateMachine extends AvatarElement { ...@@ -1645,7 +1645,7 @@ public class AvatarStateMachine extends AvatarElement {
foundState2.addReferenceObjectFrom(foundState1); foundState2.addReferenceObjectFrom(foundState1);
} }
removeEmptyTransitions(_block, _canOptimize); removeEmptyTransitions(block, _canOptimize);
} }
} }
......
...@@ -54,7 +54,7 @@ public interface AvatarStateMachineOwner { ...@@ -54,7 +54,7 @@ public interface AvatarStateMachineOwner {
/** /**
* Look for an attribute in the list of local attributes, parameters and return values. * Look for an attribute in the list of local attributes, parameters and return values.
* *
* @param name * @param attributeName
* The name of the attribute to look for. * The name of the attribute to look for.
* *
* @return The corresponding attribute if found, null otherwise. * @return The corresponding attribute if found, null otherwise.
......
/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille /* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
* *
* ludovic.apvrille AT enst.fr * ludovic.apvrille AT enst.fr
* *
...@@ -34,13 +34,6 @@ ...@@ -34,13 +34,6 @@
* *
* The fact that you are presently reading this means that you have had * The fact that you are presently reading this means that you have had
* knowledge of the CeCILL license and that you accept its terms. * knowledge of the CeCILL license and that you accept its terms.
*
* /**
* Class ConfigurationTTool
* Creation: 21/12/2003
* Version 1.0
* @author Ludovic APVRILLE
* @see
*/ */
package myutil; package myutil;
...@@ -60,10 +53,10 @@ import java.io.FileOutputStream; ...@@ -60,10 +53,10 @@ import java.io.FileOutputStream;
//import org.xml.sax.*; //import org.xml.sax.*;
/** /**
* Class * Class ConfigurationTTool
* * Creation: 21/12/2003
* Version 1.0
* @author Ludovic APVRILLE * @author Ludovic APVRILLE
* @see
*/ */
public class ConfigurationTTool { public class ConfigurationTTool {
......
/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille /* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
ludovic.apvrille AT enst.fr ludovic.apvrille AT enst.fr
...@@ -34,26 +34,26 @@ ...@@ -34,26 +34,26 @@
The fact that you are presently reading this means that you have had The fact that you are presently reading this means that you have had
knowledge of the CeCILL license and that you accept its terms. knowledge of the CeCILL license and that you accept its terms.
/**
* Class ImageManager
* Creation: 31/05/2017
* @version 1.1 31/05/2017
* @author Ludovic APVRILLE
* @see
*/ */
package myutil; package myutil;
import java.awt.*; import java.awt.*;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
/**
* Class ImageManager
* Creation: 31/05/2017
* @version 1.1 31/05/2017
* @author Ludovic APVRILLE
*/
public final class ImageManager { public final class ImageManager {
/** /**
* Resizes an image using a Graphics2D object backed by a BufferedImage. * Resizes an image using a Graphics2D object backed by a BufferedImage.
* @param srcImg - source image to scale * @param src - source image to scale
* @param w - desired width * @param w - desired width
* @param h - desired height * @param h - desired height
* @return - the new resized image * @return - the new resized image
......
package myutil.externalSearch; package myutil.externalSearch;
/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille /* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
ludovic.apvrille AT enst.fr ludovic.apvrille AT enst.fr
...@@ -36,6 +36,7 @@ package myutil.externalSearch; ...@@ -36,6 +36,7 @@ package myutil.externalSearch;
The fact that you are presently reading this means that you have had The fact that you are presently reading this means that you have had
knowledge of the CeCILL license and that you accept its terms. knowledge of the CeCILL license and that you accept its terms.
*/
/** /**
* JDialogSearchBox * JDialogSearchBox
...@@ -43,7 +44,6 @@ package myutil.externalSearch; ...@@ -43,7 +44,6 @@ package myutil.externalSearch;
* Creation: 12/03/2015 * Creation: 12/03/2015
* @version 1.0 11/03/2015 * @version 1.0 11/03/2015
* @author Huy TRUONG * @author Huy TRUONG
* @see
*/ */
public class Record { public class Record {
private String summary; private String summary;
......
...@@ -34,24 +34,16 @@ same conditions as regards security. ...@@ -34,24 +34,16 @@ same conditions as regards security.
The fact that you are presently reading this means that you have had The fact that you are presently reading this means that you have had
knowledge of the CeCILL license and that you accept its terms. knowledge of the CeCILL license and that you accept its terms.
*/
/**
* Class CDElement
* Creation : 22/12/2003
* @author Ludovic APVRILLE
* @see
*/
package ui; package ui;
/** /**
* Interface CDElement * Interface CDElement
* * Creation : 22/12/2003
* @author Ludovic APVRILLE * @author Ludovic APVRILLE
* @see
*/ */
public interface CDElement { public interface CDElement {
int getX(); int getX();
int getY(); int getY();
......
...@@ -34,12 +34,6 @@ ...@@ -34,12 +34,6 @@
* *
* The fact that you are presently reading this means that you have had * The fact that you are presently reading this means that you have had
* knowledge of the CeCILL license and that you accept its terms. * knowledge of the CeCILL license and that you accept its terms.
*
* /**
* Class IconManager
* Creation: 15/12/2003
* @author Ludovic APVRILLE
* @see
*/ */
package ui; package ui;
...@@ -49,10 +43,9 @@ import myutil.GraphicLib; ...@@ -49,10 +43,9 @@ import myutil.GraphicLib;
import java.awt.*; import java.awt.*;
/** /**
* Class * Class IconManager
* * Creation: 15/12/2003
* @author Ludovic APVRILLE * @author Ludovic APVRILLE
* @see
*/ */
public class ColorManager { public class ColorManager {
......
/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille /**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
ludovic.apvrille AT enst.fr * ludovic.apvrille AT enst.fr
*
This software is a computer program whose purpose is to allow the * This software is a computer program whose purpose is to allow the
edition of TURTLE analysis, design and deployment diagrams, to * edition of TURTLE analysis, design and deployment diagrams, to
allow the generation of RT-LOTOS or Java code from this diagram, * allow the generation of RT-LOTOS or Java code from this diagram,
and at last to allow the analysis of formal validation traces * and at last to allow the analysis of formal validation traces
obtained from external tools, e.g. RTL from LAAS-CNRS and CADP * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
from INRIA Rhone-Alpes. * from INRIA Rhone-Alpes.
*
This software is governed by the CeCILL license under French law and * This software is governed by the CeCILL license under French law and
abiding by the rules of distribution of free software. You can use, * abiding by the rules of distribution of free software. You can use,
modify and/ or redistribute the software under the terms of the CeCILL * modify and/ or redistribute the software under the terms of the CeCILL
license as circulated by CEA, CNRS and INRIA at the following URL * license as circulated by CEA, CNRS and INRIA at the following URL
"http://www.cecill.info". * "http://www.cecill.info".
*
As a counterpart to the access to the source code and rights to copy, * 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 * modify and redistribute granted by the license, users are provided only
with a limited warranty and the software's author, the holder of the * with a limited warranty and the software's author, the holder of the
economic rights, and the successive licensors have only limited * economic rights, and the successive licensors have only limited
liability. * liability.
*
In this respect, the user's attention is drawn to the risks associated * In this respect, the user's attention is drawn to the risks associated
with loading, using, modifying and/or developing or reproducing the * with loading, using, modifying and/or developing or reproducing the
software by the user in light of its specific status of free software, * 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 * that may mean that it is complicated to manipulate, and that also
therefore means that it is reserved for developers and experienced * therefore means that it is reserved for developers and experienced
professionals having in-depth computer knowledge. Users are therefore * professionals having in-depth computer knowledge. Users are therefore
encouraged to load and test the software's suitability as regards their * encouraged to load and test the software's suitability as regards their
requirements in conditions enabling the security of their systems and/or * 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 * data to be ensured and, more generally, to use and operate it in the
same conditions as regards security. * same conditions as regards security.
*
The fact that you are presently reading this means that you have had * The fact that you are presently reading this means that you have had
knowledge of the CeCILL license and that you accept its terms. * knowledge of the CeCILL license and that you accept its terms.
/**
* Class JScrollDiagramPanel
* Creation: 29/12/2003
* @author Ludovic APVRILLE
* @see
*/ */
package ui; package ui;
import javax.swing.*; import javax.swing.*;
//import java.awt.*;
/** /**
* Class * Class JScrollDiagramPanel
* * Creation: 29/12/2003
* @author Ludovic APVRILLE * @author Ludovic APVRILLE
* @see
*/ */
public class JScrollDiagramPanel extends JScrollPane { public class JScrollDiagramPanel extends JScrollPane {
private TDiagramPanel tdp; private TDiagramPanel tdp;
......
...@@ -34,28 +34,17 @@ same conditions as regards security. ...@@ -34,28 +34,17 @@ same conditions as regards security.
The fact that you are presently reading this means that you have had The fact that you are presently reading this means that you have had
knowledge of the CeCILL license and that you accept its terms. knowledge of the CeCILL license and that you accept its terms.
*/
/**
* Class JTGComponentButton
* Creation: 29/12/2003
* @author Ludovic APVRILLE
* @see
*/
package ui; package ui;
import javax.swing.*; import javax.swing.*;
//import java.awt.*;
//import java.awt.event.*;
/** /**
* Class * Class JTGComponentButton
* * Creation: 29/12/2003
* @author Ludovic APVRILLE * @author Ludovic APVRILLE
* @see
*/ */
public class JTGComponentButton extends JToggleButton { public class JTGComponentButton extends JToggleButton {
protected int componentType; protected int componentType;
protected int componentId; protected int componentId;
......
/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille /* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
ludovic.apvrille AT enst.fr ludovic.apvrille AT enst.fr
...@@ -34,15 +34,9 @@ ...@@ -34,15 +34,9 @@
The fact that you are presently reading this means that you have had The fact that you are presently reading this means that you have had
knowledge of the CeCILL license and that you accept its terms. knowledge of the CeCILL license and that you accept its terms.
/**
* Class JToolBarMainTurtle
* Main toolbar of the ttool main window
* Creation: 09/12/2003
* @author Ludovic APVRILLE
* @see
*/ */
package ui; package ui;
import myutil.ConfigurationTTool; import myutil.ConfigurationTTool;
...@@ -55,10 +49,11 @@ import java.awt.event.ActionEvent; ...@@ -55,10 +49,11 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
/** /**
* Class * * Class JToolBarMainTurtle
* @author Ludovic APVRILLE * Main toolbar of the ttool main window
* @see */ * Creation: 09/12/2003
* @author Ludovic APVRILLE
*/
public class JToolBarMainTurtle extends JToolBar implements ActionListener { public class JToolBarMainTurtle extends JToolBar implements ActionListener {
// Avatar // Avatar
JButton avatarSimu, avatarFVUPPAAL, avatarFVProVerif, avatarFVStaticAnalysis, avatarCodeGeneration, avatarMC; JButton avatarSimu, avatarFVUPPAAL, avatarFVProVerif, avatarFVStaticAnalysis, avatarCodeGeneration, avatarMC;
......
/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille /* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
ludovic.apvrille AT enst.fr ludovic.apvrille AT enst.fr
...@@ -34,15 +34,8 @@ same conditions as regards security. ...@@ -34,15 +34,8 @@ same conditions as regards security.
The fact that you are presently reading this means that you have had The fact that you are presently reading this means that you have had
knowledge of the CeCILL license and that you accept its terms. knowledge of the CeCILL license and that you accept its terms.
*/
/**
* Class TGCWithOneLineText
* Graphical component with a line of text and which contains one or more internal components
* Creation: 22/12/2003
* @version 1.0 22/12/2003
* @author Ludovic APVRILLE
* @see
*/
package ui; package ui;
...@@ -51,16 +44,13 @@ import ui.util.IconManager; ...@@ -51,16 +44,13 @@ import ui.util.IconManager;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
//import java.awt.geom.*;
/** /**
* Class * Class TGCWithOneLineText
* * Graphical component with a line of text and which contains one or more internal components
* Creation: 22/12/2003
* @version 1.0 22/12/2003
* @author Ludovic APVRILLE * @author Ludovic APVRILLE
* @see
*/ */
public abstract class TGCWithOneLineText extends TGCWithInternalComponent{ public abstract class TGCWithOneLineText extends TGCWithInternalComponent{
protected int textx, texty; protected int textx, texty;
//private int widthText; //private int widthText;
......
...@@ -165,7 +165,7 @@ public class AvatarBDLibraryFunction extends TGCScalableWithoutInternalComponent ...@@ -165,7 +165,7 @@ public class AvatarBDLibraryFunction extends TGCScalableWithoutInternalComponent
* Indicates whether the position is considered as relative to this father's component. * Indicates whether the position is considered as relative to this father's component.
* @param father * @param father
* The father component in the diagram. * The father component in the diagram.
* @param tdb * @param tdp
* The diagram panel. * The diagram panel.
*/ */
public AvatarBDLibraryFunction ( public AvatarBDLibraryFunction (
...@@ -787,7 +787,7 @@ public class AvatarBDLibraryFunction extends TGCScalableWithoutInternalComponent ...@@ -787,7 +787,7 @@ public class AvatarBDLibraryFunction extends TGCScalableWithoutInternalComponent
* Unused. * Unused.
* @param decY * @param decY
* Unused. * Unused.
* @param decID * @param decId
* Unused. * Unused.
* *
* @throws MalformedModelingExpresion When the provided XML is corrupted. * @throws MalformedModelingExpresion When the provided XML is corrupted.
......
/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille /* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
ludovic.apvrille AT enst.fr ludovic.apvrille AT enst.fr
...@@ -34,15 +34,9 @@ ...@@ -34,15 +34,9 @@
The fact that you are presently reading this means that you have had The fact that you are presently reading this means that you have had
knowledge of the CeCILL license and that you accept its terms. knowledge of the CeCILL license and that you accept its terms.
/**
* Class IconManager
* Creation: 15/12/2003
* @version 1.1 15/12/2003
* @author Ludovic APVRILLE
* @see
*/ */
package ui.util; package ui.util;
import javax.swing.*; import javax.swing.*;
...@@ -50,11 +44,11 @@ import java.awt.*; ...@@ -50,11 +44,11 @@ import java.awt.*;
import java.net.URL; import java.net.URL;
/** /**
* Class * Class IconManager
* * Creation: 15/12/2003
* @author Ludovic APVRILLE * @version 1.1 15/12/2003
* @see * @author Ludovic APVRILLE
*/ */
public class IconManager { public class IconManager {
public static ImageIcon imgic8, imgic9; public static ImageIcon imgic8, imgic9;
......
...@@ -895,7 +895,6 @@ public class JDialogSearchBox extends javax.swing.JFrame { ...@@ -895,7 +895,6 @@ public class JDialogSearchBox extends javax.swing.JFrame {
/** /**
* *
* @param msg * @param msg
* @return
*/ */
public Message sendMessage(Message msg) { public Message sendMessage(Message msg) {
Client cl = new Client(); Client cl = new Client();
...@@ -1461,7 +1460,7 @@ public class JDialogSearchBox extends javax.swing.JFrame { ...@@ -1461,7 +1460,7 @@ public class JDialogSearchBox extends javax.swing.JFrame {
/** /**
* *
* @param input: a string without space and words are seperated by uper character. * @param input a string without space and words are seperated by uper character.
* @return a splited, then concaternated with space. * @return a splited, then concaternated with space.
*/ */
public String splitAndConcat(String input){ public String splitAndConcat(String input){
...@@ -1491,7 +1490,6 @@ public class JDialogSearchBox extends javax.swing.JFrame { ...@@ -1491,7 +1490,6 @@ public class JDialogSearchBox extends javax.swing.JFrame {
/** /**
* Check a string if it contains only number. * Check a string if it contains only number.
* @param str * @param str
* @return
*/ */
public boolean isNum(String str){ public boolean isNum(String str){
try{ try{
...@@ -1585,7 +1583,6 @@ public class JDialogSearchBox extends javax.swing.JFrame { ...@@ -1585,7 +1583,6 @@ public class JDialogSearchBox extends javax.swing.JFrame {
/** /**
* Check the printable character. * Check the printable character.
* @param c * @param c
* @return
*/ */
public boolean isPrintableChar( char c ) { public boolean isPrintableChar( char c ) {
Character.UnicodeBlock block = Character.UnicodeBlock.of( c ); Character.UnicodeBlock block = Character.UnicodeBlock.of( c );
...@@ -1598,7 +1595,6 @@ public class JDialogSearchBox extends javax.swing.JFrame { ...@@ -1598,7 +1595,6 @@ public class JDialogSearchBox extends javax.swing.JFrame {
/** /**
* Check the printable string * Check the printable string
* @param s * @param s
* @return
*/ */
public boolean isPrintableString(String s){ public boolean isPrintableString(String s){
if (s==null) if (s==null)
......