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%2Fwidget%2FCommandEventWidget.java;h=6eb69541860798def6fd472443cc8595a9cbece6;hb=refs%2Fheads%2Fprivate%2Fantin_tyomaa;hp=fcdc3028d08473264226975bb121eb818a3f100a;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/widget/CommandEventWidget.java b/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/widget/CommandEventWidget.java
index fcdc3028d..6eb695418 100644
--- a/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/widget/CommandEventWidget.java
+++ b/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/widget/CommandEventWidget.java
@@ -1,59 +1,63 @@
-package org.simantics.document.swt.core.widget;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.TreeMap;
-
-import org.simantics.document.server.IEventCommand;
-import org.simantics.document.server.JSONObject;
-import org.simantics.document.server.bean.DataDefinition;
-import org.simantics.document.server.client.WidgetData;
-import org.simantics.document.server.client.WidgetManager;
-import org.simantics.document.server.handler.AbstractEventHandler;
-import org.simantics.document.swt.core.SWTDocument;
-import org.simantics.document.swt.core.base.PostEventCommand;
-import org.simantics.document.swt.core.base.PropertyWidgetManager;
-
-public class CommandEventWidget  extends PropertyWidgetManager<Object> {
-
-    @Override
-    public Object createWidget(JSONObject object) {
-        return null;
-    }
-
-    @Override
-    public void updateProperties(SWTDocument document, JSONObject object, Object widget) {
-        // No properties
-    }
-
-    @Override
-    public void updateChildren(SWTDocument document, JSONObject object, Object widget,
-            TreeMap<String, WidgetData> childMap) {
-        // No children
-    }
-
-    @Override
-    public IEventCommand eventCommand(SWTDocument document, JSONObject object, Object component, String command) {
-        if("event".equals(command)) {
-            List<DataDefinition> dataDefinitions = object.getJSONField("dataDefinitions");
-            HashMap<String, String> data = new HashMap<String, String>();
-            for(DataDefinition dd : dataDefinitions) {
-                WidgetData wd = document.getWidgetData().get(dd.getElementId());
-                if(wd != null && wd.object != null) {
-                    @SuppressWarnings("rawtypes")
-                    WidgetManager manager = document.getManager(wd.object);
-                    if(manager != null) {
-                        @SuppressWarnings("unchecked")
-                        String result = manager.getProperty(document, wd.object, wd.widget, dd.getProperty());
-                        data.put(dd.getTarget(), result);
-                    }
-                }
-            }
-            AbstractEventHandler handler = object.getJSONField("SCLFunction");
-            return new PostEventCommand(document, handler, data);
-        } else {
-            return null;
-        }
-    }
-    
-}
+package org.simantics.document.swt.core.widget;
+
+import java.util.List;
+import java.util.TreeMap;
+
+import org.simantics.document.server.IEventCommand;
+import org.simantics.document.server.JSONObject;
+import org.simantics.document.server.bean.DataDefinition;
+import org.simantics.document.server.client.WidgetData;
+import org.simantics.document.server.client.WidgetManager;
+import org.simantics.document.server.handler.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.server.io.ICommand;
+import org.simantics.document.swt.core.SWTDocument;
+import org.simantics.document.swt.core.base.PostEventCommand;
+import org.simantics.document.swt.core.base.PropertyWidgetManager;
+
+public class CommandEventWidget  extends PropertyWidgetManager<Object> {
+
+    @Override
+    public Object createWidget(JSONObject object) {
+        return null;
+    }
+
+    @Override
+    public void updateProperties(SWTDocument document, JSONObject object, Object widget) {
+        // No properties
+    }
+
+    @Override
+    public void updateChildren(SWTDocument document, JSONObject object, Object widget,
+            TreeMap<String, WidgetData> childMap) {
+        // No children
+    }
+
+    @Override
+    public IEventCommand eventCommand(SWTDocument document, JSONObject object, Object component, ICommand command, CommandContext p) {
+        if("event".equals(command.getCommand())) {
+            List<DataDefinition> dataDefinitions = object.getJSONField("dataDefinitions");
+            CommandContextMutable context = new CommandContextImpl();
+            context.merge(p);
+            for(DataDefinition dd : dataDefinitions) {
+                WidgetData wd = document.getWidgetData().get(dd.getElementId());
+                if(wd != null && wd.object != null) {
+                    @SuppressWarnings("rawtypes")
+                    WidgetManager manager = document.getManager(wd.object);
+                    if(manager != null) {
+                        @SuppressWarnings("unchecked")
+                        String result = manager.getProperty(document, wd.object, wd.widget, dd.getProperty());
+                        context.putValue(dd.getTarget(), result);
+                    }
+                }
+            }
+            AbstractEventHandler handler = object.getJSONField("SCLFunction");
+            return new PostEventCommand(document, handler, context);
+        } else {
+            return null;
+        }
+    }
+    
+}