X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.g2d%2Fsrc%2Forg%2Fsimantics%2Fg2d%2Fdiagram%2Fparticipant%2FZOrderHandler.java;h=8b893a2b1e7f0730fac80482cd67feb7ae1e115d;hb=HEAD;hp=e393b7c13f391680fb9c3ee493a5a0ed2961e76a;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.g2d/src/org/simantics/g2d/diagram/participant/ZOrderHandler.java b/bundles/org.simantics.g2d/src/org/simantics/g2d/diagram/participant/ZOrderHandler.java
index e393b7c13..8b893a2b1 100644
--- a/bundles/org.simantics.g2d/src/org/simantics/g2d/diagram/participant/ZOrderHandler.java
+++ b/bundles/org.simantics.g2d/src/org/simantics/g2d/diagram/participant/ZOrderHandler.java
@@ -48,7 +48,7 @@ public class ZOrderHandler extends AbstractDiagramParticipant {
     @Dependency Selection sel;
     @Dependency PickContext pickContext;
 
-    private final ListenerList zOrderListeners = new ListenerList(ListenerList.IDENTITY);
+    private final ListenerList<ZOrderListener> zOrderListeners = new ListenerList<>(ListenerList.IDENTITY);
 
     public void addOrderListener(ZOrderListener listener) {
         zOrderListeners.add(listener);
@@ -70,7 +70,7 @@ public class ZOrderHandler extends AbstractDiagramParticipant {
             Shape area = ElementUtils.getElementShapesOnDiagram(selectedElements);
             if (area==null) return true;
             final ArrayList<IElement> pickedElements = new ArrayList<IElement>();
-            PickRequest req = new PickRequest(area);
+            PickRequest req = new PickRequest(area).context(getContext());
             req.pickPolicy = PickPolicy.PICK_INTERSECTING_OBJECTS;
             pickContext.pick(diagram, req, pickedElements);
             DiagramUtils.inDiagramTransaction(diagram, TransactionType.WRITE, new Runnable() {
@@ -86,8 +86,8 @@ public class ZOrderHandler extends AbstractDiagramParticipant {
                         int index = elements.indexOf(e);
                         if (index != -1 && selectedElements.contains(e)) {
                             changed |= diagram.moveTo(e, nextPos);
-                            nextPos = index;
                         }
+                        nextPos = index;
                     }
                     if (changed) {
                         notifyZOrderListeners(diagram);
@@ -105,7 +105,7 @@ public class ZOrderHandler extends AbstractDiagramParticipant {
             Shape area = ElementUtils.getElementShapesOnDiagram(selectedElements);
             if (area==null) return true;
             final ArrayList<IElement> pickedElements = new ArrayList<IElement>();
-            PickRequest req = new PickRequest(area);
+            PickRequest req = new PickRequest(area).context(getContext());
             req.pickPolicy = PickPolicy.PICK_INTERSECTING_OBJECTS;
             pickContext.pick(diagram, req, pickedElements);
             DiagramUtils.inDiagramTransaction(diagram, TransactionType.WRITE, new Runnable() {
@@ -121,8 +121,8 @@ public class ZOrderHandler extends AbstractDiagramParticipant {
                         int index = elements.indexOf(e);
                         if (index != -1 && selectedElements.contains(e)) {
                             changed |= diagram.moveTo(e, nextPos);
-                            nextPos = index;
                         }
+                        nextPos = index;
                     }
                     if (changed) {
                         notifyZOrderListeners(diagram);