diff --git a/modeling/AVATAR/CoffeeMachine_Avatar.xml b/modeling/AVATAR/CoffeeMachine_Avatar.xml index 02b72ee873f28f81396e091ffd744e047e090d40..84ce32470099db64446bc6141823c892e2b5b581 100644 --- a/modeling/AVATAR/CoffeeMachine_Avatar.xml +++ b/modeling/AVATAR/CoffeeMachine_Avatar.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="false" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="1" LAST_SELECTED_SUB_TAB="1"> +<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="false" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="1" LAST_SELECTED_SUB_TAB="0"> <Modeling type="Avatar Requirement" nameTab="AVATAR Requirements" > <AvatarRDPanel name="AVATAR RD" minX="10" maxX="1900" minY="10" maxY="1400" zoom="1.0" > @@ -1279,7 +1279,7 @@ <MainCode value="}"/> <Optimized value="true" /> <considerTimingOperators value="true" /> -<Validated value="Wallet;CoffeeMachine;TeaButton;CoffeeButton;" /> +<Validated value="" /> <Ignored value="" /> <CONNECTOR type="5002" id="695" > diff --git a/src/main/java/ui/ucd/TGConnectingPointActorUCD.java b/src/main/java/ui/ucd/TGConnectingPointActorUCD.java index 2a28a1938ab1a34c63e2202c4f5707a6e77a360f..a89e72c56df7d10fcabbbcd62a76f52e33e2623d 100755 --- a/src/main/java/ui/ucd/TGConnectingPointActorUCD.java +++ b/src/main/java/ui/ucd/TGConnectingPointActorUCD.java @@ -49,6 +49,7 @@ import ui.TGConnectingPointWidthHeight; * Definition of connecting points on which connectors of actors found in use case diagrams can be connected * Creation: 18/02/2005 * @version 1.0 18/02/2005 + * @version 2.0 14/01/2020 * @author Ludovic APVRILLE */ public class TGConnectingPointActorUCD extends TGConnectingPointWidthHeight{ @@ -72,13 +73,17 @@ public class TGConnectingPointActorUCD extends TGConnectingPointWidthHeight{ if (outPoint != null) { + + + + if ((outPoint.getFather() instanceof UCDUseCase) && (type == TGComponentManager.CONNECTOR_SPECIA_UCD)) { + return false; + } + if (type == TGComponentManager.CONNECTOR_SPECIA_UCD) { return true; } - if ((outPoint.getFather() instanceof UCDUseCase) && (getFather() instanceof UCDUseCase)) { - return false; - } if ((outPoint.getFather() instanceof UCDActor) && (getFather() instanceof UCDActor)) { return false; } diff --git a/src/main/java/ui/ucd/TGConnectingPointUCD.java b/src/main/java/ui/ucd/TGConnectingPointUCD.java index 0c1ee77abeacbff69a72053fb14089b29838d159..dcf35f488bd377be0e9525aa2937f1073a0b0b02 100755 --- a/src/main/java/ui/ucd/TGConnectingPointUCD.java +++ b/src/main/java/ui/ucd/TGConnectingPointUCD.java @@ -50,6 +50,7 @@ import ui.TGConnectingPointWidthHeight; * Definition of connecting points on which connectors of use case diagrams can be connected * Creation: 18/02/2005 * @version 1.0 18/02/2005 + * @version 2.0 14/01/2021 * @author Ludovic APVRILLE */ public class TGConnectingPointUCD extends TGConnectingPointWidthHeight{ @@ -102,6 +103,10 @@ public class TGConnectingPointUCD extends TGConnectingPointWidthHeight{ return false; } + if ((outPoint.getFather() instanceof UCDActor) && (type == TGComponentManager.CONNECTOR_SPECIA_UCD) && !((getFather() instanceof UCDActor))) { + return false; + } + } return isCompatibleWith(type);