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%2FButtonSelectionListener.java;h=2f9a33bfa628bfd7b4a83847c9396ac1a7193331;hb=refs%2Fheads%2Fprivate%2Fantin_tyomaa;hp=021ba711215d94a472801db100a76ca0de2cf343;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/widget/ButtonSelectionListener.java b/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/widget/ButtonSelectionListener.java
index 021ba7112..2f9a33bfa 100644
--- a/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/widget/ButtonSelectionListener.java
+++ b/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/widget/ButtonSelectionListener.java
@@ -1,50 +1,66 @@
-package org.simantics.document.swt.core.widget;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.simantics.document.server.IEventCommand;
-import org.simantics.document.server.client.WidgetData;
-import org.simantics.document.swt.core.SWTDocument;
-
-public class ButtonSelectionListener implements SelectionListener {
-    
-    private LinkedHashMap<WidgetData, String> data;
-    
-    public ButtonSelectionListener(LinkedHashMap<WidgetData, String> data) {
-        this.data = data;
-    }
-
-    @Override
-    public void widgetSelected(SelectionEvent e) {
-        widgetDefaultSelected(e);
-    }
-
-    @Override
-    public void widgetDefaultSelected(SelectionEvent e) {
-        SWTDocument document = null;
-        // Build a linked list of commands
-        ArrayList<IEventCommand> commands = new ArrayList<IEventCommand>();
-        for(WidgetData d : data.keySet()) {
-            document = (SWTDocument)d.document; // assume that all widgets are from the same document
-            IEventCommand p = d.eventCommand(data.get(d));
-            if(p != null) {
-                if(!commands.isEmpty())
-                    commands.get(commands.size()-1).setNext(p);
-                commands.add(p);
-            }
-        }
-
-        // empty errors
-//        if(document != null)
-//            document.displayError("");
-
-        // Execute the first command, the linked list handles the rest of them
-        if(!commands.isEmpty())
-            commands.get(0).handleCommand();
-    
-    }
-    
+package org.simantics.document.swt.core.widget;
+
+import java.util.List;
+
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.simantics.document.server.client.WidgetData;
+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.PropertyWidgetManager;
+import org.simantics.utils.datastructures.Pair;
+
+public class ButtonSelectionListener implements SelectionListener {
+    
+    private WidgetData wd;
+    private List<Pair<WidgetData, ICommand>> data;
+    
+    public ButtonSelectionListener(WidgetData wd, List<Pair<WidgetData, ICommand>> data) {
+        this.wd = wd;
+        this.data = data;
+    }
+
+    @Override
+    public void widgetSelected(SelectionEvent e) {
+        widgetDefaultSelected(e);
+    }
+
+    @Override
+    public void widgetDefaultSelected(SelectionEvent e) {
+//        SWTDocument document = null;
+//        // Build a linked list of commands
+//        ArrayList<IEventCommand> commands = new ArrayList<IEventCommand>();
+//        for(WidgetData d : data.keySet()) {
+//            document = (SWTDocument)d.document; // assume that all widgets are from the same document
+//            IEventCommand p = d.eventCommand(data.get(d));
+//            if(p != null) {
+//                if(!commands.isEmpty())
+//                    commands.get(commands.size()-1).setNext(p);
+//                commands.add(p);
+//            }
+            
+            CommandContextMutable context = new CommandContextImpl();
+            context.putValue("event", "onPress");
+            
+            if(!data.isEmpty()) {
+                ((SWTDocument)wd.document).handleCommands(data, context, e.widget);
+            }
+            
+            CommandContext ret = PropertyWidgetManager.sendEvent((SWTDocument)wd.document, wd, "onPress", e.widget, context);
+
+//        }
+
+        // empty errors
+//        if(document != null)
+//            document.displayError("");
+
+        // Execute the first command, the linked list handles the rest of them
+//        if(!commands.isEmpty())
+//            commands.get(0).handleCommand();
+//    
+    }
+    
 }
\ No newline at end of file