diff options
| author | Esteban Dugueperoux | 2015-08-25 09:03:52 +0000 |
|---|---|---|
| committer | Esteban DUGUEPEROUX | 2015-08-25 11:11:25 +0000 |
| commit | b22416bcb1bd3a670fd44b629a1e5a2a4bdd67da (patch) | |
| tree | b480f838602b6d428072287335c285159d44f9ea | |
| parent | 2dc52ae13d57f104df833504a373997db959d91a (diff) | |
| download | org.eclipse.sirius-b22416bcb1bd3a670fd44b629a1e5a2a4bdd67da.tar.gz org.eclipse.sirius-b22416bcb1bd3a670fd44b629a1e5a2a4bdd67da.tar.xz org.eclipse.sirius-b22416bcb1bd3a670fd44b629a1e5a2a4bdd67da.zip | |
[475380] Revert use of black list on edge bendpoints reset
- Revert the use of black list to not reset several times edge because
this case is already managed at the end of
BorderItemAwareLayoutProvider.resetBendpoints().
Bug: 475380
Change-Id: If53d216c8dca3b33a6600eb1e974d948cf1c0c45
Signed-off-by: Esteban Dugueperoux <esteban.dugueperoux@obeo.fr>
| -rw-r--r-- | plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/provider/BorderItemAwareLayoutProvider.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/provider/BorderItemAwareLayoutProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/provider/BorderItemAwareLayoutProvider.java index c5d942eb21..6b23e84c2d 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/provider/BorderItemAwareLayoutProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/provider/BorderItemAwareLayoutProvider.java @@ -15,12 +15,10 @@ import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; -import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.Set; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.draw2d.Connection; @@ -705,7 +703,6 @@ public class BorderItemAwareLayoutProvider extends AbstractLayoutProvider { } // Keep only first and last points of edges linked to at least one of // moved border nodes. - Set<Edge> resetEdges = new HashSet<Edge>(); for (Entry<View, List<Request>> requestByView : getViewsToChangeBoundsRequest().entrySet()) { View view = requestByView.getKey(); // Get corresponding edit part @@ -717,18 +714,16 @@ public class BorderItemAwareLayoutProvider extends AbstractLayoutProvider { if (!(view.getSourceEdges().isEmpty() && view.getTargetEdges().isEmpty())) { // For each edge starting from this view for (Object obj : view.getSourceEdges()) { - if (!resetEdges.contains(obj) && obj instanceof Edge) { + if (obj instanceof Edge) { Edge sourceEdge = (Edge) obj; resetBendpoints(sourceEdge, cc, borderItemEditPart, requests, true); - resetEdges.add(sourceEdge); } } // For each edge ending to this view for (Object obj : view.getTargetEdges()) { - if (!resetEdges.contains(obj) && obj instanceof Edge) { + if (obj instanceof Edge) { Edge targetEdge = (Edge) obj; resetBendpoints(targetEdge, cc, borderItemEditPart, requests, false); - resetEdges.add(targetEdge); } } } |
