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 33a3871fc992a5906d0066b237bca8b2a6dec512..c1c8ff68eac6ffba173e8f629300d798596d5f48 100644 (file)
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 72053ec5b6317e93ecee85e2c5d2afa528b8f79c..45f65af2648849bca8358e73bfd74d919dc95ece 100644 (file)
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 c321d212ce1dec3ce2362c7fcce3f2b035766e45..51f83d20b95b56c28aed8e4e5b7dff941ea53dd0 100644 (file)
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 fb597cc1cac5634dce3932cbda5b52645e80d882..332f21fb25d0649a359ca3152f1b44fc3807cee3 100644 (file)
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 376ab173e1e9a9c5afaaa0058ee2c7a4b57f40ed..78c58e63dc698f82934dde034b9b21198a19d3d2 100644 (file)
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 37fc6470b1af1b90d96da5365c07f1787a10ea5d..c072a1509ea33d52a41a360843a67308acb38783 100644 (file)
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 ee66bf879c35480e3bc7e0d058c18cc1e23e561c..0ac20b8f448112534d33dc0f7fd3536aacec62c6 100644 (file)
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 eafb6ec76ba847404f9b0cc19d1c6a9714fa9d4e..9509da624ea45451dc49d3225679c7a5ba008b82 100644 (file)
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 8ad7b0843382d31d31c47d0c02f35187d03d19d3..405ddb99487194ee81f9bd280e5e142110336bd9 100644 (file)
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 b5bb6722c43e8531dc42c80f32ac5043846752da..07102a102cd8b861210a31d9ec26de60478b8c6c 100644 (file)
--- 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 d3163ee7b1ffe3c367ff1a474087a2733915c45d..12a8c0b7df31ff5c4344b4e46f5622062feb2ede 100644 (file)
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 68a1b4c50e986f6a0f9d559ea6aeeda3b3f5cc4c..caca38320033554835c7dea616b85f5e7873232b 100644 (file)
Binary files a/bundles/org.simantics.workbench.ontology/graph.tg and b/bundles/org.simantics.workbench.ontology/graph.tg differ