From e2f2ed33a93f9690d60b8d7a8abeb890902ac6ef Mon Sep 17 00:00:00 2001 From: Johannes Eder <eder@fortiss.org> Date: Thu, 26 Nov 2015 16:03:47 +0000 Subject: [PATCH] allocation target bounds refs 2446 --- .../base/ui/editpart/AllocationConnectionEditPartBase.java | 1 + .../base/ui/editpart/AllocationElementEditPartBase.java | 4 ++++ .../fortiss/tooling/base/ui/editpart/IAllocationPosition.java | 3 +++ 3 files changed, 8 insertions(+) diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/AllocationConnectionEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/AllocationConnectionEditPartBase.java index 9458b2fb7..f77486c2b 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/AllocationConnectionEditPartBase.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/AllocationConnectionEditPartBase.java @@ -41,6 +41,7 @@ public abstract class AllocationConnectionEditPartBase<T extends ConnectionSegme protected AllocationConnectionEditPartBase(T modelElement, IDiagramLayoutConfiguration layoutConfiguration) { super(modelElement, layoutConfiguration); + } /** {@inheritDoc} */ diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/AllocationElementEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/AllocationElementEditPartBase.java index 816ffcbe3..6757d6ff8 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/AllocationElementEditPartBase.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/AllocationElementEditPartBase.java @@ -137,6 +137,10 @@ public abstract class AllocationElementEditPartBase<T extends ILayoutedModelElem .reduce(new Rectangle(), (a, b) -> a.union(b)); if(isAllocationTargetElement()) { r = IAllocationPosition.allocationTargetElementBounds(r); + targetAllocationBounds.x = reduce.x; + targetAllocationBounds.y = reduce.y; + targetAllocationBounds.width = reduce.width; + targetAllocationBounds.height = reduce.height; } else { sourceAllocationBounds.height = reduce.height; sourceAllocationBounds.width = reduce.width; diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/IAllocationPosition.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/IAllocationPosition.java index a94a44618..4db619d04 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/IAllocationPosition.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/IAllocationPosition.java @@ -32,6 +32,9 @@ public interface IAllocationPosition { /** Stores the bounds of the source of the allocation in the editor. */ static Rectangle sourceAllocationBounds = new Rectangle(); + /** Stores the bounds of the target of the allocation in the editor. */ + static Rectangle targetAllocationBounds = new Rectangle(); + /** Returns true if T is the target of the allocation, otherwise false. */ public boolean isAllocationTargetElement(); -- GitLab