diff --git a/Makefile b/Makefile
index 6bfa8624a5118c359dd4690268f62f21e5be5bf0..3301c6ce7cb4eeee8da59dd8f2a5f972b2913b38 100755
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ make git Update the build number.
Please report bugs or suggestions of improvements to:
- Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
+ ttool.telecom-paristech.fr/support.html
endef
export HELP_message
diff --git a/build.txt b/build.txt
index d27e6820e7b11bb3ee3763201cfa03c142130f8d..102bfdedc9a511de642c9452cc6cc78424f3d464 100644
--- a/build.txt
+++ b/build.txt
@@ -1 +1 @@
-12291
\ No newline at end of file
+12294
\ No newline at end of file
diff --git a/executablecode/Makefile.src b/executablecode/Makefile.src
index 3eb0295b7a1dc534f81f2ed21c9b9ac27261ffbe..8879386ae8f8d06ad554032eb8a5de7ce2664103 100755
--- a/executablecode/Makefile.src
+++ b/executablecode/Makefile.src
@@ -1 +1 @@
-SRCS = generated_src/main.c generated_src/InterfaceDevice.c generated_src/SmartCard.c generated_src/TCPIP.c generated_src/TCPPacketManager.c generated_src/Application.c generated_src/SmartCardController.c generated_src/Timer__mainTimer__TCPIP.c generated_src/Timer__timerP__TCPPacketManager.c
\ No newline at end of file
+SRCS = generated_src/main.c generated_src/Block0.c generated_src/Timer__timer1__Block0.c
\ No newline at end of file
diff --git a/src/main/java/tmltranslator/TMLActivityElement.java b/src/main/java/tmltranslator/TMLActivityElement.java
index 3b104a6e2b5e6b871da1f4e50d79a5d10a49fcb1..90162fe1c2d289d7343c5d66f71cc81c5cd6d68e 100755
--- a/src/main/java/tmltranslator/TMLActivityElement.java
+++ b/src/main/java/tmltranslator/TMLActivityElement.java
@@ -116,7 +116,7 @@ public abstract class TMLActivityElement extends TMLElement{
}
public String toXML(Vector<TMLActivityElement> elements) {
- String s = "<ACTIVITYELEMENT value=\"" + value + "\" id=\"" + elements.indexOf(this) + "\" name=\"" + name + "\">\n";
+ String s = "<ACTIVITYELEMENT type=\"" + getClass().getName() + "\" value=\"" + value + "\" id=\"" + elements.indexOf(this) + "\" name=\"" + name + "\">\n";
if (securityPattern != null) {
s += securityPattern.toXML();
}
@@ -130,7 +130,7 @@ public abstract class TMLActivityElement extends TMLElement{
public String extraToXML() {
- String s = "<CUSTOM type=\"" + getClass().getName() + "\" " + customExtraToXML() + " />\n";
+ String s = "<CUSTOM " + customExtraToXML() + " />\n";
return s;
}
diff --git a/src/main/java/ui/GTMLModeling.java b/src/main/java/ui/GTMLModeling.java
index c1159614b39fa2f6e9e97b5c8caedbbad6efda9d..cd96637882d61e956e8634e01e03033c7db54866 100755
--- a/src/main/java/ui/GTMLModeling.java
+++ b/src/main/java/ui/GTMLModeling.java
@@ -1,7 +1,8 @@
-/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille, Andrea Enrici
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille, Andrea Enrici, Matteo Bertolino
*
* ludovic.apvrille AT telecom-paristech.fr
* andrea.enrici AT telecom-paristech.fr
+ * matteo.bertolino AT telecom-paristech.fr
*
* This software is a computer program whose purpose is to allow the
* edition of TURTLE analysis, design and deployment diagrams, to
@@ -3482,7 +3483,12 @@ public class GTMLModeling {
node.addMECToHwExecutionNode( mec );
map.addTaskToHwExecutionNode(task, (HwExecutionNode)node);
} else {
- TraceManager.addDev("Null task");
+ TraceManager.addDev("Null task. Raising an error");
+ String msg = "The task named " + artifact.getTaskName() + " was not found";
+ UICheckingError ce = new UICheckingError(CheckingError.STRUCTURE_ERROR, msg);
+ ce.setTDiagramPanel(tmlap.tmlap);
+ ce.setTGComponent(tgc);
+ checkingErrors.add(ce);
}
}
}
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index 3863688bb873cf90b9f12d8f91647db32b8cd7c4..4fcd53e8926707d73b634eb7ee94ebbed700b98b 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -2823,7 +2823,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public void aboutVersion() {
JFrameBasicText jft = new JFrameBasicText("About TTool ...", DefaultText.getAboutText(), IconManager.imgic324);
jft.setIconImage(IconManager.img8);
- GraphicLib.centerOnParent(jft, 700, 800 );
+ GraphicLib.centerOnParent(jft, 740, 800 );
jft.setVisible(true);
}
@@ -4418,7 +4418,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
gtm.getUPPAALVerifierHost(),
_tp);
// jduv.setSize(450, 600);
- GraphicLib.centerOnParent(jduv, 450, 600);
+ GraphicLib.centerOnParent(jduv, 650, 600);
jduv.setVisible(true);
dtree.toBeUpdated();
} else if (gtm.getLanguageID() == GTURTLEModeling.MATRIX) {
diff --git a/src/main/java/ui/util/DefaultText.java b/src/main/java/ui/util/DefaultText.java
index 5d426b85c319e7b1023223b1518bd41afeab9e46..c3ff1233b10e1a430a8c2da5605a60176a2f8f47 100755
--- a/src/main/java/ui/util/DefaultText.java
+++ b/src/main/java/ui/util/DefaultText.java
@@ -51,8 +51,8 @@ package ui.util;
*/
public class DefaultText {
- public static String BUILD = "12290";
- public static String DATE = "2017/07/05 02:01:29 CET";
+ public static String BUILD = "12293";
+ public static String DATE = "2017/07/07 02:01:27 CET";
public static StringBuffer sbAbout = makeAbout();
diff --git a/src/main/java/ui/window/JFrameBasicText.java b/src/main/java/ui/window/JFrameBasicText.java
index f47860a1cea32b0f3a77c7237d29d2a5f329f9cf..1d795b9ce22a362e3233743ec092eb3bf3ef9180 100755
--- a/src/main/java/ui/window/JFrameBasicText.java
+++ b/src/main/java/ui/window/JFrameBasicText.java
@@ -48,8 +48,6 @@ import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-//import myutil.*;
-
/**
* Class JFrameBasicText
@@ -57,49 +55,53 @@ import java.awt.event.ActionListener;
* version 1.0 11/12/2003
* @author Ludovic APVRILLE
*/
-public class JFrameBasicText extends JFrame implements ActionListener {
+public class JFrameBasicText extends JFrame implements ActionListener {
private String theText;
public JFrameBasicText(String title, String _theText) {
- super(title);
- theText = _theText;
-
- setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
- Container framePanel = getContentPane();
- framePanel.setLayout(new BorderLayout());
-
- JTextArea jta = new JTextArea(theText);
- jta.setEditable(true);
- jta.setMargin(new Insets(10, 10, 10, 10));
- jta.setTabSize(3);
- Font f = new Font("Courrier", Font.BOLD, 12);
- jta.setFont(f);
- JScrollPane jsp = new JScrollPane(jta);
-
- framePanel.add(jsp, BorderLayout.CENTER);
-
- JButton button1 = new JButton("Close", IconManager.imgic27);
-
- button1.addActionListener(this);
-
- JPanel jp = new JPanel();
- jp.add(button1);
-
- framePanel.add(jp, BorderLayout.SOUTH);
-
- pack();
+ this( title, _theText, null );
+// super(title);
+// theText = _theText;
+//
+// setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+// Container framePanel = getContentPane();
+// framePanel.setLayout(new BorderLayout());
+//
+// JTextArea jta = new JTextArea(theText);
+// jta.setEditable(true);
+// jta.setMargin(new Insets(10, 10, 10, 10));
+// jta.setTabSize(3);
+// Font f = new Font("Courrier", Font.BOLD, 12);
+// jta.setFont(f);
+// JScrollPane jsp = new JScrollPane(jta);
+//
+// framePanel.add(jsp, BorderLayout.CENTER);
+//
+// JButton button1 = new JButton("Close", IconManager.imgic27);
+//
+// button1.addActionListener(this);
+//
+// JPanel jp = new JPanel();
+// jp.add(button1);
+//
+// framePanel.add(jp, BorderLayout.SOUTH);
+//
+// pack();
}
- public JFrameBasicText(String title, String _theText, ImageIcon imgic) {
+ public JFrameBasicText(String title, String _theText, ImageIcon imgic) {
super(title);
theText = _theText;
- setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+ setDefaultCloseOperation( DISPOSE_ON_CLOSE );
Container framePanel = getContentPane();
framePanel.setLayout(new BorderLayout());
JTextArea jta = new JTextArea(theText);
- jta.setEditable(true);
+ // Issue #35: This should not be editable because changes will not be
+ // taken into account
+ jta.setEditable( false );
+// jta.setEditable(true);
jta.setMargin(new Insets(10, 10, 10, 10));
jta.setTabSize(3);
Font f = new Font("Courrier", Font.BOLD, 12);
@@ -116,11 +118,13 @@ public class JFrameBasicText extends JFrame implements ActionListener {
jp.add(button1);
framePanel.add(jp, BorderLayout.SOUTH);
-
- JButton button2 = new JButton(imgic);
- jp = new JPanel();
- jp.add(button2);
- framePanel.add(jp, BorderLayout.NORTH);
+
+ if ( imgic != null ) {
+ JButton button2 = new JButton(imgic);
+ jp = new JPanel();
+ jp.add(button2);
+ framePanel.add(jp, BorderLayout.NORTH);
+ }
pack();
}