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=923f3d7bf56c9afe4e9834320a0c1ef29ec06ca2;hp=ca50c8bb333f35b2c44a9017682334710a766868;hb=c8e675ae59eebb045a095a07e54462d0fe87f5cb;hpb=969bd23cab98a79ca9101af33334000879fb60c5

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..923f3d7bf 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
@@ -1,79 +1,114 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2010 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:
- *     VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
-package org.simantics.document.ui.actions;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.FileDialog;
-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.graphfile.FileDocumentUtil;
-import org.simantics.utils.datastructures.Callback;
-import org.simantics.utils.ui.ExceptionUtils;
-
-/**
- * Action for importing files as documents.
- * 
- * @author Marko Luukkainen <marko.luukkainen@vtt.fi>
- *
- */
-public class ImportDocument extends AddDocumentAction {
-	
-
-	public ImportDocument(ReadGraph graph, String relationUri) throws DatabaseException {
-		super(graph, relationUri);
-	}
-
-	@Override
-	public Runnable create(Object target) {
-		if(!(target instanceof Resource))
-			return null;
-		final Resource resource = (Resource)target;
-		return new Runnable() {
-			
-			@Override
-			public void run() {
-				FileDialog dialog = new FileDialog(Display.getCurrent().getActiveShell(),SWT.OPEN);
-				// 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.
-				dialog.setFilterExtensions(new String[]{"*.*"});
-				final String filename = dialog.open();
-				if (filename == null) {
-					return;
-				}
-				Simantics.getSession().asyncRequest(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);
-						}
-						
-					}
-				});
-			}
-		};
-	}
-	
-}
+/*******************************************************************************
+ * Copyright (c) 2007, 2010 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:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+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;
+
+/**
+ * Action for importing files as documents.
+ * 
+ * @author Marko Luukkainen <marko.luukkainen@vtt.fi>
+ *
+ */
+public class ImportDocument extends AddDocumentAction {
+	
+
+	public ImportDocument(ReadGraph graph, String relationUri) throws DatabaseException {
+		super(graph, relationUri);
+	}
+
+	@Override
+	public Runnable create(Object target) {
+		if(!(target instanceof Resource))
+			return null;
+		final Resource resource = (Resource)target;
+		return new Runnable() {
+			
+			@Override
+			public void run() {
+				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[]{"*.*"}); //$NON-NLS-1$
+				if (dialog.open() == null) return;
+
+				String filterPath = dialog.getFilterPath();
+				String[] filenames = dialog.getFileNames();
+				
+				ImportJob job = new ImportJob(filenames.length > 1 ? Messages.ImportDocument_JobImportFiles : Messages.ImportDocument_ImportFile, 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(Messages.ImportDocument_ImportingDots, filenames.length);
+			try {
+				Simantics.getSession().syncRequest(new WriteRequest() {
+					@Override
+					public void perform(WriteGraph graph) throws DatabaseException {
+						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, Messages.ImportDocument_ActivatorImportSucessful);
+			} catch (DatabaseException e) {
+				return new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.ImportDocument_ImportFailed, e);
+			} finally {
+				monitor.done();
+			}
+		}
+	}
+	
+}