Sync git svn branch with SVN repository r33303.

[simantics/platform.git] / bundles / org.simantics.fileimport / src / org / simantics / fileimport / SimanticsResourceFileImport.java

diff --git a/bundles/org.simantics.fileimport/src/org/simantics/fileimport/SimanticsResourceFileImport.java b/bundles/org.simantics.fileimport/src/org/simantics/fileimport/SimanticsResourceFileImport.java
index 70439ef1db950a3861a2c7452a26d42f936882b5..eea85d47d9f559e9306193b5bbdc328559ac99eb 100644 (file)
--- a/bundles/org.simantics.fileimport/src/org/simantics/fileimport/SimanticsResourceFileImport.java
+++ b/bundles/org.simantics.fileimport/src/org/simantics/fileimport/SimanticsResourceFileImport.java
@@ -32,7 +32,14 @@ public abstract class SimanticsResourceFileImport implements IGenericFileImport
     final public Optional<String> perform(Path file) throws Exception {\r
         \r
         Path dropins = Activator.getDropinsFolder();\r
-        Path parts = dropins.relativize(file);\r
+        \r
+        Path parts;\r
+        if (file.toAbsolutePath().toString().startsWith(dropins.toAbsolutePath().toString())) {\r
+               parts = dropins.relativize(file);\r
+        } else {\r
+               parts = file.getFileName();\r
+        }\r
+        \r
         Resource parent = resolveParent(null, parts);\r
         if (parent == null)\r
             return Optional.empty();\r