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
TTOOL_DOC = $(TTOOL_PATH)/doc
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))
@echo "$(PREFIX) Generating Javadoc"
......
......@@ -86,8 +86,8 @@ public class AvatarLibraryFunctionCall extends AvatarStateMachineElement {
* @param referenceObject
* The graphical element that this function is related to.
*/
public AvatarLibraryFunctionCall (String _name, AvatarLibraryFunction libraryFunction, Object _referenceObject) {
super(_name, _referenceObject);
public AvatarLibraryFunctionCall (String name, AvatarLibraryFunction libraryFunction, Object referenceObject) {
super(name, referenceObject);
this.libraryFunction = libraryFunction;
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
......@@ -34,23 +34,23 @@
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 AvatarStateMachine
* State machine, with composite states
* Creation: 20/05/2010
* @version 1.0 20/05/2010
* @author Ludovic APVRILLE
* @see
*/
package avatartranslator;
import myutil.TraceManager;
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 {
// to be used by code generator for fast access to states
public AvatarStateElement [] allStates;
......@@ -1518,8 +1518,8 @@ public class AvatarStateMachine extends AvatarElement {
/**
* Removes all function calls by inlining them.
*
* @param avspec
* The specification used to query library functions.
* @param block
* The block from which library function calls should be removed.
*/
public void removeLibraryFunctionCalls (AvatarBlock block) {
/* 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 {
* @param block
* 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);
......@@ -1645,7 +1645,7 @@ public class AvatarStateMachine extends AvatarElement {
foundState2.addReferenceObjectFrom(foundState1);
}
removeEmptyTransitions(_block, _canOptimize);
removeEmptyTransitions(block, _canOptimize);
}
}
......
......@@ -54,7 +54,7 @@ public interface AvatarStateMachineOwner {
/**
* 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.
*
* @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
*
......@@ -34,13 +34,6 @@
*
* 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 ConfigurationTTool
* Creation: 21/12/2003
* Version 1.0
* @author Ludovic APVRILLE
* @see
*/
package myutil;
......@@ -60,10 +53,10 @@ import java.io.FileOutputStream;
//import org.xml.sax.*;
/**
* Class
*
* Class ConfigurationTTool
* Creation: 21/12/2003
* Version 1.0
* @author Ludovic APVRILLE
* @see
*/
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
......@@ -34,26 +34,26 @@
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 ImageManager
* Creation: 31/05/2017
* @version 1.1 31/05/2017
* @author Ludovic APVRILLE
* @see
*/
package myutil;
import java.awt.*;
import java.awt.image.BufferedImage;
/**
* Class ImageManager
* Creation: 31/05/2017
* @version 1.1 31/05/2017
* @author Ludovic APVRILLE
*/
public final class ImageManager {
/**
* 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 h - desired height
* @return - the new resized image
......
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
......@@ -36,6 +36,7 @@ package myutil.externalSearch;
The fact that you are presently reading this means that you have had
knowledge of the CeCILL license and that you accept its terms.
*/
/**
* JDialogSearchBox
......@@ -43,7 +44,6 @@ package myutil.externalSearch;
* Creation: 12/03/2015
* @version 1.0 11/03/2015
* @author Huy TRUONG
* @see
*/
public class Record {
private String summary;
......
......@@ -34,24 +34,16 @@ 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 CDElement
* Creation : 22/12/2003
* @author Ludovic APVRILLE
* @see
*/
package ui;
/**
* Interface CDElement
*
* Creation : 22/12/2003
* @author Ludovic APVRILLE
* @see
*/
public interface CDElement {
int getX();
int getY();
......
......@@ -34,12 +34,6 @@
*
* 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 IconManager
* Creation: 15/12/2003
* @author Ludovic APVRILLE
* @see
*/
package ui;
......@@ -49,10 +43,9 @@ import myutil.GraphicLib;
import java.awt.*;
/**
* Class
*
* Class IconManager
* Creation: 15/12/2003
* @author Ludovic APVRILLE
* @see
*/
public class ColorManager {
......
/**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 JScrollDiagramPanel
* Creation: 29/12/2003
* @author Ludovic APVRILLE
* @see
* 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.
*/
package ui;
import javax.swing.*;
//import java.awt.*;
/**
* Class
*
* Class JScrollDiagramPanel
* Creation: 29/12/2003
* @author Ludovic APVRILLE
* @see
*/
public class JScrollDiagramPanel extends JScrollPane {
private TDiagramPanel tdp;
......
......@@ -34,28 +34,17 @@ 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 JTGComponentButton
* Creation: 29/12/2003
* @author Ludovic APVRILLE
* @see
*/
*/
package ui;
import javax.swing.*;
//import java.awt.*;
//import java.awt.event.*;
/**
* Class
*
* Class JTGComponentButton
* Creation: 29/12/2003
* @author Ludovic APVRILLE
* @see
*/
public class JTGComponentButton extends JToggleButton {
protected int componentType;
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
......@@ -34,15 +34,9 @@
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 JToolBarMainTurtle
* Main toolbar of the ttool main window
* Creation: 09/12/2003
* @author Ludovic APVRILLE
* @see
*/
package ui;
import myutil.ConfigurationTTool;
......@@ -55,10 +49,11 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
/**
* Class *
* @author Ludovic APVRILLE
* @see */
* Class JToolBarMainTurtle
* Main toolbar of the ttool main window
* Creation: 09/12/2003
* @author Ludovic APVRILLE
*/
public class JToolBarMainTurtle extends JToolBar implements ActionListener {
// Avatar
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
......@@ -34,15 +34,8 @@ 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 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;
......@@ -51,16 +44,13 @@ import ui.util.IconManager;
import javax.swing.*;
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
* @see
*/
public abstract class TGCWithOneLineText extends TGCWithInternalComponent{
protected int textx, texty;
//private int widthText;
......
......@@ -165,7 +165,7 @@ public class AvatarBDLibraryFunction extends TGCScalableWithoutInternalComponent
* Indicates whether the position is considered as relative to this father's component.
* @param father
* The father component in the diagram.
* @param tdb
* @param tdp
* The diagram panel.
*/
public AvatarBDLibraryFunction (
......@@ -787,7 +787,7 @@ public class AvatarBDLibraryFunction extends TGCScalableWithoutInternalComponent
* Unused.
* @param decY
* Unused.
* @param decID
* @param decId
* Unused.
*
* @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
......@@ -34,15 +34,9 @@
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 IconManager
* Creation: 15/12/2003
* @version 1.1 15/12/2003
* @author Ludovic APVRILLE
* @see
*/
package ui.util;
import javax.swing.*;
......@@ -50,11 +44,11 @@ import java.awt.*;
import java.net.URL;
/**
* Class
*
* @author Ludovic APVRILLE
* @see
*/
* Class IconManager
* Creation: 15/12/2003
* @version 1.1 15/12/2003
* @author Ludovic APVRILLE
*/
public class IconManager {
public static ImageIcon imgic8, imgic9;
......
......@@ -895,7 +895,6 @@ public class JDialogSearchBox extends javax.swing.JFrame {
/**
*
* @param msg
* @return
*/
public Message sendMessage(Message msg) {
Client cl = new Client();
......@@ -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.
*/
public String splitAndConcat(String input){
......@@ -1491,7 +1490,6 @@ public class JDialogSearchBox extends javax.swing.JFrame {
/**
* Check a string if it contains only number.
* @param str
* @return
*/
public boolean isNum(String str){
try{
......@@ -1585,7 +1583,6 @@ public class JDialogSearchBox extends javax.swing.JFrame {
/**
* Check the printable character.
* @param c
* @return
*/
public boolean isPrintableChar( char c ) {
Character.UnicodeBlock block = Character.UnicodeBlock.of( c );
......@@ -1598,7 +1595,6 @@ public class JDialogSearchBox extends javax.swing.JFrame {
/**
* Check the printable string
* @param s
* @return
*/
public boolean isPrintableString(String s){
if (s==null)
......
......@@ -34,18 +34,9 @@
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 DatabaseCreation
* All the function necessary for the creation of the database, creation
* of tables in the database and the storage of this databse
* Management of Avatar block panels
* Creation: 2015
* @version 2.0 25/03/2016
* @author Marie FORRAT, Angeliki AKTYPI, Ludovic APVRILLE
* @see MainGUI
*/
package web.crawler;
import myutil.TraceManager;
......@@ -58,10 +49,15 @@ import java.net.InetAddress;
import java.sql.*;
/**
* All the function necessary for the creation of the database, creation of tables in the database and the storage of this databse
* @author Marie FORRAT, Angeliki AKTYPI, Ludovic Apvrille
*/
* Class DatabaseCreation
* All the function necessary for the creation of the database, creation
* of tables in the database and the storage of this databse
* Management of Avatar block panels
* Creation: 2015
* @version 2.0 25/03/2016
* @author Marie FORRAT, Angeliki AKTYPI, Ludovic APVRILLE
* @see ui.MainGUI
*/
public class DatabaseCreation {
/* Global variables */
......@@ -157,7 +153,6 @@ public class DatabaseCreation {
/**
*
* @return
*/
public java.sql.Statement getstmt() {
return stmt;
......
......@@ -139,7 +139,6 @@ public class Message implements Serializable {
/**
*
* @return
*/
public String getCmd() {
return cmd;
......@@ -148,7 +147,6 @@ public class Message implements Serializable {
/**
*
* @return
*/
public ArrayList<Object> getContent() {
return content;
......@@ -161,7 +159,6 @@ public class Message implements Serializable {
/**
*
* @return
*/
public ArrayList<String> getOptions() {
return options;
......@@ -171,7 +168,6 @@ public class Message implements Serializable {
/**
*
* @return
*/
public ArrayList<String> getValues() {
return values;
......@@ -295,7 +291,6 @@ public class Message implements Serializable {
/**
*
* @param msg
* @return
*/
public ArrayList<Object> parseMessage(Message msg)
{
......@@ -305,7 +300,6 @@ public class Message implements Serializable {
/**
*
* @return
*/
public static byte[] convertImageToByte(Message msg) {
......
......@@ -70,7 +70,6 @@ public class MultiThreadServer {
*
* @param cmd
* @param msg
* @return
*/
public static Message createImageAnswer(String cmd, Message msg) {
byte[] byteImg = Message.convertImageToByte(msg);
......@@ -87,7 +86,6 @@ public class MultiThreadServer {
*
* @param msg
* @param database
* @return
* @throws IOException
* @throws SQLException
* @throws AWTException
......
......@@ -78,18 +78,6 @@ public class WebCrawler {
private String pathToFiles;
/**
* main program
* @param args the command line arguments
* @throws java.lang.ClassNotFoundException
* @throws java.lang.InstantiationException
* @throws java.lang.IllegalAccessException
* @throws java.sql.SQLException
* @throws java.io.IOException
* @throws java.awt.AWTException
*
*/
public WebCrawler(String _pathToFiles) {
pathToFiles = _pathToFiles + java.io.File.separator;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment