Skip to content
Snippets Groups Projects
Commit 715b344c authored by Christoph Döbber's avatar Christoph Döbber
Browse files

port creation is now correct again concerning drop context

refs 1427
parent 4257c13f
No related branches found
No related tags found
No related merge requests found
......@@ -127,8 +127,8 @@ abstract class ConnectionCompositorBase<HE extends IHierarchicElement, S extends
return false;
}
/** Creates a new drop context */
protected void createNewDropContext(IHierarchicElement element,
/** Creates a new source drop context */
protected void createNewSourceDropContext(IHierarchicElement element,
IConnectionCompositionContext context, IConnector connector) {
ElementDropContext drop =
context instanceof ConnectionDragContext ? ((ConnectionDragContext)context)
......@@ -136,6 +136,15 @@ abstract class ConnectionCompositorBase<HE extends IHierarchicElement, S extends
IElementCompositorService.INSTANCE.compose(element, connector, drop);
}
/** Creates a new target drop context */
protected void createNewTargetDropContext(IHierarchicElement element,
IConnectionCompositionContext context, IConnector connector) {
ElementDropContext drop =
context instanceof ConnectionDragContext ? ((ConnectionDragContext)context)
.getTargetDropContext() : null;
IElementCompositorService.INSTANCE.compose(element, connector, drop);
}
/**
* Returns true if the connector and the element to which the connection should be created have
* the same parent.
......
......@@ -82,7 +82,7 @@ public abstract class ConnectorHierarchicElementConnectionCompositorBase<HE exte
if(topElement != null) {
topElement.prepareIDs(targetConnector);
}
createNewDropContext(target, context, targetConnector);
createNewTargetDropContext(target, context, targetConnector);
createConnection(source, targetConnector, parent, topElement);
return true;
......
......@@ -79,8 +79,8 @@ public abstract class HierarchicElementConnectionCompositorBase<HE extends IHier
topElement.prepareIDs(sourceConnector);
topElement.prepareIDs(targetConnector);
}
createNewDropContext(source, context, sourceConnector);
createNewDropContext(target, context, targetConnector);
createNewSourceDropContext(source, context, sourceConnector);
createNewTargetDropContext(target, context, targetConnector);
createConnection(targetConnector, sourceConnector, parent, topElement);
return true;
......
......@@ -82,7 +82,7 @@ public abstract class HierarchicElementConnectorConnectionCompositorBase<HE exte
if(topElement != null) {
topElement.prepareIDs(sourceConnector);
}
createNewDropContext(source, context, sourceConnector);
createNewSourceDropContext(source, context, sourceConnector);
createConnection(sourceConnector, target, parent, topElement);
return true;
......
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