-package org.simantics.document.swt.core.widget;\r
-\r
-import java.util.ArrayList;\r
-import java.util.LinkedHashMap;\r
-\r
-import org.eclipse.swt.events.SelectionEvent;\r
-import org.eclipse.swt.events.SelectionListener;\r
-import org.simantics.document.server.IEventCommand;\r
-import org.simantics.document.server.client.WidgetData;\r
-import org.simantics.document.swt.core.SWTDocument;\r
-\r
-public class ButtonSelectionListener implements SelectionListener {\r
- \r
- private LinkedHashMap<WidgetData, String> data;\r
- \r
- public ButtonSelectionListener(LinkedHashMap<WidgetData, String> data) {\r
- this.data = data;\r
- }\r
-\r
- @Override\r
- public void widgetSelected(SelectionEvent e) {\r
- widgetDefaultSelected(e);\r
- }\r
-\r
- @Override\r
- public void widgetDefaultSelected(SelectionEvent e) {\r
- SWTDocument document = null;\r
- // Build a linked list of commands\r
- ArrayList<IEventCommand> commands = new ArrayList<IEventCommand>();\r
- for(WidgetData d : data.keySet()) {\r
- document = (SWTDocument)d.document; // assume that all widgets are from the same document\r
- IEventCommand p = d.eventCommand(data.get(d));\r
- if(p != null) {\r
- if(!commands.isEmpty())\r
- commands.get(commands.size()-1).setNext(p);\r
- commands.add(p);\r
- }\r
- }\r
-\r
- // empty errors\r
-// if(document != null)\r
-// document.displayError("");\r
-\r
- // Execute the first command, the linked list handles the rest of them\r
- if(!commands.isEmpty())\r
- commands.get(0).handleCommand();\r
- \r
- }\r
- \r
+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