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%2FButtonWidget.java;fp=bundles%2Forg.simantics.document.swt.core%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Fswt%2Fcore%2Fwidget%2FButtonWidget.java;h=0142fdf6b6fdcb8b260891e513151a8fba4950d0;hb=0ffcb1180dcccf28e66a391338885be224ba1c47;hp=384ef88cd8638f23e0f17dec7005cedc52b7ca49;hpb=342a2b006b88330280060c16c2ab50374468a4c6;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/widget/ButtonWidget.java b/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/widget/ButtonWidget.java
index 384ef88cd..0142fdf6b 100644
--- a/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/widget/ButtonWidget.java
+++ b/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/widget/ButtonWidget.java
@@ -1,11 +1,9 @@
 package org.simantics.document.swt.core.widget;
 
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionListener;
@@ -17,11 +15,18 @@ import org.simantics.document.server.bean.Command;
 import org.simantics.document.server.client.CommandManager;
 import org.simantics.document.server.client.WidgetData;
 import org.simantics.document.server.handler.AbstractEventHandler;
-import org.simantics.document.server.handler.EventHandler;
+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.server.io.JSONObjectUtils;
 import org.simantics.document.swt.core.SWTDocument;
+import org.simantics.document.swt.core.SWTViews;
 import org.simantics.document.swt.core.base.LeafWidgetManager;
 import org.simantics.document.swt.core.base.PostEventCommand;
 import org.simantics.document.swt.core.base.WidgetContainer;
+import org.simantics.utils.datastructures.Pair;
+import org.simantics.utils.ui.SWTUtils;
 
 public class ButtonWidget extends LeafWidgetManager<Button> {
 
@@ -55,23 +60,13 @@ public class ButtonWidget extends LeafWidgetManager<Button> {
         public Collection<Object> updateCommandListeners(final SWTDocument document, final JSONObject object,
                 WidgetContainer<Button> container) {
             
-            List<Command> commands = object.getJSONField("commands");
+            WidgetData wd = document.getWidget(JSONObjectUtils.getId(object));
+            List<ICommand> commands = object.getJSONField("commands");
             HashSet<Object> listeners = new HashSet<Object>();
-            LinkedHashMap<WidgetData, String> data = new LinkedHashMap<WidgetData, String>();
-            if(commands != null) {
-	            for(Command c : commands) {
-	                if(c.getCommand() == null || c.getTargetId() == null || c.getTrigger() == null)
-	                    continue;
-	                String trigger = c.getTrigger();
-	                if("click".equals(trigger)) {
-	                    WidgetData wd = document.getWidgetData().get(c.getTargetId());
-	                    if(wd != null)
-	                        data.put(wd, c.getCommand());
-	                }
-	            }
-            }
-            data.put(document.getWidgetData().get(object.getId()), "onPress");
-            SelectionListener listener = new ButtonSelectionListener(data);
+            List<Pair<WidgetData, ICommand>> data = new ArrayList<>();
+            data.addAll(SWTViews.getTriggeredCommands(document, commands, "eventOut"));
+            data.add(new Pair<WidgetData, ICommand>(wd, new Command("onPress")));
+            SelectionListener listener = new ButtonSelectionListener(wd, data);
             Button button = container.getControl();
             if(!button.isDisposed()) {
             	button.addSelectionListener(listener);
@@ -92,11 +87,11 @@ public class ButtonWidget extends LeafWidgetManager<Button> {
     }
 
     @Override
-    public IEventCommand eventCommand(SWTDocument document, JSONObject object, WidgetContainer widget, String command) {
-        if("onPress".equals(command)) {
+    public IEventCommand eventCommand(SWTDocument document, JSONObject object, WidgetContainer widget, ICommand command, CommandContext p) {
+        if("onPress".equals(command.getCommand())) {
+            CommandContextMutable context = new CommandContextImpl().merge(p);
             AbstractEventHandler onPress = object.getJSONField("onPress");
-            Map<String, String> data = Collections.emptyMap();
-            return new PostEventCommand(document, onPress, data);
+            return new PostEventCommand(document, onPress, context);
         }
         return null;
     }