X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.document.swt.core%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Fswt%2Fcore%2Fbase%2FPostEventCommand.java;fp=bundles%2Forg.simantics.document.swt.core%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Fswt%2Fcore%2Fbase%2FPostEventCommand.java;h=24b6e6111c41774337c9aec5934decaf7c3da8d7;hb=6f8a2f0b26aeda447ac55ea873a953404c3027a7;hp=7214bdd1f1691057c25a304621b4112339c9ada9;hpb=4d9fd8e280d6543fa6f4edd2fab5e02aa04bc26e;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/base/PostEventCommand.java b/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/base/PostEventCommand.java
index 7214bdd1f..24b6e6111 100644
--- a/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/base/PostEventCommand.java
+++ b/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/base/PostEventCommand.java
@@ -13,6 +13,7 @@ package org.simantics.document.swt.core.base;
 
 import org.simantics.document.server.io.AbstractEventHandler;
 import org.simantics.document.server.io.CommandContext;
+import org.simantics.document.server.io.CommandContextImpl;
 import org.simantics.document.server.io.CommandContextMutable;
 import org.simantics.document.swt.core.SWTDocument;
 
@@ -27,6 +28,7 @@ public class PostEventCommand extends AbstractEventCommand {
     
     public PostEventCommand(SWTDocument document, AbstractEventHandler handler, CommandContextMutable context, PostEventCommand next) {
         super(document);
+        assert(handler != null);
         this.handler = handler;
         this.context = context;
         this.next = next;
@@ -34,7 +36,9 @@ public class PostEventCommand extends AbstractEventCommand {
 
     @Override
     public CommandContext handleCommand(CommandContextMutable context) {
-        document.post(handler, context);
+        CommandContextMutable mergedContext = new CommandContextImpl().merge(context)
+                .merge(this.context);
+        document.post(handler, mergedContext);
         return context;
     }