Finish 1.6.0

README.md

@@ -1,4 +1,4 @@
-# jMonkeyBuilder 1.4.0 #
+# jMonkeyBuilder 1.6.0 #
 ### It's 3D Editor to prepare/work/create graphics content for jMonkeyEngine 3.2 ###
 
 [![Join the chat at https://gitter.im/jME3-SpaceShift-Editor/Lobby](https://badges.gitter.im/jME3-SpaceShift-Editor/Lobby.svg)](https://gitter.im/jME3-SpaceShift-Editor/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

app.version

@@ -1 +1 @@
-1.5.0
+1.6.0

build.gradle

@@ -13,7 +13,7 @@ apply plugin: 'idea'
 apply plugin: 'org.junit.platform.gradle.plugin'
 
 group = 'com.spaceshift'
-version = '1.5.0'
+version = '1.6.0'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -24,12 +24,12 @@ compileTestJava {
     options.compilerArgs += '-parameters'
 }
 
-ext.applicationMainClass = "com.ss.editor.JFXApplication"
+ext.applicationMainClass = "com.ss.editor.JfxApplication"
 ext.applicationVendor = "javasabr@gmail.com"
 ext.applicationTitle = "jMonkeyBuilder"
-ext.jmeVersion = "3.3_branch-SNAPSHOT"
+ext.jmeVersion = "v3.3.dev-SNAPSHOT"
+ext.jmbExtVersion = "1.9.7"
 ext.jme3_xbuf_version = '0.9.1'
-ext.lwjglVersion = "3.1.5"
 ext.junitPlatformVersion = "1.0.0"
 ext.junitJupiterVersion = "5.0.0"
 ext.log4jVersion = '2.6.2'
@@ -58,11 +58,11 @@ dependencies {
 
     // base
     compile group: 'org.fxmisc.richtext', name: 'richtextfx', version: '0.8.1'
-    compile 'org.controlsfx:controlsfx:8.40.13'
+    compile 'org.controlsfx:controlsfx:8.40.14'
 
     compile 'com.github.JavaSaBr:RlibFX:4.1.3'
-    compile 'com.github.JavaSaBr:RLib:6.7.1'
-    compile 'com.github.JavaSaBr:JME3-JFX:1.7.1'
+    compile 'com.github.JavaSaBr:RLib:6.7.4'
+    compile "com.github.JavaSaBr:JME3-JFX:1.7.3"
 
     // https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
     compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.6'
@@ -95,52 +95,29 @@ dependencies {
         exclude group: 'lessvoid'
     }
 
-    // LWJGL
-    compile "org.lwjgl:lwjgl:${lwjglVersion}"
-    compile "org.lwjgl:lwjgl-glfw:${lwjglVersion}"
-    compile "org.lwjgl:lwjgl-jemalloc:${lwjglVersion}"
-    compile "org.lwjgl:lwjgl-openal:${lwjglVersion}"
-    compile "org.lwjgl:lwjgl-opencl:${lwjglVersion}"
-    compile "org.lwjgl:lwjgl-opengl:${lwjglVersion}"
-    compile "org.lwjgl:lwjgl-stb:${lwjglVersion}"
-    runtime "org.lwjgl:lwjgl:${lwjglVersion}:natives-windows"
-    runtime "org.lwjgl:lwjgl:${lwjglVersion}:natives-linux"
-    runtime "org.lwjgl:lwjgl:${lwjglVersion}:natives-macos"
-    runtime "org.lwjgl:lwjgl-glfw:${lwjglVersion}:natives-windows"
-    runtime "org.lwjgl:lwjgl-glfw:${lwjglVersion}:natives-linux"
-    runtime "org.lwjgl:lwjgl-glfw:${lwjglVersion}:natives-macos"
-    runtime "org.lwjgl:lwjgl-jemalloc:${lwjglVersion}:natives-windows"
-    runtime "org.lwjgl:lwjgl-jemalloc:${lwjglVersion}:natives-linux"
-    runtime "org.lwjgl:lwjgl-jemalloc:${lwjglVersion}:natives-macos"
-    runtime "org.lwjgl:lwjgl-openal:${lwjglVersion}:natives-windows"
-    runtime "org.lwjgl:lwjgl-openal:${lwjglVersion}:natives-linux"
-    runtime "org.lwjgl:lwjgl-openal:${lwjglVersion}:natives-macos"
-    runtime "org.lwjgl:lwjgl-opengl:${lwjglVersion}:natives-windows"
-    runtime "org.lwjgl:lwjgl-opengl:${lwjglVersion}:natives-linux"
-    runtime "org.lwjgl:lwjgl-opengl:${lwjglVersion}:natives-macos"
-    runtime "org.lwjgl:lwjgl-stb:${lwjglVersion}:natives-windows"
-    runtime "org.lwjgl:lwjgl-stb:${lwjglVersion}:natives-linux"
-    runtime "org.lwjgl:lwjgl-stb:${lwjglVersion}:natives-macos"
-
-
     // http support
     // https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient
     compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3'
 
     // extensions
-    compile ('com.github.JavaSaBr:jmonkeybuilder-extension:1.9.4') {
+    compile ("com.github.JavaSaBr:jmonkeybuilder-extension:$jmbExtVersion") {
         exclude group: 'org.jmonkeyengine'
     }
-    compile ('com.github.JavaSaBr:tonegodemitter:2.4.1') {
+
+    compile ("org.xbuf.jme3_xbuf:jme3_xbuf_loader:${jme3_xbuf_version}") {
         exclude group: 'org.jmonkeyengine'
     }
 
-    compile "org.xbuf.jme3_xbuf:jme3_xbuf_loader:${jme3_xbuf_version}"
-
     // https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-all
     compile group: 'org.codehaus.groovy', name: 'groovy-all', version: '2.5.0-beta-1'
 
     // TESTS
+    testRuntime "com.github.JavaSaBr.jmonkeyengine:jme3-lwjgl3:$jmeVersion"
+    testCompile ("com.github.JavaSaBr:jmonkeybuilder-extension:$jmbExtVersion") {
+        exclude group: 'org.jmonkeyengine'
+        exclude group: 'com.github.JavaSaB.jmonkeyengine'
+    }
+
     testCompile "org.junit.platform:junit-platform-commons:$junitPlatformVersion"
     testRuntime "org.junit.platform:junit-platform-engine:$junitPlatformVersion"
 
@@ -175,7 +152,6 @@ task prepareDependencies(type: Copy) {
     from configurations.runtime
 }
 
-
 task sourcesJar(type: Jar, dependsOn: classes) {
     classifier = 'sources'
     from sourceSets.main.allSource

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Wed Jan 24 08:56:01 MSK 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

settings.gradle

@@ -1 +1 @@
-rootProject.name = 'jMonkeyBuilder'
+rootProject.name = 'jMonkeyBuilder'

src/main/java/com/ss/editor/DevelopPluginStarter.java

@@ -16,6 +16,6 @@ public class DevelopPluginStarter {
     public static void main(@NotNull final String[] args) throws IOException {
         final Path embeddedFolder = Paths.get("./embedded-plugins");
         System.setProperty("editor.embedded.plugins.path", embeddedFolder.toAbsolutePath().toString());
-        JFXApplication.main(args);
+        JfxApplication.main(args);
     }
 }

src/main/java/com/ss/editor/EditorThread.java

@@ -14,33 +14,19 @@ public class EditorThread extends Thread {
     /**
      * The container of thread local objects.
      */
+    @NotNull
     private final LocalObjects localObjects;
 
-    /**
-     * Instantiates a new Editor thread.
-     */
     public EditorThread() {
         this.localObjects = new LocalObjects();
     }
 
-    /**
-     * Instantiates a new Editor thread.
-     *
-     * @param target the target
-     */
-    public EditorThread(final Runnable target) {
+    public EditorThread(@NotNull final Runnable target) {
         super(target);
         this.localObjects = new LocalObjects();
     }
 
-    /**
-     * Instantiates a new Editor thread.
-     *
-     * @param group  the group
-     * @param target the target
-     * @param name   the name
-     */
-    public EditorThread(final ThreadGroup group, final Runnable target, final String name) {
+    public EditorThread(@NotNull final ThreadGroup group, @NotNull final Runnable target, @NotNull final String name) {
         super(group, target, name);
         this.localObjects = new LocalObjects();
     }