diff --git a/src/main/java/ui/ActionPerformer.java b/src/main/java/ui/ActionPerformer.java
index ef4f7a86a8dc053da1c2ec24ade7bdca9b726d5a..6a7b84246145a3160289d75c3d11df08267ae837 100644
--- a/src/main/java/ui/ActionPerformer.java
+++ b/src/main/java/ui/ActionPerformer.java
@@ -1108,23 +1108,23 @@ public class ActionPerformer {
// avatar Method
- } else if (command.equals(mgui.actions[TGUIAction.AM_EDIT].getActionCommand())) {
+ } else if (command.equals(mgui.actions[TGUIAction.M_EDIT].getActionCommand())) {
mgui.actionOnButton(TGComponentManager.EDIT, -1);
- } else if (command.equals(mgui.actions[TGUIAction.AM_LINK].getActionCommand())) {
+ } else if (command.equals(mgui.actions[TGUIAction.M_LINK].getActionCommand())) {
// TraceManager.addDev("Connector interaction");
- mgui.actionOnButton(TGComponentManager.CONNECTOR, TGComponentManager.AVATARMETHODOLOGY_CONNECTOR);
- } else if (command.equals(mgui.actions[TGUIAction.AM_REF_ASSUMPTIONS].getActionCommand())) {
- mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.AVATARMETHODOLOGY_REF_ASSUMPTIONS);
- } else if (command.equals(mgui.actions[TGUIAction.AM_REF_REQUIREMENTS].getActionCommand())) {
- mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.AVATARMETHODOLOGY_REF_REQUIREMENT);
- } else if (command.equals(mgui.actions[TGUIAction.AM_REF_ANALYSIS].getActionCommand())) {
- mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.AVATARMETHODOLOGY_REF_ANALYSIS);
- } else if (command.equals(mgui.actions[TGUIAction.AM_REF_DESIGN].getActionCommand())) {
- mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.AVATARMETHODOLOGY_REF_DESIGN);
+ mgui.actionOnButton(TGComponentManager.CONNECTOR, TGComponentManager.SYSMLSEC_METHODOLOGY_CONNECTOR);
+ } else if (command.equals(mgui.actions[TGUIAction.M_REF_ASSUMPTIONS].getActionCommand())) {
+ mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.SYSMLSEC_METHODOLOGY_REF_ASSUMPTIONS);
+ } else if (command.equals(mgui.actions[TGUIAction.M_REF_REQUIREMENTS].getActionCommand())) {
+ mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.SYSMLSEC_METHODOLOGY_REF_REQUIREMENT);
+ } else if (command.equals(mgui.actions[TGUIAction.M_REF_ANALYSIS].getActionCommand())) {
+ mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.SYSMLSEC_METHODOLOGY_REF_ANALYSIS);
+ } else if (command.equals(mgui.actions[TGUIAction.M_REF_DESIGN].getActionCommand())) {
+ mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.SYSMLSEC_METHODOLOGY_REF_DESIGN);
} else if (command.equals(mgui.actions[TGUIAction.AM_REF_PROPERTIES].getActionCommand())) {
- mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.AVATARMETHODOLOGY_REF_PROPERTIES);
- } else if (command.equals(mgui.actions[TGUIAction.AM_REF_PROTOTYPING].getActionCommand())) {
- mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.AVATARMETHODOLOGY_REF_PROTOTYPE);
+ mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.SYSMLSEC_METHODOLOGY_REF_PROPERTIES);
+ } else if (command.equals(mgui.actions[TGUIAction.M_REF_PROTOTYPING].getActionCommand())) {
+ mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.SYSMLSEC_METHODOLOGY_REF_PROTOTYPE);
// Requirement diagrams
} else if (command.equals(mgui.actions[TGUIAction.TREQ_REQUIREMENT].getActionCommand())) {
diff --git a/src/main/java/ui/TGUIAction.java b/src/main/java/ui/TGUIAction.java
index 5419e8e11882816ba99376c3fbb86386a48a09b9..1041ab9d1acf37d0b79bcac7b5282d71d21d23e9 100644
--- a/src/main/java/ui/TGUIAction.java
+++ b/src/main/java/ui/TGUIAction.java
@@ -694,14 +694,14 @@ public class TGUIAction extends AbstractAction {
// AVATAR Method
- public static final int AM_EDIT = 539;
- public static final int AM_LINK = 540;
- public static final int AM_REF_ASSUMPTIONS = 541;
- public static final int AM_REF_REQUIREMENTS = 542;
- public static final int AM_REF_ANALYSIS = 543;
- public static final int AM_REF_DESIGN = 544;
+ public static final int M_EDIT = 539;
+ public static final int M_LINK = 540;
+ public static final int M_REF_ASSUMPTIONS = 541;
+ public static final int M_REF_REQUIREMENTS = 542;
+ public static final int M_REF_ANALYSIS = 543;
+ public static final int M_REF_DESIGN = 544;
public static final int AM_REF_PROPERTIES = 545;
- public static final int AM_REF_PROTOTYPING = 546;
+ public static final int M_REF_PROTOTYPING = 546;
public static final int NB_ACTION = 547; // Last + 1
@@ -1478,22 +1478,22 @@ public class TGUIAction extends AbstractAction {
actions[FIRST_DIAGRAM] = new TAction("FirstDiagram", "First Diagram", IconManager.imgic142, IconManager.imgic142, "Switch the the first diagram", "Switch to the first diagram", 0);
// Avatar methods
- actions[AM_EDIT] = new TAction("edit-am-diagram", "Edit Avatar Methodology", IconManager.imgic100, IconManager.imgic101, "Edit " +
- "Avatar methodology diagram", "Make it possible to edit the currently opened avatar methodology", 0);
- actions[AM_LINK] = new TAction("add-am-connector", "Add Connector", IconManager.imgic202, IconManager.imgic202, "Connector", "Add" +
- " a Connector between two components of the currently opened avatar method", 0);
- actions[AM_REF_ASSUMPTIONS] = new TAction("add-ref-ass", "Add reference to a assumption diagram", IconManager.imgic404, IconManager.imgic404,
+ actions[M_EDIT] = new TAction("edit-m-diagram", "Edit Methodology", IconManager.imgic100, IconManager.imgic101, "Edit " +
+ "Methodology diagram", "Make it possible to edit the currently opened methodology", 0);
+ actions[M_LINK] = new TAction("add-m-connector", "Add Connector", IconManager.imgic202, IconManager.imgic202, "Connector", "Add" +
+ " a Connector between two components of the currently opened method", 0);
+ actions[M_REF_ASSUMPTIONS] = new TAction("add-ref-ass", "Add reference to an assumption diagram", IconManager.imgic404, IconManager.imgic404,
"Reference to assumptions", "Add a reference to an assumption diagram", 0);
- actions[AM_REF_REQUIREMENTS] = new TAction("add-ref-req", "Add reference to a requirement diagram", IconManager.imgic406,
+ actions[M_REF_REQUIREMENTS] = new TAction("add-ref-req", "Add reference to a requirement diagram", IconManager.imgic406,
IconManager.imgic406,
"Reference to requirements", "Add a reference to a requirement diagram", 0);
- actions[AM_REF_ANALYSIS] = new TAction("add-ref-anal", "Add reference to analysis diagrams", IconManager.imgic408, IconManager.imgic408,
+ actions[M_REF_ANALYSIS] = new TAction("add-ref-anal", "Add reference to analysis diagrams", IconManager.imgic408, IconManager.imgic408,
"Reference to analysis", "Add a reference to a analysis diagrams", 0);
- actions[AM_REF_DESIGN] = new TAction("add-ref-des", "Add reference to design diagrams", IconManager.imgic410, IconManager.imgic410,
+ actions[M_REF_DESIGN] = new TAction("add-ref-des", "Add reference to design diagrams", IconManager.imgic410, IconManager.imgic410,
"Reference to designs", "Add a reference to design diagrams", 0);
actions[AM_REF_PROPERTIES] = new TAction("add-ref-prop", "Add reference to property diagrams", IconManager.imgic412, IconManager.imgic412,
"Reference to properties", "Add a reference to a property diagrams", 0);
- actions[AM_REF_PROTOTYPING] = new TAction("add-ref-proto", "Add reference to a prototyping diagram", IconManager.imgic414,
+ actions[M_REF_PROTOTYPING] = new TAction("add-ref-proto", "Add reference to a prototyping diagram", IconManager.imgic414,
IconManager.imgic414,
"Reference to prototyping", "Add a reference to a prototyping diagram", 0);
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramToolbar.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramToolbar.java
index 17ee41d61d32a246f60cfd82d5ac11bc60035ed8..55d5ad063e33d7a06e3ff379895ec2022d9a7d37 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramToolbar.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramToolbar.java
@@ -70,18 +70,10 @@ public class AvatarMethodologyDiagramToolbar extends TToolBar {
mgui.actions[TGUIAction.ACT_SHOW_ZOOM].setEnabled(b);
mgui.updateZoomInfo();
-
- mgui.actions[TGUIAction.AM_EDIT].setEnabled(b);
+
mgui.actions[TGUIAction.UML_NOTE].setEnabled(b);
mgui.actions[TGUIAction.CONNECTOR_COMMENT].setEnabled(b);
-
- mgui.actions[TGUIAction.AM_LINK].setEnabled(b);
- mgui.actions[TGUIAction.AM_REF_ASSUMPTIONS].setEnabled(b);
- mgui.actions[TGUIAction.AM_REF_REQUIREMENTS].setEnabled(b);
- mgui.actions[TGUIAction.AM_REF_ANALYSIS].setEnabled(b);
- mgui.actions[TGUIAction.AM_REF_DESIGN].setEnabled(b);
- mgui.actions[TGUIAction.AM_REF_PROPERTIES].setEnabled(b);
- mgui.actions[TGUIAction.AM_REF_PROTOTYPING].setEnabled(b);
+
mgui.actions[TGUIAction.ACT_MODEL_CHECKING].setEnabled(!b);
@@ -90,10 +82,7 @@ public class AvatarMethodologyDiagramToolbar extends TToolBar {
protected void setButtons() {
JButton button;
- button = this.add(mgui.actions[TGUIAction.AM_EDIT]);
- button.addMouseListener(mgui.mouseHandler);
-
- this.addSeparator();
+
button = this.add(mgui.actions[TGUIAction.UML_NOTE]);
button.addMouseListener(mgui.mouseHandler);
@@ -101,40 +90,7 @@ public class AvatarMethodologyDiagramToolbar extends TToolBar {
button = this.add(mgui.actions[TGUIAction.CONNECTOR_COMMENT]);
button.addMouseListener(mgui.mouseHandler);
- this.addSeparator();
-
- button = this.add(mgui.actions[TGUIAction.AM_LINK]);
- button.addMouseListener(mgui.mouseHandler);
-
- this.addSeparator();
-
- button = this.add(mgui.actions[TGUIAction.AM_REF_ASSUMPTIONS]);
- button.addMouseListener(mgui.mouseHandler);
-
- this.addSeparator();
- button = this.add(mgui.actions[TGUIAction.AM_REF_REQUIREMENTS]);
- button.addMouseListener(mgui.mouseHandler);
-
- this.addSeparator();
-
- button = this.add(mgui.actions[TGUIAction.AM_REF_ANALYSIS]);
- button.addMouseListener(mgui.mouseHandler);
-
- this.addSeparator();
-
- button = this.add(mgui.actions[TGUIAction.AM_REF_DESIGN]);
- button.addMouseListener(mgui.mouseHandler);
-
- this.addSeparator();
-
- button = this.add(mgui.actions[TGUIAction.AM_REF_PROPERTIES]);
- button.addMouseListener(mgui.mouseHandler);
-
- this.addSeparator();
-
- button = this.add(mgui.actions[TGUIAction.AM_REF_PROTOTYPING]);
- button.addMouseListener(mgui.mouseHandler);
}
diff --git a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java
index aad40b81d5aa51d82883cdc32df6c540eb1a7003..91d467257c97ce1af88917ef9ced0f16aeeb9a6b 100755
--- a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java
+++ b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReferenceToApplication.java
@@ -88,7 +88,7 @@ public class DiplodocusMethodologyDiagramReferenceToApplication extends Diplodoc
dn.setValidationsInfo(1, DiplodocusMethodologyDiagramName.SIM_TRACE_APP_DIPLO);
//dn.setValidationsInfo(2, DiplodocusMethodologyDiagramName.LOT_APP_DIPLO);
dn.setValidationsInfo(2, DiplodocusMethodologyDiagramName.UPP_APP_DIPLO);
- dn.setValidationsInfo(3, DiplodocusMethodologyDiagramName.PROVERIF_DIPLO);
+ dn.setValidationsInfo(3, DiplodocusMethodologyDiagramName.PROVERIF_DIPLO);
dn.setValidationsInfo(4, DiplodocusMethodologyDiagramName.TML_APP_DIPLO);
}
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramName.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramName.java
index 38a73e5bb5cdb70dfe7c23cbc4aa6c13163bb28c..c23cc52a1d7648ef797f3ecb4637661b3dd3a4de 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramName.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramName.java
@@ -97,7 +97,7 @@ public class SysmlsecMethodologyDiagramName extends TGCScalableWithoutInternalCo
"Verify security properties on the model with ProVerif",
"Verify mutual exclusions on the model with invariants",
"Generate executable code",
- "Generate a vcd simulation trace of a DIPLODOCUS functional model",
+ "Generate a vcd simulation trace of a DIPLODOCUS functional model",
"Verify a DIPLODOCUS functional model with UPPAAL",
"Generate a Reachability graph of a DIPLODOCUS functional model",
"Generate a TML text description of a DIPLODOCUS functional model",
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramReference.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramReference.java
index 0a325fa4cf3c7c6005adb3bca19bf4ed05f97448..68c3e1192cbc4746ff44c73c91b89e02779e08ca 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramReference.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramReference.java
@@ -45,6 +45,7 @@ package ui.sysmlsecmethodology;
import myutil.GraphicLib;
import myutil.TraceManager;
import ui.*;
+import ui.avatarmethodology.AvatarMethodologyConnectingPoint;
import ui.util.IconManager;
import ui.window.JDialogManageListOfString;
@@ -121,6 +122,23 @@ public abstract class SysmlsecMethodologyDiagramReference extends TGCScalableWit
minWidth = 10;
minHeight = lineHeight;
+ nbConnectingPoint = 12;
+ connectingPoint = new TGConnectingPoint[nbConnectingPoint];
+ connectingPoint[0] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, true, true, 0.0, 0.25, TGConnectingPoint.WEST);
+ connectingPoint[1] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, true, true, 0.0, 0.5, TGConnectingPoint.WEST);
+ connectingPoint[2] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, true, true, 0.0, 0.75, TGConnectingPoint.WEST);
+ connectingPoint[3] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, true, true, 1.0, 0.25, TGConnectingPoint.EAST);
+ connectingPoint[4] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, true, true, 1.0, 0.5, TGConnectingPoint.EAST);
+ connectingPoint[5] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, true, true, 1.0, 0.75, TGConnectingPoint.EAST);
+ connectingPoint[6] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, true, true, 0.25, 0.0, TGConnectingPoint.NORTH);
+ connectingPoint[7] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, true, true, 0.5, 0.0, TGConnectingPoint.NORTH);
+ connectingPoint[8] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, true, true, 0.75, 0.0, TGConnectingPoint.NORTH);
+ connectingPoint[9] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, true, true, 0.25, 1.0, TGConnectingPoint.SOUTH);
+ connectingPoint[10] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, true, true, 0.5, 1.0, TGConnectingPoint.SOUTH);
+ connectingPoint[11] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, true, true, 0.75, 1.0, TGConnectingPoint.SOUTH);
+
+ addTGConnectingPointsCommentTop();
+
addTGConnectingPointsCommentTop();
nbInternalTGComponent = 0;
@@ -133,7 +151,7 @@ public abstract class SysmlsecMethodologyDiagramReference extends TGCScalableWit
moveable = true;
editable = true;
- removable = false;
+ removable = true;
userResizable = true;
multieditable = true;
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramToolbar.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramToolbar.java
index e2635fb1042e2233fd55381735d32c895a072732..244ca681da76b496feb1ccccdb02f682f6b6d963 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramToolbar.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyDiagramToolbar.java
@@ -71,32 +71,30 @@ public class SysmlsecMethodologyDiagramToolbar extends TToolBar {
mgui.actions[TGUIAction.ACT_SHOW_ZOOM].setEnabled(b);
mgui.updateZoomInfo();
- //mgui.actions[TGUIAction.ARD_EDIT].setEnabled(b);
+ mgui.actions[TGUIAction.M_EDIT].setEnabled(b);
mgui.actions[TGUIAction.UML_NOTE].setEnabled(b);
mgui.actions[TGUIAction.CONNECTOR_COMMENT].setEnabled(b);
- /*mgui.actions[TGUIAction.ARD_REQUIREMENT].setEnabled(b);
- mgui.actions[TGUIAction.ARD_PROPERTY].setEnabled(b);
- mgui.actions[TGUIAction.ARD_VERIFY_CONNECTOR].setEnabled(b);
- mgui.actions[TGUIAction.ARD_DERIVE_CONNECTOR].setEnabled(b);
- mgui.actions[TGUIAction.ARD_REFINE_CONNECTOR].setEnabled(b);
- mgui.actions[TGUIAction.ARD_COPY_CONNECTOR].setEnabled(b);
- mgui.actions[TGUIAction.ARD_COMPOSITION_CONNECTOR].setEnabled(b);
- mgui.actions[TGUIAction.ACT_TOGGLE_ATTR].setEnabled(b);
-
- mgui.actions[TGUIAction.ACT_ENHANCE].setEnabled(b);*/
+ mgui.actions[TGUIAction.M_LINK].setEnabled(b);
+ mgui.actions[TGUIAction.M_REF_ASSUMPTIONS].setEnabled(b);
+ mgui.actions[TGUIAction.M_REF_REQUIREMENTS].setEnabled(b);
+ mgui.actions[TGUIAction.M_REF_ANALYSIS].setEnabled(b);
+ mgui.actions[TGUIAction.M_REF_DESIGN].setEnabled(b);
+ mgui.actions[TGUIAction.AM_REF_PROPERTIES].setEnabled(b);
+ mgui.actions[TGUIAction.M_REF_PROTOTYPING].setEnabled(b);
mgui.actions[TGUIAction.ACT_MODEL_CHECKING].setEnabled(!b);
+
}
protected void setButtons() {
JButton button;
- /*button = this.add(mgui.actions[TGUIAction.ARD_EDIT]);
- button.addMouseListener(mgui.mouseHandler);
+ button = this.add(mgui.actions[TGUIAction.M_EDIT]);
+ button.addMouseListener(mgui.mouseHandler);
- this.addSeparator();*/
+ this.addSeparator();
button = this.add(mgui.actions[TGUIAction.UML_NOTE]);
button.addMouseListener(mgui.mouseHandler);
@@ -106,6 +104,41 @@ public class SysmlsecMethodologyDiagramToolbar extends TToolBar {
this.addSeparator();
+ button = this.add(mgui.actions[TGUIAction.M_LINK]);
+ button.addMouseListener(mgui.mouseHandler);
+
+ this.addSeparator();
+
+ button = this.add(mgui.actions[TGUIAction.M_REF_ASSUMPTIONS]);
+ button.addMouseListener(mgui.mouseHandler);
+
+ this.addSeparator();
+
+ button = this.add(mgui.actions[TGUIAction.M_REF_REQUIREMENTS]);
+ button.addMouseListener(mgui.mouseHandler);
+
+ this.addSeparator();
+
+ button = this.add(mgui.actions[TGUIAction.M_REF_ANALYSIS]);
+ button.addMouseListener(mgui.mouseHandler);
+
+ this.addSeparator();
+
+ button = this.add(mgui.actions[TGUIAction.M_REF_DESIGN]);
+ button.addMouseListener(mgui.mouseHandler);
+
+ this.addSeparator();
+
+ button = this.add(mgui.actions[TGUIAction.AM_REF_PROPERTIES]);
+ button.addMouseListener(mgui.mouseHandler);
+
+ this.addSeparator();
+
+ button = this.add(mgui.actions[TGUIAction.M_REF_PROTOTYPING]);
+ button.addMouseListener(mgui.mouseHandler);
+
+ this.addSeparator();
+
}
} // Class
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAnalysis.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAnalysis.java
index a231bd491ee4a850ce81e2e5acf6429489349221..b3311ee94d62f8a0a23e5d97ea0b5d2bc70b95c2 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAnalysis.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAnalysis.java
@@ -60,11 +60,6 @@ public class SysmlsecMethodologyReferenceToAnalysis extends SysmlsecMethodologyD
initScaling(200, 70);
- nbConnectingPoint = 2;
- connectingPoint = new TGConnectingPoint[nbConnectingPoint];
- connectingPoint[0] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, false, true, 0.0, 0.5, TGConnectingPoint.WEST);
- connectingPoint[1] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, false, true, 0.3, 1.0, TGConnectingPoint.WEST);
-
typeOfReference = ANALYSIS;
addTGConnectingPointsCommentTop();
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToApplication.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToApplication.java
index b2750092e1a71fe114b21d041d9e51680ee1e813..d626aac9c49d602d7bb23aceb5a5848088277b05 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToApplication.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToApplication.java
@@ -62,10 +62,6 @@ public class SysmlsecMethodologyReferenceToApplication extends SysmlsecMethodolo
initScaling(200, 70);
- nbConnectingPoint = 1;
- connectingPoint = new TGConnectingPoint[nbConnectingPoint];
- connectingPoint[0] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, false, true, 0.5, 1.0, TGConnectingPoint.WEST);
-
typeOfReference = FUNCTIONAL_VIEW;
addTGConnectingPointsCommentTop();
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToArchitecture.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToArchitecture.java
index 1154d58849163e3d88db7594abe7c8cad4bdb3b2..be1305f458b2bb07f395ec6a41bd5fecf9d739d0 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToArchitecture.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToArchitecture.java
@@ -60,9 +60,6 @@ public class SysmlsecMethodologyReferenceToArchitecture extends SysmlsecMethodol
initScaling(200, 70);
- nbConnectingPoint = 1;
- connectingPoint = new TGConnectingPoint[nbConnectingPoint];
- connectingPoint[0] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, false, true, 0.5, 1.0, TGConnectingPoint.WEST);
typeOfReference = ARCHITECTURE_VIEW;
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAssumptions.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAssumptions.java
index 64415df9fed269aef24d4df687ef9bd9f7a282be..f8ec0a1e65796004cc6eb2f316d73fa74f01a9d1 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAssumptions.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAssumptions.java
@@ -60,9 +60,6 @@ public class SysmlsecMethodologyReferenceToAssumptions extends SysmlsecMethodolo
initScaling(200, 70);
- nbConnectingPoint = 1;
- connectingPoint = new TGConnectingPoint[nbConnectingPoint];
- connectingPoint[0] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, false, true, 0.30, 1.0, TGConnectingPoint.WEST);
typeOfReference = ASSUMPTIONS;
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAttack.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAttack.java
index 51d39cde7835088efaa1da230cc78785221190fe..a786e537f55070c73487757adfe6106a0b09e051 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAttack.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToAttack.java
@@ -60,11 +60,6 @@ public class SysmlsecMethodologyReferenceToAttack extends SysmlsecMethodologyDia
initScaling(200, 70);
- nbConnectingPoint = 2;
- connectingPoint = new TGConnectingPoint[nbConnectingPoint];
- connectingPoint[0] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, false, true, 0.3, 0.0, TGConnectingPoint.WEST);
- connectingPoint[1] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, true, false, 0.6, 0.0, TGConnectingPoint.WEST);
-
typeOfReference = ATTACK;
addTGConnectingPointsCommentTop();
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToCP.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToCP.java
index a82db4befa26af3302828eb98cd8994d47fdd874..6b99a02ed7d51b4697dd4f88a729a7fc31b0d073 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToCP.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToCP.java
@@ -60,9 +60,6 @@ public class SysmlsecMethodologyReferenceToCP extends SysmlsecMethodologyDiagram
initScaling(227, 70);
- nbConnectingPoint = 1;
- connectingPoint = new TGConnectingPoint[nbConnectingPoint];
- connectingPoint[0] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, false, true, 0.5, 1.0, TGConnectingPoint.WEST);
typeOfReference = CP_VIEW;
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToDesign.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToDesign.java
index 4452abcca450c640c47b01c43fa3f402b87cf184..570f648dac7a1e7ca0fc9a9da4dc7501ac93d876 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToDesign.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToDesign.java
@@ -59,10 +59,6 @@ public class SysmlsecMethodologyReferenceToDesign extends SysmlsecMethodologyDia
initScaling(200, 70);
- nbConnectingPoint = 2;
- connectingPoint = new TGConnectingPoint[nbConnectingPoint];
- connectingPoint[0] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, false, true, 0.0, 0.5, TGConnectingPoint.WEST);
- connectingPoint[1] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, false, true, 0.20, 1.0, TGConnectingPoint.WEST);
typeOfReference = DESIGN;
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToFault.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToFault.java
index b40686c5d992ceef7e21278af1ac95b9be09d437..116ef1a9ba0970ae0f0a5a7a9127d169966cc0e2 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToFault.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToFault.java
@@ -61,11 +61,6 @@ public class SysmlsecMethodologyReferenceToFault extends SysmlsecMethodologyDiag
initScaling(200, 70);
- nbConnectingPoint = 2;
- connectingPoint = new TGConnectingPoint[nbConnectingPoint];
- connectingPoint[0] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, false, true, 0.3, 1.0, TGConnectingPoint.WEST);
- connectingPoint[1] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, true, false, 0.6, 1.0, TGConnectingPoint.WEST);
-
typeOfReference = FAULT;
addTGConnectingPointsCommentTop();
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToMapping.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToMapping.java
index aa20162d12e00c0d45ef0dd7643763ecdf4f74a9..e630409c711036a72904c5f612603fbc6694f56e 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToMapping.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToMapping.java
@@ -62,11 +62,6 @@ public class SysmlsecMethodologyReferenceToMapping extends SysmlsecMethodologyDi
initScaling(200, 70);
- nbConnectingPoint = 3;
- connectingPoint = new TGConnectingPoint[nbConnectingPoint];
- connectingPoint[0] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, false, true, 0.3, 0.0, TGConnectingPoint.WEST);
- connectingPoint[1] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, false, true, 0.7, 0.0, TGConnectingPoint.WEST);
- connectingPoint[2] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, false, true, 0.5, 0.0, TGConnectingPoint.WEST);
typeOfReference = MAPPING_VIEW;
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToProperties.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToProperties.java
index 11d8522dcdef5154922fa906a50e91d3e8dec8b4..6150e92d6530511dfe5a813f78a28dbd78a2ed2b 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToProperties.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToProperties.java
@@ -60,9 +60,6 @@ public class SysmlsecMethodologyReferenceToProperties extends SysmlsecMethodolog
initScaling(180, 70);
- nbConnectingPoint = 1;
- connectingPoint = new TGConnectingPoint[nbConnectingPoint];
- connectingPoint[0] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, false, true, 0.5, 0, TGConnectingPoint.WEST);
typeOfReference = PROPERTY;
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToPrototype.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToPrototype.java
index f6db3b130fdd4be83256451ee3ffac28e7c6c06c..967209c87a6aa0b2d1fe0318e04a1b5f774c462d 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToPrototype.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToPrototype.java
@@ -60,10 +60,6 @@ public class SysmlsecMethodologyReferenceToPrototype extends SysmlsecMethodology
initScaling(200, 70);
- nbConnectingPoint = 1;
- connectingPoint = new TGConnectingPoint[nbConnectingPoint];
- connectingPoint[0] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, false, true, 0.0, 0.5, TGConnectingPoint.WEST);
-
typeOfReference = PROTOTYPING;
addTGConnectingPointsCommentTop();
diff --git a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToRequirement.java b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToRequirement.java
index 3aa0d85cea8f9ec4861fd51aeeb1e586e1c457ad..2e2d0bdb52ffd731b6667bb6482be3c1a6afffac 100755
--- a/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToRequirement.java
+++ b/src/main/java/ui/sysmlsecmethodology/SysmlsecMethodologyReferenceToRequirement.java
@@ -60,14 +60,6 @@ public class SysmlsecMethodologyReferenceToRequirement extends SysmlsecMethodolo
initScaling(200, 70);
- nbConnectingPoint = 5;
- connectingPoint = new TGConnectingPoint[nbConnectingPoint];
- connectingPoint[0] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, false, true, 1.0, 0.5, TGConnectingPoint.WEST);
- connectingPoint[1] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, false, true, 0.3, 1.0, TGConnectingPoint.WEST);
- connectingPoint[2] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, true, false, 0.6, 1.0, TGConnectingPoint.WEST);
- connectingPoint[3] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, true, false, 0.6, 0.0, TGConnectingPoint.WEST);
- connectingPoint[4] = new SysmlsecMethodologyConnectingPoint(this, 0, 0, true, false, 0.3, 0.0, TGConnectingPoint.WEST);
-
typeOfReference = REQUIREMENT;
addTGConnectingPointsCommentTop();
diff --git a/src/main/resources/ui/util/referencetoarch.gif b/src/main/resources/ui/util/referencetoarch.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c4eae706441826c0d57870cd0605a96dcd2a11e5
Binary files /dev/null and b/src/main/resources/ui/util/referencetoarch.gif differ
diff --git a/src/main/resources/ui/util/referencetoattack.gif b/src/main/resources/ui/util/referencetoattack.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bc23e7936ead2d4291f386ae94fe192dbd2443a8
Binary files /dev/null and b/src/main/resources/ui/util/referencetoattack.gif differ
diff --git a/src/main/resources/ui/util/referencetocp.gif b/src/main/resources/ui/util/referencetocp.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ac35703e1ab312f61efc41fc60b828a95f5b88db
Binary files /dev/null and b/src/main/resources/ui/util/referencetocp.gif differ
diff --git a/src/main/resources/ui/util/referencetofault.gif b/src/main/resources/ui/util/referencetofault.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e48b606a7f63392e17a26f33ab30b09df35635f9
Binary files /dev/null and b/src/main/resources/ui/util/referencetofault.gif differ
diff --git a/src/main/resources/ui/util/referencetofv.gif b/src/main/resources/ui/util/referencetofv.gif
new file mode 100644
index 0000000000000000000000000000000000000000..22be86de5fd5b27d20d9998510ae6b12f0fb7618
Binary files /dev/null and b/src/main/resources/ui/util/referencetofv.gif differ
diff --git a/src/main/resources/ui/util/referencetomapping.gif b/src/main/resources/ui/util/referencetomapping.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e48b606a7f63392e17a26f33ab30b09df35635f9
Binary files /dev/null and b/src/main/resources/ui/util/referencetomapping.gif differ