diff --git a/src/main/java/graph/AUTBlock.java b/src/main/java/graph/AUTBlock.java
index c0ebab67e008e0296937d76965b2ffe5ee2dd6c6..89bb1b04660f2c960c818e53f34ff3c86619d983 100755
--- a/src/main/java/graph/AUTBlock.java
+++ b/src/main/java/graph/AUTBlock.java
@@ -161,7 +161,7 @@ public class AUTBlock implements Comparable<AUTBlock> {
public void computeHash() {
Collections.sort(states);
int[] hash = new int[states.size()];
- int cpt = 0;
+ //int cpt = 0;
for(int i=0; i<hash.length; i++) {
hash[i] = states.get(i).id;
}
@@ -204,14 +204,13 @@ public class AUTBlock implements Comparable<AUTBlock> {
}
public static AUTBlock concat(AUTBlock b1, AUTBlock b2) {
- AUTBlock ret = new AUTBlock();
- for(AUTState st1: b1.states) {
- ret.addState(st1);
- }
- for(AUTState st2: b2.states) {
- ret.addState(st2);
- }
- return ret;
+ AUTBlock ret = new AUTBlock();
+ for(AUTState st1: b1.states) {
+ ret.addState(st1);
+ }
+ for(AUTState st2: b2.states) {
+ ret.addState(st2);
+ }
+ return ret;
}
-
}
diff --git a/src/main/java/translator/ADChoice.java b/src/main/java/translator/ADChoice.java
index ede60092e98d06e320e057514bbc2e460586f32f..9684c712b1297a3ee1fc80b3cee06940d498fe7c 100755
--- a/src/main/java/translator/ADChoice.java
+++ b/src/main/java/translator/ADChoice.java
@@ -248,8 +248,8 @@ public class ADChoice extends ADComponent implements NonBlockingADComponent {
}
public boolean isSpecialChoiceAction(boolean variableAsActions) {
- ADComponent adc, adc1;
- String value;
+ ADComponent adc;//, adc1;
+ //String value;
for(int i=0; i<next.size(); i++) {
adc = getNext(i);
diff --git a/src/main/java/ui/DocumentationGenerator.java b/src/main/java/ui/DocumentationGenerator.java
index 4ab729ac189ee150209a5f348c89b9f1dd94447f..42834a040e950c9986e48dc393b89b1360c4bab3 100644
--- a/src/main/java/ui/DocumentationGenerator.java
+++ b/src/main/java/ui/DocumentationGenerator.java
@@ -36,10 +36,6 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
-
package ui;
import myutil.Conversion;
@@ -57,7 +53,6 @@ import ui.util.DefaultText;
import javax.imageio.ImageIO;
import javax.swing.*;
-import common.ConfigurationTTool;
import common.SpecConfigTTool;
import java.awt.image.BufferedImage;
@@ -470,15 +465,16 @@ public class DocumentationGenerator implements SteppedAlgorithm, StoppableGUIEle
tmpdoc += DefaultText.getVersion();
tmpdoc += " generation date: " + formattedDate;
tmpdoc += "----\n";
- tmpdoc += "% To be compiled as follows: make all. Relies on https://github.com/pacalet/mli.git\n";
- tmpdoc += "\\documentclass[11pt,a4paper]{article}\n\n\\usepackage{graphicx}\n\n\\begin{document}\n";
- tmpdoc += "\\extrafloats{750}\n";
- tmpdoc += "\\title{" + Conversion.replaceAllString(projectName, "_", "\\_") + "}\n";
- tmpdoc += "\\date{\\today}\n";
- tmpdoc += "\\maketitle\n\n";
- tmpdoc += "\\input{"+texIncludeFileNameSvg+"}\n";
- tmpdoc += "\\end{document}\n\n";
- return tmpdoc;
+ tmpdoc += "% To be compiled as follows: make all. Relies on https://github.com/pacalet/mli.git\n";
+ tmpdoc += "\\documentclass[11pt,a4paper]{article}\n\n\\usepackage{graphicx}\n\n\\begin{document}\n";
+ tmpdoc += "\\extrafloats{750}\n";
+ tmpdoc += "\\title{" + Conversion.replaceAllString(projectName, "_", "\\_") + "}\n";
+ tmpdoc += "\\date{\\today}\n";
+ tmpdoc += "\\maketitle\n\n";
+ tmpdoc += "\\input{"+texIncludeFileNameSvg+"}\n";
+ tmpdoc += "\\end{document}\n\n";
+
+ return tmpdoc;
}
public String getIncludeLatexDocumentationHeaderSvg(String _projectName) {
@@ -494,5 +490,4 @@ public class DocumentationGenerator implements SteppedAlgorithm, StoppableGUIEle
tmpdoc += "----\n\n";
return tmpdoc;
}
-
}
diff --git a/src/main/java/ui/SecurityGeneration.java b/src/main/java/ui/SecurityGeneration.java
index 0fe8c40c90b5473def168c4d1e43ba702ba0e0f0..a76d3cbb0d28f2ad0621bd7f5e011854c535fa23 100644
--- a/src/main/java/ui/SecurityGeneration.java
+++ b/src/main/java/ui/SecurityGeneration.java
@@ -1,41 +1,56 @@
package ui;
-import avatartranslator.*;
-import myutil.BoolExpressionEvaluator;
-import myutil.Conversion;
-import myutil.IntExpressionEvaluator;
-import myutil.TraceManager;
-
-import tmltranslator.*;
-import tmltranslator.toavatar.TML2Avatar;
-
-import avatartranslator.*;
+import java.awt.Point;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Vector;
+
+import avatartranslator.AvatarPragmaAuthenticity;
+import avatartranslator.AvatarPragmaSecret;
+import avatartranslator.AvatarSpecification;
import avatartranslator.toproverif.AVATAR2ProVerif;
-
-
-import launcher.LauncherException;
-import launcher.RemoteExecutionThread;
-import launcher.RshClient;
-
-import ui.tmlad.*;
-import ui.tmlcd.TMLTaskDiagramPanel;
-import ui.tmlcd.TMLTaskOperator;
-import ui.tmlcompd.*;
-import ui.tmlcp.TMLCPPanel;
-import ui.tmldd.*;
import common.ConfigurationTTool;
-
-import ui.tmlsd.TMLSDPanel;
-
+import launcher.RshClient;
+import myutil.TraceManager;
import proverifspec.ProVerifOutputAnalyzer;
import proverifspec.ProVerifQueryAuthResult;
import proverifspec.ProVerifQueryResult;
import proverifspec.ProVerifSpec;
-
-import java.awt.Point;
-
-import java.util.*;
-import java.io.*;
+import tmltranslator.TMLChannel;
+import tmltranslator.TMLMapping;
+import tmltranslator.TMLModeling;
+import tmltranslator.TMLPort;
+import tmltranslator.TMLTask;
+import tmltranslator.toavatar.TML2Avatar;
+import ui.tmlad.TGConnectorTMLAD;
+import ui.tmlad.TMLADChoice;
+import ui.tmlad.TMLADDecrypt;
+import ui.tmlad.TMLADEncrypt;
+import ui.tmlad.TMLADReadChannel;
+import ui.tmlad.TMLADReadRequestArg;
+import ui.tmlad.TMLADSendRequest;
+import ui.tmlad.TMLADStartState;
+import ui.tmlad.TMLADStopState;
+import ui.tmlad.TMLADWriteChannel;
+import ui.tmlad.TMLActivityDiagramPanel;
+import ui.tmlcompd.TMLCChannelOutPort;
+import ui.tmlcompd.TMLCCompositeComponent;
+import ui.tmlcompd.TMLCPortConnector;
+import ui.tmlcompd.TMLCPrimitiveComponent;
+import ui.tmlcompd.TMLCPrimitivePort;
+import ui.tmlcompd.TMLComponentTaskDiagramPanel;
+import ui.tmldd.TMLArchiArtifact;
+import ui.tmldd.TMLArchiBUSNode;
+import ui.tmldd.TMLArchiCPUNode;
+import ui.tmldd.TMLArchiConnectorNode;
+import ui.tmldd.TMLArchiDiagramPanel;
+import ui.tmldd.TMLArchiHWANode;
+import ui.tmldd.TMLArchiMemoryNode;
public class SecurityGeneration implements Runnable {
@@ -68,7 +83,7 @@ public class SecurityGeneration implements Runnable {
List<String> hsmTasks = new ArrayList<String>();
Map<String, String> channelSecMap = new HashMap<String, String>();
- TMLMapping newMap;
+ TMLMapping<TGComponent> newMap;
public SecurityGeneration(MainGUI gui, String name, TMLMapping<TGComponent> map, TMLArchiPanel newarch, String encComp, String overhead, String decComp, boolean autoConf, boolean autoWeakAuth, boolean autoStrongAuth, Map<String, List<String>> selectedCPUTasks){
@@ -221,7 +236,7 @@ public class SecurityGeneration implements Runnable {
//TraceManager.addDev("mapping " + map.getSummaryTaskMapping());
// Map<String, HSMChannel> secChannels = new HashMap<String, HSMChannel>();
- Map<String, HSMChannel> hsmChannels = new HashMap<String, HSMChannel>();
+ //Map<String, HSMChannel> hsmChannels = new HashMap<String, HSMChannel>();
for (String cpuName : selectedCPUTasks.keySet()) {
@@ -659,8 +674,8 @@ public class SecurityGeneration implements Runnable {
for (TMLCPrimitiveComponent comp : comps) {
- Map<String, HSMChannel> compChannels = new HashMap<String, HSMChannel>();
- String compName = comp.getValue();
+ //Map<String, HSMChannel> compChannels = new HashMap<String, HSMChannel>();
+ //String compName = comp.getValue();
List<ChannelData> hsmChans = new ArrayList<ChannelData>();
ChannelData chd = new ChannelData("startHSM_" + cpuName, false, false);
@@ -1039,8 +1054,8 @@ for (TMLTask task : toSecure.keySet()) {
}
for (String channel: hsmSecOutChannels.get(task)){
Set<TGComponent> channelInstances = new HashSet<TGComponent>();
- TGConnector conn = new TGConnectorTMLAD(0, 0, 0, 0, 0, 0, false, null, tad, null, null, new Vector<Point>());
- TGConnectingPoint next = new TGConnectingPoint(null, 0, 0, false, false);
+ //TGConnector conn = new TGConnectorTMLAD(0, 0, 0, 0, 0, 0, false, null, tad, null, null, new Vector<Point>());
+ //TGConnectingPoint next = new TGConnectingPoint(null, 0, 0, false, false);
for (TGComponent tg : tad.getComponentList()) {
if (tg instanceof TMLADWriteChannel) {
TMLADWriteChannel writeChannel = (TMLADWriteChannel) tg;
@@ -1197,8 +1212,8 @@ for (TMLTask task : toSecure.keySet()) {
for (String channel: hsmSecInChannels.get(task)){
//System.out.println("Checking hsmsecinchannel " + channel + " " + task.getName());
Set<TGComponent> channelInstances = new HashSet<TGComponent>();
- TGConnector conn = new TGConnectorTMLAD(0, 0, 0, 0, 0, 0, false, null, tad, null, null, new Vector<Point>());
- TGConnectingPoint next = new TGConnectingPoint(null, 0, 0, false, false);
+ //TGConnector conn = new TGConnectorTMLAD(0, 0, 0, 0, 0, 0, false, null, tad, null, null, new Vector<Point>());
+ //TGConnectingPoint next = new TGConnectingPoint(null, 0, 0, false, false);
for (TGComponent tg : tad.getComponentList()) {
if (tg instanceof TMLADReadChannel) {
TMLADReadChannel readChannel = (TMLADReadChannel) tg;
diff --git a/src/main/java/ui/TGCOneLineText.java b/src/main/java/ui/TGCOneLineText.java
index d9db3c656949ab3c9baec22b5a700c60a720f2dd..deccf35e869e419652348fab0fa3b2fc0218cb31 100644
--- a/src/main/java/ui/TGCOneLineText.java
+++ b/src/main/java/ui/TGCOneLineText.java
@@ -52,7 +52,7 @@ import java.awt.*;
* @version 1.0 21/12/2003
* @author Ludovic APVRILLE
*/
-public class TGCOneLineText extends TGCWithoutInternalComponent{
+public class TGCOneLineText extends TGCWithoutInternalComponent {
protected boolean emptyText;
diff --git a/src/main/java/ui/atd/AttackTreeDiagramToolbar.java b/src/main/java/ui/atd/AttackTreeDiagramToolbar.java
index 264a7b9146c9b48aa6754dd4ce066ae2a9b6aa09..8c9fec9a90ba85f2459b6d51c1cc553069d529a5 100644
--- a/src/main/java/ui/atd/AttackTreeDiagramToolbar.java
+++ b/src/main/java/ui/atd/AttackTreeDiagramToolbar.java
@@ -61,7 +61,6 @@ public class AttackTreeDiagramToolbar extends TToolBar {
public AttackTreeDiagramToolbar(MainGUI _mgui) {
super(_mgui);
-
}
protected void setActive(boolean b) {
diff --git a/src/main/java/ui/avatardd/ADDDMANode.java b/src/main/java/ui/avatardd/ADDDMANode.java
index 359a8b4c8200e732796add80243d7f6b6b967be7..b2fc27c22cd9c5070020a40aa64f80ae4845c103 100755
--- a/src/main/java/ui/avatardd/ADDDMANode.java
+++ b/src/main/java/ui/avatardd/ADDDMANode.java
@@ -169,10 +169,10 @@ public class ADDDMANode extends ADDCommunicationNode implements WithAttributes {
}
public boolean editOndoubleClick(JFrame frame) {
- boolean error = false;
- String errors = "";
- int tmp;
- String tmpName;
+ //boolean error = false;
+ // String errors = "";
+ //int tmp;
+ //String tmpName;
/*JDialogDMANode dialog = new JDialogDMANode(frame, "Setting Memory attributes", this);
dialog.setSize(400, 300);
diff --git a/src/main/java/ui/avatardd/ADDDiagramPanel.java b/src/main/java/ui/avatardd/ADDDiagramPanel.java
index 0edd4d53431698e437971440ff1a7c6986ec411f..600efaaa1dd9b6b7f6b0ee99e82f3c5dbc226f0a 100755
--- a/src/main/java/ui/avatardd/ADDDiagramPanel.java
+++ b/src/main/java/ui/avatardd/ADDDiagramPanel.java
@@ -37,16 +37,19 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
package ui.avatardd;
+import java.util.Iterator;
+import java.util.Vector;
-import myutil.TraceManager;
import org.w3c.dom.Element;
-import ui.*;
-import java.util.ListIterator;
-import java.util.Vector;
+import myutil.TraceManager;
+import ui.MainGUI;
+import ui.TDPWithAttributes;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TToolBar;
/**
* Class ADDDiagramPanel
@@ -66,6 +69,7 @@ public class ADDDiagramPanel extends TDiagramPanel implements TDPWithAttributes
addMouseMotionListener(tdmm);*/
}
+ @Override
public boolean actionOnDoubleClick(TGComponent tgc) {
//
/*if (tgc instanceof TCDTClass) {
@@ -86,6 +90,7 @@ public class ADDDiagramPanel extends TDiagramPanel implements TDPWithAttributes
return false;
}
+ @Override
public boolean actionOnAdd(TGComponent tgc) {
/*if (tgc instanceof TCDTClass) {
TCDTClass tgcc = (TCDTClass)(tgc);
@@ -96,6 +101,7 @@ public class ADDDiagramPanel extends TDiagramPanel implements TDPWithAttributes
return false;
}
+ @Override
public boolean actionOnRemove(TGComponent tgc) {
/*if (tgc instanceof TCDTClass) {
TCDTClass tgcc = (TCDTClass)(tgc);
@@ -106,7 +112,8 @@ public class ADDDiagramPanel extends TDiagramPanel implements TDPWithAttributes
return false;
}
- public boolean actionOnValueChanged(TGComponent tgc) {
+ @Override
+ public boolean actionOnValueChanged(TGComponent tgc) {
/*if (tgc instanceof TCDTClass) {
return actionOnDoubleClick(tgc);
}*/
@@ -121,26 +128,32 @@ public class ADDDiagramPanel extends TDiagramPanel implements TDPWithAttributes
masterClockFrequency = _masterClockFrequency;
}
+ @Override
public String getXMLHead() {
return "<ADDDiagramPanel name=\"" + name + "\"" + sizeParam() + displayParam() + displayClock() + " >";
}
+ @Override
public String getXMLTail() {
return "</ADDDiagramPanel>";
}
+ @Override
public String getXMLSelectedHead() {
return "<ADDDiagramPanelCopy name=\"" + name + "\" xSel=\"" + xSel + "\" ySel=\"" + ySel + "\" widthSel=\"" + widthSel + "\" heightSel=\"" + heightSel + "\" >";
}
+ @Override
public String getXMLSelectedTail() {
return "</ADDDiagramPanelCopy>";
}
+ @Override
public String getXMLCloneHead() {
return "<ADDDiagramPanelCopy name=\"" + name + "\" xSel=\"" + 0 + "\" ySel=\"" + 0 + "\" widthSel=\"" + 0 + "\" heightSel=\"" + 0 + "\" >";
}
+ @Override
public String getXMLCloneTail() {
return "</ADDDiagramPanelCopy>";
}
@@ -184,18 +197,17 @@ public class ADDDiagramPanel extends TDiagramPanel implements TDPWithAttributes
}
}
-
public boolean isMapped(String _ref, String _name) {
- ListIterator iterator = componentList.listIterator();
+ Iterator<TGComponent> iterator = componentList.listIterator();
TGComponent tgc;
- ADDCPUNode node;
- Vector v;
+ // ADDCPUNode node;
+ Vector<ADDBlockArtifact> v;
ADDBlockArtifact artifact;
int i;
String name = _ref + "::" + _name;
while (iterator.hasNext()) {
- tgc = (TGComponent) (iterator.next());
+ tgc = iterator.next();
if (tgc instanceof ADDCPUNode) {
v = ((ADDCPUNode) (tgc)).getArtifactList();
for (i = 0; i < v.size(); i++) {
@@ -211,16 +223,16 @@ public class ADDDiagramPanel extends TDiagramPanel implements TDPWithAttributes
}
public boolean isChannelMapped(String _ref, String _name) {
- ListIterator iterator = componentList.listIterator();
+ Iterator<TGComponent> iterator = componentList.listIterator();
TGComponent tgc;
- ADDMemoryNode node;
- Vector v;
+ //ADDMemoryNode node;
+ Vector<ADDChannelArtifact> v;
ADDChannelArtifact artifact;
int i;
String name = _ref + "::" + _name;
while (iterator.hasNext()) {
- tgc = (TGComponent) (iterator.next());
+ tgc = iterator.next();
if (tgc instanceof ADDRAMNode) {
v = ((ADDRAMNode) (tgc)).getArtifactList();
for (i = 0; i < v.size(); i++) {
diff --git a/src/main/java/ui/tmlcd/TGConnectorTMLCompositionOperator.java b/src/main/java/ui/tmlcd/TGConnectorTMLCompositionOperator.java
index 7c1b7126ccd071d636a1a58d957411a5412db271..e4b8a4f4fef58d7faf8bd6bf4516b897cdc7dcf0 100755
--- a/src/main/java/ui/tmlcd/TGConnectorTMLCompositionOperator.java
+++ b/src/main/java/ui/tmlcd/TGConnectorTMLCompositionOperator.java
@@ -36,9 +36,6 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
package ui.tmlcd;
import myutil.GraphicLib;
@@ -48,8 +45,6 @@ import ui.util.IconManager;
import java.awt.*;
import java.util.Vector;
-//import java.awt.geom.*;
-
/**
* Class TGConnectorTMLCompositionOperator
* Connects an association to a TML composition operator. To be used in TML task diagram.
@@ -64,25 +59,29 @@ public class TGConnectorTMLCompositionOperator extends TGConnector {
myImageIcon = IconManager.imgic108;
}
+ @Override
public void internalDrawing(Graphics g) {
TMLTaskDiagramPanel tmltdp = (TMLTaskDiagramPanel)tdp;
if (!tmltdp.areAllVisible()) {
if (!tmltdp.connectedToVisible(this))
return;
}
+
super.internalDrawing(g);
}
+ @Override
protected void drawLastSegment(Graphics g, int x1, int y1, int x2, int y2){
GraphicLib.dashedLine(g, x1, y1, x2, y2);
}
+ @Override
protected void drawMiddleSegment(Graphics g, int x1, int y1, int x2, int y2) {
GraphicLib.dashedLine(g, x1, y1, x2, y2);
}
+ @Override
public int getType() {
return TGComponentManager.CONNECTOR_TML_COMPOSITION_OPERATOR;
}
-
}
diff --git a/src/main/java/ui/tmlcd/TMLCompositionOperator.java b/src/main/java/ui/tmlcd/TMLCompositionOperator.java
index 22a7586cb62fe48d67e1ec209a29d30d2d171724..3bb1d9d48efa21f390767eb83563352dbdd0e7f7 100755
--- a/src/main/java/ui/tmlcd/TMLCompositionOperator.java
+++ b/src/main/java/ui/tmlcd/TMLCompositionOperator.java
@@ -80,6 +80,7 @@ public abstract class TMLCompositionOperator extends TGCWithInternalComponent {
actionOnAdd();
}
+ @Override
public void internalDrawing(Graphics g) {
g.drawRect(x, y, width, height);
//g.setColor(ColorManager.COMPOSITION_OPERATOR);
@@ -90,10 +91,10 @@ public abstract class TMLCompositionOperator extends TGCWithInternalComponent {
g.setFont((g.getFont()).deriveFont(Font.BOLD));
g.drawString(value, x + textX, y + textY);
g.setFont((g.getFont()).deriveFont(Font.PLAIN));
-
}
- public TGComponent isOnOnlyMe(int x1, int y1) {
+ @Override
+ public TGComponent isOnOnlyMe(int x1, int y1) {
if (GraphicLib.isInRectangle(x1, y1, x, y, width, height)) {
return this;
}
@@ -101,13 +102,6 @@ public abstract class TMLCompositionOperator extends TGCWithInternalComponent {
}
public abstract boolean isToggledVisible();
- public abstract Color getMyColor();
-
+
+ public abstract Color getMyColor();
}
-
-
-
-
-
-
-
diff --git a/src/main/java/ui/tmlcd/TMLEventOperator.java b/src/main/java/ui/tmlcd/TMLEventOperator.java
index 5f8a11bc9f4eef699f436964d3c4d2ea11d15e89..f47c0f9d25b26f44f1e83a7b97cdeeb4d57bb090 100755
--- a/src/main/java/ui/tmlcd/TMLEventOperator.java
+++ b/src/main/java/ui/tmlcd/TMLEventOperator.java
@@ -73,6 +73,7 @@ public class TMLEventOperator extends TMLCompositionOperator {
myImageIcon = IconManager.imgic800;
}
+ @Override
public void internalDrawing(Graphics g) {
if (((TMLTaskDiagramPanel)(tdp)).areEventsVisible()) {
g.drawRect(x, y, width, height);
@@ -122,6 +123,7 @@ public class TMLEventOperator extends TMLCompositionOperator {
return ColorManager.TML_PORT_EVENT;
}
+ @Override
public int getType() {
return TGComponentManager.TMLTD_EVENT_OPERATOR;
}
diff --git a/src/main/java/ui/tmlcd/TMLTaskDiagramPanel.java b/src/main/java/ui/tmlcd/TMLTaskDiagramPanel.java
index 32dda85a9e3abdded249001e7815dd9b2ece6360..88d96a9043343e65bd09e312e5a8fa196a132bc6 100755
--- a/src/main/java/ui/tmlcd/TMLTaskDiagramPanel.java
+++ b/src/main/java/ui/tmlcd/TMLTaskDiagramPanel.java
@@ -36,16 +36,13 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
package ui.tmlcd;
-
import org.w3c.dom.Element;
import ui.*;
import ui.tmldd.TMLArchiDiagramPanel;
+import java.util.List;
import java.util.ArrayList;
import java.util.Iterator;
@@ -65,6 +62,7 @@ public class TMLTaskDiagramPanel extends TDiagramPanel {
addMouseMotionListener(tdmm);*/
}
+ @Override
public boolean actionOnDoubleClick(TGComponent tgc) {
//
if (tgc instanceof TMLTaskOperator) {
@@ -79,6 +77,7 @@ public class TMLTaskDiagramPanel extends TDiagramPanel {
return false;
}
+ @Override
public boolean actionOnAdd(TGComponent tgc) {
//
if (tgc instanceof TMLTaskOperator) {
@@ -96,6 +95,7 @@ public class TMLTaskDiagramPanel extends TDiagramPanel {
return false;
}
+ @Override
public boolean actionOnRemove(TGComponent tgc) {
if (tgc instanceof TMLTaskOperator) {
TMLTaskOperator tgcc = (TMLTaskOperator)(tgc);
@@ -106,6 +106,7 @@ public class TMLTaskDiagramPanel extends TDiagramPanel {
return false;
}
+ @Override
public boolean actionOnValueChanged(TGComponent tgc) {
if (tgc instanceof TMLTaskOperator) {
return actionOnDoubleClick(tgc);
@@ -113,37 +114,41 @@ public class TMLTaskDiagramPanel extends TDiagramPanel {
return false;
}
+ @Override
public String getXMLHead() {
return "<TMLTaskDiagramPanel name=\"" + name + "\"" + sizeParam() + displayParam() +" >";
}
+ @Override
public String getXMLTail() {
return "</TMLTaskDiagramPanel>";
}
+ @Override
public String getXMLSelectedHead() {
return "<TMLTaskDiagramPanelCopy name=\"" + name + "\" xSel=\"" + xSel + "\" ySel=\"" + ySel + "\" widthSel=\"" + widthSel + "\" heightSel=\"" + heightSel + "\" >";
}
+ @Override
public String getXMLSelectedTail() {
return "</TMLTaskDiagramPanelCopy>";
}
+ @Override
public String getXMLCloneHead() {
return "<TMLTaskDiagramPanelCopy name=\"" + name + "\" xSel=\"" + 0 + "\" ySel=\"" + 0 + "\" widthSel=\"" + 0 + "\" heightSel=\"" + 0 + "\" >";
}
+ @Override
public String getXMLCloneTail() {
return "</TMLTaskDiagramPanelCopy>";
}
-
-
+ @Override
public boolean areAttributesVisible() {
return attributesVisible;
}
-
public boolean areChannelVisible() {
return synchroVisible;
}
@@ -152,7 +157,6 @@ public class TMLTaskDiagramPanel extends TDiagramPanel {
attributesVisible = b;
}
-
public void setChannelVisible(boolean b) {
channelVisible = b;
}
@@ -366,13 +370,13 @@ public class TMLTaskDiagramPanel extends TDiagramPanel {
}
}
- public ArrayList<String> getAllTMLTaskNames(String _topname) {
+ public List<String> getAllTMLTaskNames(String _topname) {
TGComponent tgc;
- Iterator iterator = componentList.listIterator();
- ArrayList<String> list = new ArrayList<String>();
+ Iterator<TGComponent> iterator = componentList.listIterator();
+ List<String> list = new ArrayList<String>();
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
if (tgc instanceof TMLTaskOperator) {
list.add(_topname + "::" + ((TMLTaskOperator)tgc).getTaskName());
}
@@ -381,15 +385,15 @@ public class TMLTaskDiagramPanel extends TDiagramPanel {
return list;
}
- public ArrayList<String> getAllTMLCommunicationNames(String _topname) {
+ public List<String> getAllTMLCommunicationNames(String _topname) {
TGComponent tgc;
- Iterator iterator = componentList.listIterator();
- ArrayList<String> list = new ArrayList<String>();
+ Iterator<TGComponent> iterator = componentList.listIterator();
+ List<String> list = new ArrayList<String>();
String name = "";
String type = "";
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
if (tgc instanceof TMLCompositionOperator) {
if (tgc instanceof TMLEventOperator) {
name = ((TMLEventOperator)tgc).getEventName();
@@ -411,19 +415,19 @@ public class TMLTaskDiagramPanel extends TDiagramPanel {
return list;
}
- public ArrayList<String> getAllTMLChannelNames( String _topname ) {
+ public List<String> getAllTMLChannelNames( String _topname ) {
TGComponent tgc;
- Iterator iterator = componentList.listIterator();
- ArrayList<String> list = new ArrayList<String>();
+ Iterator<TGComponent> iterator = componentList.listIterator();
+ List<String> list = new ArrayList<String>();
String name = "";
- String type = "";
+ //String type = "";
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
if (tgc instanceof TMLCompositionOperator) {
if (tgc instanceof TMLChannelOperator) {
name = ((TMLChannelOperator)tgc).getChannelName();
- type = "Channel";
+ // type = "Channel";
}
list.add(_topname + "::" + name );
}
@@ -432,30 +436,33 @@ public class TMLTaskDiagramPanel extends TDiagramPanel {
return list;
}
- public ArrayList<String> getAllTMLEventNames( String _topname ) {
+ public List<String> getAllTMLEventNames( String _topname ) {
TGComponent tgc;
- Iterator iterator = componentList.listIterator();
- ArrayList<String> list = new ArrayList<String>();
+ Iterator<TGComponent> iterator = componentList.listIterator();
+ List<String> list = new ArrayList<String>();
String name = "";
String type = "";
while( iterator.hasNext() ) {
- tgc = (TGComponent)( iterator.next() );
- if (tgc instanceof TMLCompositionOperator) {
- if (tgc instanceof TMLEventOperator) {
- name = ((TMLEventOperator)tgc).getEventName();
- type = "Event";
- }
- list.add( _topname + "::" + name + " (" + type + ")" );
- }
+ tgc = iterator.next();
+
+ if (tgc instanceof TMLCompositionOperator) {
+ if (tgc instanceof TMLEventOperator) {
+ name = ((TMLEventOperator)tgc).getEventName();
+ type = "Event";
+ }
+
+ list.add( _topname + "::" + name + " (" + type + ")" );
+ }
}
- return list;
+
+ return list;
}
- public ArrayList<String> getAllNonMappedTMLTaskNames(String _topName, TMLArchiDiagramPanel _tadp, boolean ref, String _name) {
+ public List<String> getAllNonMappedTMLTaskNames(String _topName, TMLArchiDiagramPanel _tadp, boolean ref, String _name) {
TGComponent tgc;
- Iterator iterator = componentList.listIterator();
- ArrayList<String> list = new ArrayList<String>();
+ Iterator<TGComponent> iterator = componentList.listIterator();
+ List<String> list = new ArrayList<String>();
String name;
while(iterator.hasNext()) {
@@ -477,8 +484,8 @@ public class TMLTaskDiagramPanel extends TDiagramPanel {
public TMLTaskOperator getTaskByName(String _name) {
TGComponent tgc;
- Iterator iterator = componentList.listIterator();
- ArrayList<String> list = new ArrayList<String>();
+ Iterator<TGComponent> iterator = componentList.listIterator();
+ //List<String> list = new ArrayList<String>();
while(iterator.hasNext()) {
tgc = (TGComponent)(iterator.next());
@@ -491,5 +498,4 @@ public class TMLTaskDiagramPanel extends TDiagramPanel {
return null;
}
-
}
diff --git a/src/main/java/ui/tmlcd/TMLTaskOperator.java b/src/main/java/ui/tmlcd/TMLTaskOperator.java
index 57d3134b734628fa457b2b3fe9b9a697dbbff864..110a6ad715db2c56fddb57b79ad3dd8c5c12e0ca 100755
--- a/src/main/java/ui/tmlcd/TMLTaskOperator.java
+++ b/src/main/java/ui/tmlcd/TMLTaskOperator.java
@@ -183,7 +183,7 @@ public class TMLTaskOperator extends TGCWithInternalComponent implements TMLTask
return w;
}*/
-
+ @Override
public void internalDrawing(Graphics g) {
if (!tdp.isScaled()) {
graphics = g;
@@ -210,6 +210,7 @@ public class TMLTaskOperator extends TGCWithInternalComponent implements TMLTask
}
}
+ @Override
public boolean editOndoubleClick(JFrame frame) {
oldValue = value;
diff --git a/src/main/java/ui/tmlcp/TGConnectorTMLCP.java b/src/main/java/ui/tmlcp/TGConnectorTMLCP.java
index 4bcca5ef6284ce4f394d8e69446cdf295a867831..2ed2f6dd8613fb36e4a278b4c97eabd6fa1ad8ac 100755
--- a/src/main/java/ui/tmlcp/TGConnectorTMLCP.java
+++ b/src/main/java/ui/tmlcp/TGConnectorTMLCP.java
@@ -55,8 +55,10 @@ import java.util.Vector;
* @author Ludovic APVRILLE
*/
public class TGConnectorTMLCP extends TADConnector /* Issue #69 TGConnector*/ {
- protected int arrowLength = 10;
- protected String guard = "";
+
+ protected int arrowLength = 10;
+
+ protected String guard = "";
public TGConnectorTMLCP(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector<Point> _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
diff --git a/src/main/java/ui/tmlcp/TMLCPRefSD.java b/src/main/java/ui/tmlcp/TMLCPRefSD.java
index dc6bb9e8469ffe7fc6f6b911a8aa3e1fc8179d92..413b831c3a1df5782e09ba025653aa4f193533c8 100755
--- a/src/main/java/ui/tmlcp/TMLCPRefSD.java
+++ b/src/main/java/ui/tmlcp/TMLCPRefSD.java
@@ -179,7 +179,7 @@ public class TMLCPRefSD extends TADOneLineText /* Issue #69 TGCOneLineText*/ {
@Override
public int getDefaultConnector() {
- return TGComponentManager.CONNECTOR_TMLCP;
+ return TGComponentManager.CONNECTOR_TMLCP;
}
/*public void setReferenceToSD( TMLSDPanel _panel ) {
diff --git a/src/main/java/ui/ucd/UseCaseDiagramToolBar.java b/src/main/java/ui/ucd/UseCaseDiagramToolBar.java
index b5c0a5a355bd3a8f5258a79de6ecefca6b926453..8daec1fd10bf83311febf2852bab7aaa558b44bb 100755
--- a/src/main/java/ui/ucd/UseCaseDiagramToolBar.java
+++ b/src/main/java/ui/ucd/UseCaseDiagramToolBar.java
@@ -36,9 +36,6 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
package ui.ucd;
import myutil.TraceManager;
@@ -60,12 +57,11 @@ public class UseCaseDiagramToolBar extends TToolBar {
public UseCaseDiagramToolBar(MainGUI _mgui) {
super(_mgui);
-
}
protected void setActive(boolean b) {
- TraceManager.addDev("Setting to " + b + " Zoom");
- mgui.actions[TGUIAction.ACT_ZOOM_MORE].setEnabled(b);
+ TraceManager.addDev("Setting to " + b + " Zoom");
+ mgui.actions[TGUIAction.ACT_ZOOM_MORE].setEnabled(b);
mgui.actions[TGUIAction.ACT_ZOOM_LESS].setEnabled(b);
mgui.actions[TGUIAction.ACT_SHOW_ZOOM].setEnabled(b);