diff --git a/src/main/java/ui/TDiagramMouseManager.java b/src/main/java/ui/TDiagramMouseManager.java
index e21d08b1762ea63875e1eb40061da31c7bc9093f..e8e37b2ad74f4aefc0683e4147bcc71917f4935c 100755
--- a/src/main/java/ui/TDiagramMouseManager.java
+++ b/src/main/java/ui/TDiagramMouseManager.java
@@ -617,7 +617,6 @@ public class TDiagramMouseManager extends MouseAdapter {//implements MouseListen
return;
}
-
if (tdp.mode == TDiagramPanel.SELECTING_COMPONENTS) {
tdp.updateSelectingComponents(e.getX(), e.getY());
tdp.repaint();
diff --git a/src/main/java/ui/TGCScalableWithoutInternalComponentOneLineText.java b/src/main/java/ui/TGCScalableWithoutInternalComponentOneLineText.java
index 305e703e903ee927684393b99755854ce4d24cb2..0f47552670b793e09e06b0e39824ad55243d3157 100755
--- a/src/main/java/ui/TGCScalableWithoutInternalComponentOneLineText.java
+++ b/src/main/java/ui/TGCScalableWithoutInternalComponentOneLineText.java
@@ -36,9 +36,6 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
package ui;
import myutil.Conversion;
@@ -48,10 +45,6 @@ import ui.util.IconManager;
import javax.swing.*;
import java.awt.*;
-//import java.awt.geom.*;
-
-//import java.awt.*;
-
/**
* Class TGCScalableWithoutInternalComponent
* Graphical component that contains no internal components, and which is scalable
@@ -59,10 +52,9 @@ import java.awt.*;
* @version 1.0 08/03/2017
* @author Ludovic APVRILLE
*/
-public abstract class TGCScalableWithoutInternalComponentOneLineText extends TGCScalableWithoutInternalComponent implements ScalableTGComponent {
+public abstract class TGCScalableWithoutInternalComponentOneLineText extends TGCScalableWithoutInternalComponent /*implements ScalableTGComponent*/ {
protected boolean emptyText;
-
public TGCScalableWithoutInternalComponentOneLineText(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
@@ -82,7 +74,7 @@ public abstract class TGCScalableWithoutInternalComponentOneLineText extends TGC
myImageIcon = IconManager.imgic302;
}
-
+ @Override
public void internalDrawing(Graphics g) {
if (!tdp.isScaled()) {
width = g.getFontMetrics().stringWidth(value);
@@ -94,6 +86,7 @@ public abstract class TGCScalableWithoutInternalComponentOneLineText extends TGC
}
}
+ @Override
public TGComponent isOnMe(int _x, int _y) {
if (GraphicLib.isInRectangle(_x, _y, x, y - height, Math.max(width, minWidth), height)) {
return this;
@@ -101,12 +94,14 @@ public abstract class TGCScalableWithoutInternalComponentOneLineText extends TGC
return null;
}
+ @Override
public boolean editOndoubleClick(JFrame frame) {
String oldValue = value;
String text = getName() + ": ";
if (hasFather()) {
text = getTopLevelName() + " / " + text;
}
+
String s = (String)JOptionPane.showInputDialog(frame, text,
"setting value", JOptionPane.PLAIN_MESSAGE, IconManager.imgic101,
null,
@@ -116,17 +111,12 @@ public abstract class TGCScalableWithoutInternalComponentOneLineText extends TGC
s = Conversion.removeFirstSpaces(s);
}
- //
-
if ((s != null) && ((emptyText) || s.length() > 0) && (!s.equals(oldValue))) {
setValue(s);
//
return true;
}
-
return false;
}
-
-
}
diff --git a/src/main/java/ui/TGCWithoutInternalComponent.java b/src/main/java/ui/TGCWithoutInternalComponent.java
index 8689b451937bd35e3a17fb4495a24b6019c4226e..dcf49f283fd14fa75ef0da880400740a16acbb04 100755
--- a/src/main/java/ui/TGCWithoutInternalComponent.java
+++ b/src/main/java/ui/TGCWithoutInternalComponent.java
@@ -47,7 +47,6 @@ package ui;
*/
public abstract class TGCWithoutInternalComponent extends TGComponent{
-
public TGCWithoutInternalComponent(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
diff --git a/src/main/java/ui/atd/ATDAttackConnector.java b/src/main/java/ui/atd/ATDAttackConnector.java
index 300ce4ea0e2b3f4b20046ae6fca522d34ff084f6..1fc5ac368b46d88f5ac2400cf5d31a1fbcdce4e1 100644
--- a/src/main/java/ui/atd/ATDAttackConnector.java
+++ b/src/main/java/ui/atd/ATDAttackConnector.java
@@ -55,7 +55,7 @@ import java.util.Vector;
* @version 1.0 09/12/2009
* @author Ludovic APVRILLE
*/
-public class ATDAttackConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent {
+public class ATDAttackConnector extends TGConnectorWithCommentConnectionPoints implements ScalableTGComponent {
//protected int arrowLength = 10;
//protected int widthValue, heightValue, maxWidthValue, h;
protected int c = 5; //square length
diff --git a/src/main/java/ui/atd/ATDCountermeasureConnector.java b/src/main/java/ui/atd/ATDCountermeasureConnector.java
index 5d2d9748ea5016f9648a22e9bf2655b318cb0764..12ae85f63395f8d2b9776a038cd430de3bbbc4c9 100644
--- a/src/main/java/ui/atd/ATDCountermeasureConnector.java
+++ b/src/main/java/ui/atd/ATDCountermeasureConnector.java
@@ -36,22 +36,21 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
package ui.atd;
+import java.awt.Graphics;
+import java.awt.Point;
+import java.util.Vector;
-import myutil.Conversion;
import myutil.GraphicLib;
-import ui.*;
+import ui.ScalableTGComponent;
+import ui.TDiagramPanel;
+import ui.TGComponent;
+import ui.TGComponentManager;
+import ui.TGConnectingPoint;
+import ui.TGConnectorWithCommentConnectionPoints;
import ui.util.IconManager;
-import javax.swing.*;
-import java.awt.*;
-import java.awt.geom.Point2D;
-import java.util.Vector;
-
/**
* Class ATDCountermeasureConnector
* Connector used in Attack Tree Diagrams
@@ -66,7 +65,6 @@ public class ATDCountermeasureConnector extends TGConnectorWithCommentConnectio
protected double oldScaleFactor;
protected int fontSize = 12;
-
public ATDCountermeasureConnector(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);
myImageIcon = IconManager.imgic202;
@@ -75,20 +73,23 @@ public class ATDCountermeasureConnector extends TGConnectorWithCommentConnectio
oldScaleFactor = tdp.getZoom();
}
-
+ @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.ATD_COUNTERMEASURE_CONNECTOR;
}
+ @Override
public void rescale(double scaleFactor){
//
int xx, yy;
@@ -111,9 +112,4 @@ public class ATDCountermeasureConnector extends TGConnectorWithCommentConnectio
oldScaleFactor = scaleFactor;
}
-
-
-
-
-
}
diff --git a/src/main/java/ui/avatarbd/AvatarBDCompositionConnector.java b/src/main/java/ui/avatarbd/AvatarBDCompositionConnector.java
index 863ab047ebab434310c6bb73022905050621bc2c..ffbd47212578ac742048a7d528691c6c09b3feaf 100644
--- a/src/main/java/ui/avatarbd/AvatarBDCompositionConnector.java
+++ b/src/main/java/ui/avatarbd/AvatarBDCompositionConnector.java
@@ -36,12 +36,8 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
package ui.avatarbd;
-
import ui.*;
import ui.util.IconManager;
@@ -76,6 +72,7 @@ public class AvatarBDCompositionConnector extends TGConnectorWithCommentConnect
rescaled = true;
}
+ @Override
protected void drawLastSegment(Graphics g, int x1, int y1, int x2, int y2) {
if ((p == null) || (rescaled) || (xp1 != x1) || (xp2 != x2) || (yp1 != y1) || (yp2 != y2)){
p = new Polygon();
@@ -83,7 +80,7 @@ public class AvatarBDCompositionConnector extends TGConnectorWithCommentConnect
xp2 = x2;
yp1 = y1;
yp2 = y2;
- Double alpha;
+ //Double alpha;
int dd = (int)(d*tdp.getZoom());
int DD = (int)(D*tdp.getZoom());
@@ -166,6 +163,7 @@ public class AvatarBDCompositionConnector extends TGConnectorWithCommentConnect
rescaled = false;
}
+ @Override
public TGComponent extraIsOnOnlyMe(int x1, int y1) {
if (p != null) {
if (p.contains(x1, y1)) {
@@ -176,6 +174,7 @@ public class AvatarBDCompositionConnector extends TGConnectorWithCommentConnect
return null;
}
+ @Override
public void rescale(double scaleFactor){
//
int xx, yy;
@@ -200,11 +199,8 @@ public class AvatarBDCompositionConnector extends TGConnectorWithCommentConnect
rescaled = true;
}
-
+ @Override
public int getType() {
return TGComponentManager.AVATARBD_COMPOSITION_CONNECTOR;
}
-
-
-
}
diff --git a/src/main/java/ui/avatarbd/AvatarBDPortConnector.java b/src/main/java/ui/avatarbd/AvatarBDPortConnector.java
index 6976fbcd17a3a47b5e38662af035b0e04483f13a..4865de9efc1a0dd386102e6797805cdaa7131679 100644
--- a/src/main/java/ui/avatarbd/AvatarBDPortConnector.java
+++ b/src/main/java/ui/avatarbd/AvatarBDPortConnector.java
@@ -36,10 +36,8 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
package ui.avatarbd;
-
import myutil.GraphicLib;
import myutil.TraceManager;
import org.w3c.dom.Element;
@@ -50,8 +48,14 @@ import ui.util.IconManager;
import ui.window.JDialogSignalAssociation;
import javax.swing.*;
-import java.awt.*;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Point;
+import java.awt.Polygon;
import java.util.LinkedList;
+import java.util.List;
import java.util.Vector;
/**
@@ -71,11 +75,11 @@ public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoint
protected int decY = 12;
protected int decX = 6;
- protected LinkedList<String> inSignalsAtOrigin;
- protected LinkedList<String> outSignalsAtDestination;
+ protected List<String> inSignalsAtOrigin;
+ protected List<String> outSignalsAtDestination;
- protected LinkedList<String> inSignalsAtDestination;
- protected LinkedList<String> outSignalsAtOrigin;
+ protected List<String> inSignalsAtDestination;
+ protected List<String> outSignalsAtOrigin;
protected boolean asynchronous;
protected int sizeOfFIFO;
@@ -98,6 +102,7 @@ public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoint
outSignalsAtDestination = new LinkedList<String>();
}
+ @Override
protected void drawLastSegment(Graphics g, int x1, int y1, int x2, int y2) {
/*if (Point2D.distance(x1, y1, x2, y2) < GraphicLib.longueur * 1.5) {
g.drawLine(x1, y1, x2, y2);
@@ -137,7 +142,7 @@ public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoint
}
if (isLossy) {
- int czz = (int) (cz * 1.4);
+ // int czz = (int) (cz * 1.4);
int x3 = p1.getX();
int y3 = p1.getY();
g.drawImage(IconManager.img5072, x3 -cz, y3 + cz/2, null);
@@ -172,10 +177,8 @@ public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoint
g.drawOval(x3 + czz - 4, y3 - cz - 7, 8, 6);
g.fillOval(x2 + czz - 2, y2 - cz - 6, 5, 4);
g.fillOval(x3 + czz - 2, y3 - cz - 6, 5, 4);
-
}
-
Point p11;
if (isp1) {
p11 = GraphicLib.intersectionRectangleSegment(p1.getX() - (cz / 2), p1.getY() - (cz / 2), cz, cz, x1, y1, x2, y2);
@@ -302,6 +305,7 @@ public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoint
return (AvatarBDBlock) (tdp.getComponentToWhichBelongs(p2));
}
+ @Override
public boolean editOndoubleClick(JFrame frame) {
// Gets the two concerned blocks
@@ -368,6 +372,7 @@ public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoint
return true;
}
+ @Override
protected String translateExtraParam() {
StringBuffer sb = new StringBuffer("<extraparam>\n");
for (String iso : inSignalsAtOrigin) {
@@ -509,15 +514,16 @@ public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoint
}
} catch (Exception e) {
- throw new MalformedModelingException();
+ throw new MalformedModelingException( e );
}
}
-
+ @Override
public int getType() {
return TGComponentManager.AVATARBD_PORT_CONNECTOR;
}
+ @Override
public void rescale(double scaleFactor) {
//
int xx, yy;
@@ -541,15 +547,15 @@ public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoint
oldScaleFactor = scaleFactor;
}
- public LinkedList<String> getListOfSignalsOrigin() {
- LinkedList<String> list = new LinkedList<String>();
+ public List<String> getListOfSignalsOrigin() {
+ List<String> list = new LinkedList<String>();
list.addAll(inSignalsAtOrigin);
list.addAll(outSignalsAtOrigin);
return list;
}
- public LinkedList<String> getListOfSignalsDestination() {
- LinkedList<String> list = new LinkedList<String>();
+ public List<String> getListOfSignalsDestination() {
+ List<String> list = new LinkedList<String>();
list.addAll(outSignalsAtDestination);
list.addAll(inSignalsAtDestination);
return list;
@@ -770,9 +776,5 @@ public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoint
}
return b1 + "/" + sig1 + " #--# " + b2 + "/" + sig2;
-
-
}
-
-
}
diff --git a/src/main/java/ui/tmlcompd/TMLCCompositePort.java b/src/main/java/ui/tmlcompd/TMLCCompositePort.java
index dcd4da95f0ba1e90ba82883ea3f6124ace3fa911..50f0cb31c5e14784ad57a49dddb34eaf577b5e69 100755
--- a/src/main/java/ui/tmlcompd/TMLCCompositePort.java
+++ b/src/main/java/ui/tmlcompd/TMLCCompositePort.java
@@ -36,9 +36,6 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
package ui.tmlcompd;
import myutil.GraphicLib;
@@ -264,15 +261,17 @@ public class TMLCCompositePort extends TMLCChannelFacility implements SwallowedT
return null;
}*/
-
+ @Override
public int getType() {
return TGComponentManager.TMLCTD_CPORT;
}
+ @Override
public void wasSwallowed() {
myColor = null;
}
+ @Override
public void wasUnswallowed() {
myColor = null;
setFather(null);
@@ -281,6 +280,7 @@ public class TMLCCompositePort extends TMLCChannelFacility implements SwallowedT
}
+ @Override
public void resizeWithFather() {
//TraceManager.addDev("Resize port with father");
if ((father != null) && (father instanceof TMLCCompositeComponent)) {
@@ -404,7 +404,8 @@ public class TMLCCompositePort extends TMLCChannelFacility implements SwallowedT
return s;
}*/
- public void myActionWhenRemoved() {
+ @Override
+ public void myActionWhenRemoved() {
tdp = null;
TGComponent tgc = getFather();
if (tgc instanceof TMLCCompositeComponent) {
@@ -416,6 +417,4 @@ public class TMLCCompositePort extends TMLCChannelFacility implements SwallowedT
/*public Color getPortColor() {
return portColor;
}*/
-
-
}
diff --git a/src/main/java/ui/ucd/UCDActor.java b/src/main/java/ui/ucd/UCDActor.java
index b4991f08efa332de6263983a8dd0e43e7c6ab820..bb4895cbe0f3579319582abe5ffc161b5906190c 100755
--- a/src/main/java/ui/ucd/UCDActor.java
+++ b/src/main/java/ui/ucd/UCDActor.java
@@ -68,11 +68,10 @@ public class UCDActor extends TGCScalableWithoutInternalComponentOneLineText {
public UCDActor(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
-
width = (int)(30 * tdp.getZoom());
height = (int)(70 * tdp.getZoom());
- oldScaleFactor = tdp.getZoom();
+ oldScaleFactor = tdp.getZoom();
//minWidth = 30;
nbConnectingPoint = 24;
@@ -94,7 +93,7 @@ public class UCDActor extends TGCScalableWithoutInternalComponentOneLineText {
editable = true;
removable = true;
- super.oldScaleFactor = tdp.getZoom();
+ super.oldScaleFactor = tdp.getZoom();
//currentFontSize = (int) (maxFontSize*oldScaleFactor);
value = "Actor";
@@ -111,8 +110,8 @@ public class UCDActor extends TGCScalableWithoutInternalComponentOneLineText {
}
public void internalDrawingAux(Graphics graph) {
- Font font = graph.getFont ();
- String ster;
+ //Font font = graph.getFont ();
+ // String ster;
/*if (this.rescaled && !this.tdp.isScaled ()) {
this.rescaled = false;