From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Wed, 5 Apr 2017 14:50:47 +0000 (+0300)
Subject: Merge "Enabling ResourceFile CR filtering based on locale"
X-Git-Tag: v1.29.0~116
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=8628d3b852c47e610d23a0990641e9701883b192;hp=8a9adec5741f3cd81972129919d76646f825d2f5;p=simantics%2Fplatform.git

Merge "Enabling ResourceFile CR filtering based on locale"
---

diff --git a/bundles/org.simantics.desktop.ui.ontology/graph.tg b/bundles/org.simantics.desktop.ui.ontology/graph.tg
index 33a3871fc..c1c8ff68e 100644
Binary files a/bundles/org.simantics.desktop.ui.ontology/graph.tg and b/bundles/org.simantics.desktop.ui.ontology/graph.tg differ
diff --git a/bundles/org.simantics.diagram.ontology/graph.tg b/bundles/org.simantics.diagram.ontology/graph.tg
index 72053ec5b..45f65af26 100644
Binary files a/bundles/org.simantics.diagram.ontology/graph.tg and b/bundles/org.simantics.diagram.ontology/graph.tg differ
diff --git a/bundles/org.simantics.document.base.ontology/graph.tg b/bundles/org.simantics.document.base.ontology/graph.tg
index c321d212c..51f83d20b 100644
Binary files a/bundles/org.simantics.document.base.ontology/graph.tg and b/bundles/org.simantics.document.base.ontology/graph.tg differ
diff --git a/bundles/org.simantics.document.swt.ontology/graph.tg b/bundles/org.simantics.document.swt.ontology/graph.tg
index fb597cc1c..332f21fb2 100644
Binary files a/bundles/org.simantics.document.swt.ontology/graph.tg and b/bundles/org.simantics.document.swt.ontology/graph.tg differ
diff --git a/bundles/org.simantics.help.ontology/graph.tg b/bundles/org.simantics.help.ontology/graph.tg
index 376ab173e..78c58e63d 100644
Binary files a/bundles/org.simantics.help.ontology/graph.tg and b/bundles/org.simantics.help.ontology/graph.tg differ
diff --git a/bundles/org.simantics.layer0/graph.tg b/bundles/org.simantics.layer0/graph.tg
index 37fc6470b..c072a1509 100644
Binary files a/bundles/org.simantics.layer0/graph.tg and b/bundles/org.simantics.layer0/graph.tg differ
diff --git a/bundles/org.simantics.modeling.ontology/graph.tg b/bundles/org.simantics.modeling.ontology/graph.tg
index ee66bf879..0ac20b8f4 100644
Binary files a/bundles/org.simantics.modeling.ontology/graph.tg and b/bundles/org.simantics.modeling.ontology/graph.tg differ
diff --git a/bundles/org.simantics.platform.ui.ontology/graph.tg b/bundles/org.simantics.platform.ui.ontology/graph.tg
index eafb6ec76..9509da624 100644
Binary files a/bundles/org.simantics.platform.ui.ontology/graph.tg and b/bundles/org.simantics.platform.ui.ontology/graph.tg differ
diff --git a/bundles/org.simantics.spreadsheet.ontology/graph.tg b/bundles/org.simantics.spreadsheet.ontology/graph.tg
index 8ad7b0843..405ddb994 100644
Binary files a/bundles/org.simantics.spreadsheet.ontology/graph.tg and b/bundles/org.simantics.spreadsheet.ontology/graph.tg differ
diff --git a/bundles/org.simantics.utils.thread.swt/src/org/simantics/utils/threads/SWTThread.java b/bundles/org.simantics.utils.thread.swt/src/org/simantics/utils/threads/SWTThread.java
index b5bb6722c..07102a102 100644
--- a/bundles/org.simantics.utils.thread.swt/src/org/simantics/utils/threads/SWTThread.java
+++ b/bundles/org.simantics.utils.thread.swt/src/org/simantics/utils/threads/SWTThread.java
@@ -22,25 +22,32 @@ import org.eclipse.swt.widgets.Widget;
 
 public class SWTThread implements IThreadWorkQueue, Executor {
 
-	final Display display;
+	private final Display display;
+	private final boolean executeAsync;
+	
+	public static IThreadWorkQueue getThreadAccess(Display display, boolean executeAsync)
+	{
+		return new SWTThread(display, executeAsync);
+	}
 	
 	public static IThreadWorkQueue getThreadAccess(Display display)
 	{
-		return new SWTThread(display);
+		return getThreadAccess(display, false);
 	}
 	
 	public static IThreadWorkQueue getThreadAccess(Widget widget)
 	{
-		return new SWTThread(widget.getDisplay());
+		return new SWTThread(widget.getDisplay(), false);
 	}
 	
 	public static IThreadWorkQueue getThreadAccess() {
-		return new SWTThread(Display.getDefault());
+		return new SWTThread(Display.getDefault(), false);
 	}
 	
-	SWTThread(Display display)
+	SWTThread(Display display, boolean executeAsync)
 	{
 		this.display = display;
+		this.executeAsync = executeAsync;
 	}
 	
 	@Override
@@ -87,6 +94,7 @@ public class SWTThread implements IThreadWorkQueue, Executor {
 
 	@Override
 	public void execute(Runnable command) {
-		syncExec(command);
+		if (executeAsync) asyncExec(command);
+		else syncExec(command);
 	}
 }
diff --git a/bundles/org.simantics.viewpoint.ontology/graph.tg b/bundles/org.simantics.viewpoint.ontology/graph.tg
index d3163ee7b..12a8c0b7d 100644
Binary files a/bundles/org.simantics.viewpoint.ontology/graph.tg and b/bundles/org.simantics.viewpoint.ontology/graph.tg differ
diff --git a/bundles/org.simantics.workbench.ontology/graph.tg b/bundles/org.simantics.workbench.ontology/graph.tg
index 68a1b4c50..caca38320 100644
Binary files a/bundles/org.simantics.workbench.ontology/graph.tg and b/bundles/org.simantics.workbench.ontology/graph.tg differ