Synchronize ModelingUtils.fileDialog() to UI thread.

[simantics/platform.git] / bundles / org.simantics.modeling / src / org / simantics / modeling / ModelingUtils.java

diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java
index 017d1cf4bc6ab01c5593025a022435746dc37c36..ea960c1d0de2fe97dfae468331b0521f69219ccd 100644 (file)
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/ModelingUtils.java
@@ -1516,7 +1516,7 @@ public class ModelingUtils {
     public static TransferableGraph1 exportSharedOntology(IProgressMonitor monitor, RequestProcessor processor, File location, String format, int version, final LibraryInfo info) throws DatabaseException, IOException {
        
        if(monitor == null) monitor = new NullProgressMonitor();
-       
+       final IProgressMonitor finalMonitor = monitor;
         // TODO: figure out a way to make the TG go directly into a file
         // instead of having it all in memory at once.
 
@@ -1526,7 +1526,7 @@ public class ModelingUtils {
             public SimanticsClipboard perform(ReadGraph graph) throws DatabaseException {
                 CopyHandler ch = graph.adapt(info.library.getResource(), CopyHandler.class);
                 SimanticsClipboardImpl clipboard = new SimanticsClipboardImpl();
-                ch.copyToClipboard(graph, clipboard);
+                ch.copyToClipboard(graph, clipboard, finalMonitor);
                 return clipboard;
             }
         });
@@ -2400,31 +2400,45 @@ public class ModelingUtils {
        }
        
        public static File fileDialog(String title, List<Tuple> namesAndExtensions) {
-               
-               Display display = Display.getCurrent();
-               Shell shell = display.getActiveShell();
-               
-        FileDialog dialog = new FileDialog(shell, SWT.OPEN);
-        dialog.setText(title);
-        
-        String[] extensions = new String[namesAndExtensions.size()];
-        String[] filterNames = new String[namesAndExtensions.size()];
-        int index = 0;
-        for(Tuple t : namesAndExtensions) {
-               String filterName = (String)t.get(0);
-               String extension = (String)t.get(1);
-               filterNames[index] = filterName;
-               extensions[index] = extension;
-               index++;
-        }
-        
-        dialog.setFilterExtensions(extensions);
-        dialog.setFilterNames(filterNames);
-        final String fileName = dialog.open();
-        if (fileName == null) return null;
-        
-        return new File(fileName);
+               return new Runnable() {
+                       private File result;
+                       
+                       File getFile() {
+                               Display.getDefault().syncExec(this);
+                               return result;
+                       }
+                       
+                       @Override
+                       public void run() {
+                               result = showDialog();
+                       }
 
+                       private File showDialog() {
+                               Display display = Display.getCurrent();
+                               Shell shell = display.getActiveShell();
+                               
+                       FileDialog dialog = new FileDialog(shell, SWT.OPEN);
+                       dialog.setText(title);
+                       
+                       String[] extensions = new String[namesAndExtensions.size()];
+                       String[] filterNames = new String[namesAndExtensions.size()];
+                       int index = 0;
+                       for(Tuple t : namesAndExtensions) {
+                               String filterName = (String)t.get(0);
+                               String extension = (String)t.get(1);
+                               filterNames[index] = filterName;
+                               extensions[index] = extension;
+                               index++;
+                       }
+                       
+                       dialog.setFilterExtensions(extensions);
+                       dialog.setFilterNames(filterNames);
+                       final String fileName = dialog.open();
+                       if (fileName == null) return null;
+                       
+                       return new File(fileName);
+                       }
+               }.getFile();
        }
        
        public static Resource createLibrary(WriteGraph graph, Resource parent) throws DatabaseException {