Skip to content
Snippets Groups Projects
Commit c25294b3 authored by Simon Barner's avatar Simon Barner
Browse files

Merge branch '3935' into 'master'

[3935] Disable direct creation of curved links between hierarchic element bases

See merge request !90
parents 84bf0ac8 4c1d84c0
No related branches found
No related tags found
1 merge request!90[3935] Disable direct creation of curved links between hierarchic element bases
ContextMenuUtil.java 405387151d45b09dffb3b6ba44f980313c8edcaf GREEN ContextMenuUtil.java 405387151d45b09dffb3b6ba44f980313c8edcaf GREEN
CurvedLinkLayoutedContentAnchorangeController.java 67c20e31ddb82fe2fd499117193353b0545839a0 GREEN CurvedLinkLayoutedContentAnchorangeController.java 6d2b64c3d6c813ac001b1500ed0529ad6e561aaf GREEN
EObjectDiagramController.java 2b253941592ee25ead95223470f983f23ef9776f GREEN EObjectDiagramController.java 2b253941592ee25ead95223470f983f23ef9776f GREEN
EObjectEllipticResizableContentControllerBase.java 7c862a03b97d2f2cfdcc2fcee7434de2e1e257d2 GREEN EObjectEllipticResizableContentControllerBase.java 7c862a03b97d2f2cfdcc2fcee7434de2e1e257d2 GREEN
EObjectModelChangeProvider.java f4b60cebb088a5c81ca92a41614e1a5d40030502 GREEN EObjectModelChangeProvider.java f4b60cebb088a5c81ca92a41614e1a5d40030502 GREEN
......
...@@ -19,6 +19,7 @@ import static org.fortiss.tooling.base.ui.utils.LayoutDataUIUtils.addConnectionP ...@@ -19,6 +19,7 @@ import static org.fortiss.tooling.base.ui.utils.LayoutDataUIUtils.addConnectionP
import org.fortiss.tooling.base.model.base.EntryConnectorBase; import org.fortiss.tooling.base.model.base.EntryConnectorBase;
import org.fortiss.tooling.base.model.base.ExitConnectorBase; import org.fortiss.tooling.base.model.base.ExitConnectorBase;
import org.fortiss.tooling.base.model.base.HierarchicElementBase;
import org.fortiss.tooling.base.model.element.IConnection; import org.fortiss.tooling.base.model.element.IConnection;
import org.fortiss.tooling.base.model.element.IConnector; import org.fortiss.tooling.base.model.element.IConnector;
import org.fortiss.tooling.base.model.layout.ILayoutedModelElement; import org.fortiss.tooling.base.model.layout.ILayoutedModelElement;
...@@ -46,6 +47,13 @@ public class CurvedLinkLayoutedContentAnchorangeController<T extends IConnector ...@@ -46,6 +47,13 @@ public class CurvedLinkLayoutedContentAnchorangeController<T extends IConnector
@Override @Override
protected void link(IMVCBundle startBundle, DiagramCoordinate startLocation, protected void link(IMVCBundle startBundle, DiagramCoordinate startLocation,
IMVCBundle endBundle, DiagramCoordinate endLocation) { IMVCBundle endBundle, DiagramCoordinate endLocation) {
// Disable direct links between hierarchic element bases
if(startBundle.getModel() instanceof HierarchicElementBase ||
endBundle.getModel() instanceof HierarchicElementBase) {
return;
}
// Create the connection
super.link(startBundle, startLocation, endBundle, endLocation); super.link(startBundle, startLocation, endBundle, endLocation);
// Fetch newly created connection by comparing incoming and outgoing connections of the // Fetch newly created connection by comparing incoming and outgoing connections of the
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment