Fixed problem with asset files during model converting.

Author: JavaSaBr

build.gradle

@@ -58,7 +58,7 @@ dependencies {
     compile 'org.controlsfx:controlsfx:8.40.13'
 
     compile 'com.github.JavaSaBr:RlibFX:4.1.3'
-    compile 'com.github.JavaSaBr:RLib:6.5.1'
+    compile 'com.github.JavaSaBr:RLib:6.5.2'
     compile 'com.github.JavaSaBr:JME3-JFX:1.6.1'
 
     // https://mvnrepository.com/artifact/org.apache.commons/commons-lang3

src/main/java/com/ss/editor/file/converter/impl/AbstractModelFileConverter.java

@@ -1,10 +1,9 @@
 package com.ss.editor.file.converter.impl;
 
 import static com.ss.editor.extension.property.EditablePropertyType.*;
-import static com.ss.editor.util.EditorUtil.getAssetFile;
-import static com.ss.editor.util.EditorUtil.getRealFile;
-import static com.ss.editor.util.EditorUtil.toAssetPath;
+import static com.ss.editor.util.EditorUtil.*;
 import static com.ss.rlib.util.FileUtils.containsExtensions;
+import static com.ss.rlib.util.FileUtils.normalizeName;
 import static com.ss.rlib.util.ObjectUtils.notNull;
 import static java.nio.file.StandardOpenOption.*;
 import com.jme3.asset.AssetKey;
@@ -187,7 +186,14 @@ private void convertImpl(@NotNull final Path source, @NotNull final VarTable var
     private void storeMaterials(@NotNull final Path materialsFolder, final boolean canOverwrite,
                                 @NotNull final String materialName, @NotNull final Geometry geometry) {
 
-        final Path resultFile = materialsFolder.resolve(materialName + "." + FileExtensions.JME_MATERIAL);
+        final Path resultFile = materialsFolder.resolve(normalizeName(materialName) + "." + FileExtensions.JME_MATERIAL);
+        final Path assetFile = getAssetFile(resultFile);
+
+        if (assetFile == null) {
+            LOGGER.warning("Can't get asset file for the file " + resultFile);
+            return;
+        }
+
         final Material currentMaterial = geometry.getMaterial();
 
         if (!Files.exists(resultFile) || canOverwrite) {
@@ -198,7 +204,6 @@ private void storeMaterials(@NotNull final Path materialsFolder, final boolean c
             }
         }
 
-        final Path assetFile = notNull(getAssetFile(resultFile));
         final String assetPath = toAssetPath(assetFile);
 
         final AssetManager assetManager = EDITOR.getAssetManager();

src/main/java/com/ss/editor/util/EditorUtil.java

@@ -288,10 +288,20 @@ public static void movePoint(@NotNull final Vector3f first, @NotNull final Vecto
      */
     @FromAnyThread
     public static @Nullable Path getAssetFile(@NotNull final Path file) {
+
         final EditorConfig editorConfig = EditorConfig.getInstance();
         final Path currentAsset = editorConfig.getCurrentAsset();
-        if (currentAsset == null) return null;
-        return currentAsset.relativize(file);
+        if (currentAsset == null) {
+            return null;
+        }
+
+        try {
+            return currentAsset.relativize(file);
+        } catch (final IllegalArgumentException e) {
+            LOGGER.warning("Can't create asset file of the " + file + " for asset folder " + currentAsset);
+            LOGGER.warning(e);
+            return null;
+        }
     }
 
     /**