Finish 1.3.1

Author: JavaSaBr

.gitignore

@@ -1,8 +1,12 @@
 /bin/
 *.so
+*.dll
 *.log
 /build/
 /native-build/
 /.gradle/
 /.idea/
 /out/
+.classpath
+.project
+/.settings/

app.version

@@ -1 +1 @@
-1.3.0
+1.3.1

build-native.xml

@@ -2,7 +2,7 @@
 <project name="jMonkeyBuilder" default="do-deploy" basedir="native-build"
          xmlns:fx="javafx:com.sun.javafx.tools.ant">
 
-    <property name="editor.version" value="1.3.0"/>
+    <property name="editor.version" value="1.3.1"/>
     <property environment="env"/>
 
     <condition property="gradle.executable" value="${basedir}/../gradlew.bat"

build.gradle

@@ -13,7 +13,7 @@ apply plugin: 'idea'
 apply plugin: 'org.junit.platform.gradle.plugin'
 
 group = 'com.spaceshift'
-version = '1.3.0'
+version = '1.3.1'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -24,7 +24,7 @@ compileTestJava {
     options.compilerArgs += '-parameters'
 }
 
-ext.jmeVersion = "3.2-SNAPSHOT"
+ext.jmeVersion = "3.2_branch-SNAPSHOT"
 ext.jme3_xbuf_version = '0.9.1'
 ext.lwjglVersion = "3.1.2"
 ext.junitPlatformVersion = "1.0.0"

src/main/java/com/ss/editor/config/Config.java

@@ -42,7 +42,7 @@ public final class Config {
      * The editor's version.
      */
     @NotNull
-    public static final Version APP_VERSION = new Version("1.3.0");
+    public static final Version APP_VERSION = new Version("1.3.1");
 
     /**
      * The string version.

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

@@ -2,6 +2,7 @@
 
 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.rlib.util.FileUtils.containsExtensions;
 import static com.ss.rlib.util.ObjectUtils.notNull;
@@ -71,7 +72,7 @@ public void convert(@NotNull final Path source, @NotNull final Path destination)
         }
 
         final String resultName = FileUtils.getNameWithoutExtension(source);
-        final Path assetDestination = EditorUtil.getAssetFile(destination);
+        final Path assetDestination = getAssetFile(destination.getParent());
 
         final Array<PropertyDefinition> definitions = ArrayFactory.newArray(PropertyDefinition.class);
         definitions.add(new PropertyDefinition(STRING, Messages.MODEL_CONVERTER_DIALOG_RESULT_NAME, PROP_RESULT_NAME, resultName));
@@ -135,7 +136,7 @@ private void convert(@NotNull final Path source, @NotNull final VarTable vars) {
     private void convertImpl(@NotNull final Path source, @NotNull final VarTable vars) throws IOException {
 
         final String filename = vars.getString(PROP_RESULT_NAME);
-        final Path destinationFolder = vars.get(PROP_DESTINATION);
+        final Path destinationFolder = notNull(getRealFile(vars.get(PROP_DESTINATION, Path.class)));
         final Path destination = destinationFolder.resolve(filename + "." + FileExtensions.JME_OBJECT);
         final boolean isOverwrite = Files.exists(destination);
 

src/main/java/com/ss/editor/plugin/api/property/control/FolderAssetResourcePropertyControl.java

@@ -8,6 +8,7 @@
 import com.ss.editor.plugin.api.property.PropertyDefinition;
 import com.ss.editor.ui.component.asset.tree.context.menu.action.NewFileAction;
 import com.ss.editor.ui.util.UIUtils;
+import com.ss.rlib.util.StringUtils;
 import com.ss.rlib.util.VarTable;
 import javafx.scene.control.Label;
 import org.jetbrains.annotations.NotNull;
@@ -55,9 +56,10 @@ protected void processSelect(@NotNull final Path file) {
     protected void reload() {
 
         final Path file = getPropertyValue();
+        final String assetPath = file == null ? NOT_SELECTED : toAssetPath(file);
 
         final Label resourceLabel = getResourceLabel();
-        resourceLabel.setText(file == null ? NOT_SELECTED : toAssetPath(file));
+        resourceLabel.setText(StringUtils.isEmpty(assetPath) ? "/" : assetPath);
 
         super.reload();
     }