X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.document.ui%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Fui%2Factions%2FImportDocument.java;h=7a9595263494f2cc192fbc7f293b2dea8f962fbc;hp=ca50c8bb333f35b2c44a9017682334710a766868;hb=0b471805f017da83d715a0d8409f53bdd009d31e;hpb=145a2884933f2ffdd48d6835729e58f1152d274e

diff --git a/bundles/org.simantics.document.ui/src/org/simantics/document/ui/actions/ImportDocument.java b/bundles/org.simantics.document.ui/src/org/simantics/document/ui/actions/ImportDocument.java
index ca50c8bb3..7a9595263 100644
--- a/bundles/org.simantics.document.ui/src/org/simantics/document/ui/actions/ImportDocument.java
+++ b/bundles/org.simantics.document.ui/src/org/simantics/document/ui/actions/ImportDocument.java
@@ -11,18 +11,23 @@
  *******************************************************************************/
 package org.simantics.document.ui.actions;
 
+import java.io.File;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.FileDialog;
+import org.simantics.DatabaseJob;
 import org.simantics.Simantics;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.common.request.WriteRequest;
 import org.simantics.db.exception.DatabaseException;
+import org.simantics.document.ui.Activator;
 import org.simantics.document.ui.graphfile.FileDocumentUtil;
-import org.simantics.utils.datastructures.Callback;
-import org.simantics.utils.ui.ExceptionUtils;
 
 /**
  * Action for importing files as documents.
@@ -46,34 +51,64 @@ public class ImportDocument extends AddDocumentAction {
 			
 			@Override
 			public void run() {
-				FileDialog dialog = new FileDialog(Display.getCurrent().getActiveShell(),SWT.OPEN);
+				FileDialog dialog = new FileDialog(Display.getCurrent().getActiveShell(),SWT.OPEN | SWT.MULTI);
 				// TODO : is there any way to read file/executable bindings from OS?
 				//        if is, use those extensions to filter this list.
 				//        note: in windows using "reg query ..." to read bindings form registry would work.
+				// Note : If the above mentioned filtering is implemented it should be made optional / configurable.
 				dialog.setFilterExtensions(new String[]{"*.*"});
-				final String filename = dialog.open();
-				if (filename == null) {
-					return;
-				}
-				Simantics.getSession().asyncRequest(new WriteRequest() {
+				if (dialog.open() == null) return;
+
+				String filterPath = dialog.getFilterPath();
+				String[] filenames = dialog.getFileNames();
+				
+				ImportJob job = new ImportJob(filenames.length > 1 ? "Import files" : "Import file", resource, filterPath, filenames);
+				job.setUser(true);
+				job.schedule();
+			}
+		};
+	}
+	
+	private class ImportJob extends DatabaseJob {
+
+		public ImportJob(String name, Resource resource, String path, String[] filenames) {
+			super(name);
+			this.resource = resource;
+			this.path = path;
+			this.filenames = filenames;
+		}
+
+		Resource resource;
+		String path;
+		String[] filenames;
+
+		@Override
+		protected IStatus run(final IProgressMonitor monitor) {
+			monitor.beginTask("Importing...", filenames.length);
+			try {
+				Simantics.getSession().syncRequest(new WriteRequest() {
 					@Override
 					public void perform(WriteGraph graph) throws DatabaseException {
-					    graph.markUndoPoint();
-					    
-						Resource newDoc = FileDocumentUtil.importFileWithName(graph,filename);
-						linkDocument(graph, resource, newDoc);
-					}
-				},new Callback<DatabaseException>() {				
-					@Override
-					public void run(DatabaseException parameter) {
-						if (parameter != null) {
-							ExceptionUtils.logAndShowError("Cannot import document.", parameter);
+						try {
+							graph.markUndoPoint();
+						    for (String filename : filenames) {
+						    	File f = new File(path, filename);
+						    	Resource newDoc = FileDocumentUtil.importFileWithName(graph, f.getAbsolutePath());
+						    	linkDocument(graph, resource, newDoc);
+							    monitor.worked(1);
+						    }
+						} catch (Exception e) {
+							throw new DatabaseException(e);
 						}
-						
 					}
 				});
+				return new Status(IStatus.OK, Activator.PLUGIN_ID, "Import succesful.");
+			} catch (DatabaseException e) {
+				return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Import failed.", e);
+			} finally {
+				monitor.done();
 			}
-		};
+		}
 	}
 	
 }