X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.document.ui%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Fui%2Factions%2FImportDocumentWithDetail.java;h=be504594417a65b900c5172aeaade7d9da4cc686;hb=55feb8ea3a74bf5ce73619d62d4c73e576ae89fc;hp=7235f55f09382b854d3dada7ca025df36610f763;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.document.ui/src/org/simantics/document/ui/actions/ImportDocumentWithDetail.java b/bundles/org.simantics.document.ui/src/org/simantics/document/ui/actions/ImportDocumentWithDetail.java
index 7235f55f0..be5045944 100644
--- a/bundles/org.simantics.document.ui/src/org/simantics/document/ui/actions/ImportDocumentWithDetail.java
+++ b/bundles/org.simantics.document.ui/src/org/simantics/document/ui/actions/ImportDocumentWithDetail.java
@@ -21,10 +21,10 @@ 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.AddDocumentAction;
+import org.simantics.document.FileDocumentUtil;
 import org.simantics.document.ui.dialogs.FileDetailDialog;
-import org.simantics.document.ui.graphfile.FileDocumentUtil;
 import org.simantics.layer0.Layer0;
-import org.simantics.utils.datastructures.Callback;
 import org.simantics.utils.ui.ExceptionUtils;
 
 /**
@@ -71,15 +71,10 @@ public class ImportDocumentWithDetail extends AddDocumentAction {
 					    Resource newDoc = doDocumentImport(graph, resource, filename, name);
 						dialog.getAnnotationConfigurator().apply(graph,newDoc);
 					}
-				},new Callback<DatabaseException>() {				
-					@Override
-					public void run(DatabaseException parameter) {
-						dialog.getAnnotationConfigurator().dispose();
-						if (parameter != null) {
-							ExceptionUtils.logAndShowError("Cannot import document.", parameter);
-						}
-						
-					}
+				}, e -> {
+					dialog.getAnnotationConfigurator().dispose();
+					if (e != null)
+						ExceptionUtils.logAndShowError(Messages.ImportDocumentWithDetail_CannotImportDocument, e);
 				});
 			}
 		};
@@ -96,8 +91,8 @@ public class ImportDocumentWithDetail extends AddDocumentAction {
 	public static Resource importDocumentWithDetailSCL(WriteGraph graph, Resource target, String filename) throws FileNotFoundException, DatabaseException {
 	    File file = new File(filename);
 	    if (!file.exists())
-	        throw new FileNotFoundException("File not found - " + file.getAbsolutePath());
-	    ImportDocumentWithDetail document = new ImportDocumentWithDetail(graph, "http://www.simantics.org/Layer0-1.1/ConsistsOf");
+	        throw new FileNotFoundException("File not found - " + file.getAbsolutePath()); //$NON-NLS-1$
+	    ImportDocumentWithDetail document = new ImportDocumentWithDetail(graph, "http://www.simantics.org/Layer0-1.1/ConsistsOf"); //$NON-NLS-1$
 	    return document.doDocumentImport(graph, target, filename, file.getName());
 	}