X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.document.swt.core%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Fswt%2Fcore%2FSWTDocumentClient.java;h=e2a64ee1d445bc69c7025b3bfca4b71a9326e537;hp=58c280595b0ac8fd31de57ca3d5cd6a45fdbaebd;hb=e4ffdffae875e518a4eb070b8bda6ead1a9843d3;hpb=158d6269660a3b415504f1da5a0b8341e761a5be

diff --git a/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/SWTDocumentClient.java b/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/SWTDocumentClient.java
index 58c280595..e2a64ee1d 100644
--- a/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/SWTDocumentClient.java
+++ b/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/SWTDocumentClient.java
@@ -1,8 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Semantum Oy - initial API and implementation
+ *******************************************************************************/
 package org.simantics.document.swt.core;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 
 import org.eclipse.jface.layout.GridDataFactory;
@@ -15,16 +28,20 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.IWorkbenchSite;
 import org.simantics.db.common.utils.Logger;
+import org.simantics.document.server.IEventCommand;
 import org.simantics.document.server.JSONObject;
 import org.simantics.document.server.client.DocumentClient;
 import org.simantics.document.server.client.WidgetData;
 import org.simantics.document.server.client.WidgetMapping;
-import org.simantics.document.server.handler.AbstractEventHandler;
+import org.simantics.document.server.io.AbstractEventHandler;
 import org.simantics.document.server.io.CommandContext;
+import org.simantics.document.server.io.CommandContextMutable;
+import org.simantics.document.server.io.ICommand;
 import org.simantics.document.swt.core.base.WidgetContainer;
 import org.simantics.document.swt.core.widget.FillComposite;
 import org.simantics.ui.colors.Colors;
 import org.simantics.ui.fonts.Fonts;
+import org.simantics.utils.datastructures.Pair;
 import org.simantics.utils.threads.IThreadWorkQueue;
 import org.simantics.utils.threads.SWTThread;
 
@@ -41,9 +58,9 @@ public class SWTDocumentClient extends DocumentClient implements SWTDocument {
 	private boolean requireLayout=false;
 
 	public SWTDocumentClient(WidgetMapping mapping, ISelectionProvider selectionProvider, IWorkbenchSite site, Composite container) {
-		
+
 		super(mapping, SWTViews.getCommandMapping());
-		
+
 		this.container = container;
 		this.site = site;
 		this.selectionProvider = selectionProvider;
@@ -55,19 +72,19 @@ public class SWTDocumentClient extends DocumentClient implements SWTDocument {
 		FillComposite mgr = new FillComposite();
 		WidgetContainer<?> wc = mgr.createWidget(rootObject); 
 		wc.createControl(this, container, rootObject);
-		
+
 		GridDataFactory.fillDefaults().grab(true, true).minSize(1, 1).applyTo((Control)wc.getControl());
 		GridLayoutFactory.fillDefaults().applyTo((Composite)wc.getControl());
-		
+
 		widgetData.put("root", new WidgetData(this, wc, rootObject));
-		
+
 	}
-	
+
 	@Override
 	public IThreadWorkQueue thread() {
 		return thread;
 	}
-	
+
 	@Override
 	public Color getColor(org.simantics.datatypes.literal.RGB.Integer descriptor) {
 		Color color = colors.get(descriptor);
@@ -77,7 +94,7 @@ public class SWTDocumentClient extends DocumentClient implements SWTDocument {
 		}
 		return color;
 	}
-	
+
 	@Override
 	public Font getFont(org.simantics.datatypes.literal.Font descriptor) {
 		Font font = fonts.get(descriptor);
@@ -87,22 +104,23 @@ public class SWTDocumentClient extends DocumentClient implements SWTDocument {
 		}
 		return font;
 	}
-	
+
 	@Override
 	public ISelectionProvider getSelectionProvider() {
 		return selectionProvider;
 	}
-	
+
 	@Override
 	public IWorkbenchSite getSite() {
 		return site;
 	}
-	
+
 	@Override
-	public void post(final AbstractEventHandler handler, CommandContext parameters) {
+	public void post(AbstractEventHandler handler, CommandContextMutable parameters) {
 		handler.handle(parameters);
 	}
 
+
 	@Override
 	protected void updateDocument(Collection<JSONObject> objects) {
 		assert thread.currentThreadAccess();
@@ -115,9 +133,9 @@ public class SWTDocumentClient extends DocumentClient implements SWTDocument {
 
 	@Override
 	protected void updateTree(HashSet<WidgetData> updates) {
-		
+
 		if(updates.isEmpty()) return;
-		
+
 		for(WidgetData data : updates) {
 			WidgetContainer<?> container = (WidgetContainer<?>)data.widget;
 			Control ctrl = container.getControl();
@@ -130,29 +148,59 @@ public class SWTDocumentClient extends DocumentClient implements SWTDocument {
 				}
 			}
 		}
-		
+
 		super.updateTree(updates);
-		
+
 		for(WidgetData data : widgetData.values()) {
 			WidgetContainer<?> container = (WidgetContainer<?>)data.widget;
 			if(container != null)
 			    container.getOrCreateControl(this, data.object);
 		}
-		
+
+	}
+
+	@Override
+	public CommandContext handleCommands(List<Pair<WidgetData, ICommand>> data, CommandContextMutable context, Object component) {
+
+		// Build a linked list of commands
+
+		ArrayList<IEventCommand> commands = new ArrayList<>();
+		for(Pair<WidgetData, ICommand> pair : data) {
+			WidgetData d = pair.first;
+
+			ICommand c = pair.second;
+			IEventCommand p = d.eventCommand(c, null);
+//			if(component != null && p != null)
+//				p.setTrigger(component);
+			if(p != null) {
+				if(!commands.isEmpty())
+					commands.get(commands.size()-1).setNext(p);
+				commands.add(p);
+			}
+		}
+
+		// Execute the first command, the linked list handles the rest of them
+		if(!commands.isEmpty()) {
+			try {
+				commands.get(0).handleCommand(context);
+			} finally {
+			}
+		}
+		return context;
 	}
-	
+
 	@Override
 	public void layout() {
 		requireLayout = true;
 	}
-	
+
     @Override
     public HashMap<String, WidgetData> getWidgetData() {
         return widgetData;
     }
-    
+
     public void displayError(String error) {
         Logger.defaultLogError(error);
     }
-	
+
 }