X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.spreadsheet.fileimport%2Fsrc%2Forg%2Fsimantics%2Fspreadsheet%2Ffileimport%2FExcelFileImport.java;h=d1f8924a58b5c245c6b450d4b6c33769bf81999d;hp=c3a84f7a4ef6cf0709f17b0e494b376b4bbc05a4;hb=664f37a026967c90a9a8a4ef3c5336ee426f67aa;hpb=5915c1bbd6d0c6125aa3c815c7843339190f28e4 diff --git a/bundles/org.simantics.spreadsheet.fileimport/src/org/simantics/spreadsheet/fileimport/ExcelFileImport.java b/bundles/org.simantics.spreadsheet.fileimport/src/org/simantics/spreadsheet/fileimport/ExcelFileImport.java index c3a84f7a4..d1f8924a5 100644 --- a/bundles/org.simantics.spreadsheet.fileimport/src/org/simantics/spreadsheet/fileimport/ExcelFileImport.java +++ b/bundles/org.simantics.spreadsheet.fileimport/src/org/simantics/spreadsheet/fileimport/ExcelFileImport.java @@ -20,8 +20,13 @@ public class ExcelFileImport extends SimanticsResourceFileImport { } @Override - public Optional perform(Resource parent, Path file) throws Exception { - return Optional.ofNullable(ExcelImport.importBookR(parent, file.toFile())); + public Optional perform(Resource possibleSelection, Path file) throws Exception { + if(possibleSelection != null) { + //Make sure the selection is of valid type here + return Optional.ofNullable(ExcelImport.importBookR(possibleSelection, file.toFile())); + } else { + throw new NullPointerException("No selection provided - Cannot import book"); + } } @Override @@ -31,7 +36,7 @@ public class ExcelFileImport extends SimanticsResourceFileImport { @Override public Resource defaultParentResource() { - return Simantics.getSession().getRootLibrary(); + return null; } }