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;fp=bundles%2Forg.simantics.document.swt.core%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Fswt%2Fcore%2Fwidget%2FButtonSelectionListener.java;h=2f9a33bfa628bfd7b4a83847c9396ac1a7193331;hb=0ffcb1180dcccf28e66a391338885be224ba1c47;hp=303460deab8fc6b1474887e4bc73c0453a08d7e5;hpb=342a2b006b88330280060c16c2ab50374468a4c6;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 303460dea..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,19 +1,25 @@
 package org.simantics.document.swt.core.widget;
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
+import java.util.List;
 
 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.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 LinkedHashMap<WidgetData, String> data;
+    private WidgetData wd;
+    private List<Pair<WidgetData, ICommand>> data;
     
-    public ButtonSelectionListener(LinkedHashMap<WidgetData, String> data) {
+    public ButtonSelectionListener(WidgetData wd, List<Pair<WidgetData, ICommand>> data) {
+        this.wd = wd;
         this.data = data;
     }
 
@@ -24,27 +30,37 @@ public class ButtonSelectionListener implements SelectionListener {
 
     @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);
+//        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();
-    
+//        if(!commands.isEmpty())
+//            commands.get(0).handleCommand();
+//    
     }
     
 }
\ No newline at end of file