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;h=0142fdf6b6fdcb8b260891e513151a8fba4950d0;hb=refs%2Fheads%2Fprivate%2Fantin_tyomaa;hp=fee79d18135140bdf4435b7fdd2943083699d840;hpb=969bd23cab98a79ca9101af33334000879fb60c5;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 fee79d181..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,104 +1,99 @@
-package org.simantics.document.swt.core.widget;
-
-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;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.simantics.document.server.IEventCommand;
-import org.simantics.document.server.JSONObject;
-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.swt.core.SWTDocument;
-import org.simantics.document.swt.core.base.LeafWidgetManager;
-import org.simantics.document.swt.core.base.PostEventCommand;
-import org.simantics.document.swt.core.base.WidgetContainer;
-
-public class ButtonWidget extends LeafWidgetManager<Button> {
-
-	@Override
-	protected void doUpdateProperties(SWTDocument document, Button control, JSONObject object) {
-
-		if(control.isDisposed()) return;
-		
-		String text = object.getJSONField("text");
-		
-		control.setText(text);
-		
-		document.layout();
-		
-	}
-    
-	@Override
-	protected Button doCreateControl(final SWTDocument document, Composite parent, final JSONObject object) {
-
-		final Button label = new Button(parent, SWT.NONE);
-		
-//		final EventHandler onPress = object.getJSONField("onPress");
-//		label.addSelectionListener(new );
-
-		return label;
-	}
-	
-    public static class ButtonCommandManager implements CommandManager<SWTDocument, WidgetContainer<Button>> {
-
-        @Override
-        public Collection<Object> updateCommandListeners(final SWTDocument document, final JSONObject object,
-                WidgetContainer<Button> container) {
-            
-            List<Command> 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);
-            Button button = container.getControl();
-            if(!button.isDisposed()) {
-            	button.addSelectionListener(listener);
-                listeners.add(listener);
-            }
-            
-            return listeners;
-            
-        }
-
-        @Override
-        public void removeListener(WidgetContainer<Button> container, Object listener) {
-        	if(container.getControl().isDisposed()) return;
-            if(listener instanceof SelectionListener)
-                container.getControl().removeSelectionListener((SelectionListener) listener);
-        }
-
-    }
-
-    @Override
-    public IEventCommand eventCommand(SWTDocument document, JSONObject object, WidgetContainer widget, String command) {
-        if("onPress".equals(command)) {
-            AbstractEventHandler onPress = object.getJSONField("onPress");
-            Map<String, String> data = Collections.emptyMap();
-            return new PostEventCommand(document, onPress, data);
-        }
-        return null;
-    }	
-	
-}
+package org.simantics.document.swt.core.widget;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.simantics.document.server.IEventCommand;
+import org.simantics.document.server.JSONObject;
+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.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> {
+
+	@Override
+	protected void doUpdateProperties(SWTDocument document, Button control, JSONObject object) {
+
+		if(control.isDisposed()) return;
+		
+		String text = object.getJSONField("text");
+		
+		control.setText(text);
+		
+		document.layout();
+		
+	}
+    
+	@Override
+	protected Button doCreateControl(final SWTDocument document, Composite parent, final JSONObject object) {
+
+		final Button label = new Button(parent, SWT.NONE);
+		
+//		final EventHandler onPress = object.getJSONField("onPress");
+//		label.addSelectionListener(new );
+
+		return label;
+	}
+	
+    public static class ButtonCommandManager implements CommandManager<SWTDocument, WidgetContainer<Button>> {
+
+        @Override
+        public Collection<Object> updateCommandListeners(final SWTDocument document, final JSONObject object,
+                WidgetContainer<Button> container) {
+            
+            WidgetData wd = document.getWidget(JSONObjectUtils.getId(object));
+            List<ICommand> commands = object.getJSONField("commands");
+            HashSet<Object> listeners = new HashSet<Object>();
+            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);
+                listeners.add(listener);
+            }
+            
+            return listeners;
+            
+        }
+
+        @Override
+        public void removeListener(WidgetContainer<Button> container, Object listener) {
+        	if(container.getControl().isDisposed()) return;
+            if(listener instanceof SelectionListener)
+                container.getControl().removeSelectionListener((SelectionListener) listener);
+        }
+
+    }
+
+    @Override
+    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");
+            return new PostEventCommand(document, onPress, context);
+        }
+        return null;
+    }	
+	
+}