updated rlib.

Author: JavaSaBr

build.gradle

@@ -26,7 +26,7 @@ compileTestJava {
 
 ext.jmeVersion = "3.2_branch-SNAPSHOT"
 ext.jme3_xbuf_version = '0.9.1'
-ext.lwjglVersion = "3.1.2"
+ext.lwjglVersion = "3.1.5"
 ext.junitPlatformVersion = "1.0.0"
 ext.junitJupiterVersion = "5.0.0"
 ext.log4jVersion = '2.6.2'
@@ -59,7 +59,7 @@ dependencies {
 
     compile 'com.github.JavaSaBr:RlibFX:4.1.3'
     compile 'com.github.JavaSaBr:RLib:6.6.0'
-    compile 'com.github.JavaSaBr:JME3-JFX:1.6.1'
+    compile 'com.github.JavaSaBr:JME3-JFX:1.7.0'
 
     // https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
     compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.6'

src/main/java/com/ss/editor/model/EditorCamera.java

@@ -285,8 +285,8 @@ public void onAction(final String name, final boolean keyPressed, final float tp
             return;
         }
 
-        if (Config.DEV_CAMERA_DEBUG && LOGGER.isEnabledDebug()) {
-            LOGGER.debug("Toggle camera " + keyPressed);
+        if (Config.DEV_CAMERA_DEBUG) {
+            LOGGER.debug(this, keyPressed, flag -> "Toggle camera " + flag);
         }
 
         if (keyPressed) {

src/main/java/com/ss/editor/state/editor/impl/AdvancedAbstractEditor3DState.java

@@ -21,6 +21,7 @@
 import com.ss.editor.util.LocalObjects;
 import com.ss.rlib.function.BooleanFloatConsumer;
 import com.ss.rlib.function.FloatFloatConsumer;
+import com.ss.rlib.logging.LoggerLevel;
 import com.ss.rlib.util.dictionary.DictionaryFactory;
 import com.ss.rlib.util.dictionary.ObjectDictionary;
 import org.jetbrains.annotations.NotNull;
@@ -540,7 +541,7 @@ public boolean isCameraMoving() {
     @JMEThread
     private void startCameraMoving(final int key) {
 
-        if (Config.DEV_CAMERA_DEBUG && LOGGER.isEnabledDebug()) {
+        if (Config.DEV_CAMERA_DEBUG && LOGGER.isEnabled(LoggerLevel.DEBUG)) {
             LOGGER.debug(this, "start camera moving[" + cameraMoving + "] for key " + key);
         }
 
@@ -570,7 +571,7 @@ private void finishCameraMoving(final int key, final boolean force) {
 
         final boolean[] cameraKeysState = getCameraKeysState();
 
-        if (Config.DEV_CAMERA_DEBUG && LOGGER.isEnabledDebug()) {
+        if (Config.DEV_CAMERA_DEBUG && LOGGER.isEnabled(LoggerLevel.DEBUG)) {
             LOGGER.debug(this, "finish camera moving[" + cameraMoving + "] for key " + key + ", force = " + force);
         }
 

src/main/java/com/ss/editor/ui/event/EventRedirector.java

@@ -1,5 +1,6 @@
 package com.ss.editor.ui.event;
 
+import static com.ss.rlib.util.ObjectUtils.notNull;
 import com.ss.editor.config.Config;
 import com.ss.editor.ui.component.editor.FileEditor;
 import com.ss.editor.ui.component.editor.area.EditorAreaComponent;
@@ -172,8 +173,8 @@ private void redirect(@NotNull final InputEvent event) {
             return;
         } else if (target instanceof TextInputControl) {
             if (event instanceof KeyEvent && UIUtils.isNotHotKey((KeyEvent) event)) {
-                if (Config.DEV_DEBUG_JFX_KEY_INPUT && LOGGER.isEnabledDebug()) {
-                    LOGGER.debug("Key event was skipped because it was from " + target);
+                if (Config.DEV_DEBUG_JFX_KEY_INPUT) {
+                    LOGGER.debug(this, target, ev -> "Key event was skipped because it was from " + ev);
                 }
                 return;
             }
@@ -182,17 +183,17 @@ private void redirect(@NotNull final InputEvent event) {
         final EventType<? extends InputEvent> eventType = event.getEventType();
         final FileEditor currentEditor = editorAreaComponent.getCurrentEditor();
 
-        if (Config.DEV_DEBUG_JFX_KEY_INPUT && LOGGER.isEnabledDebug()) {
-            LOGGER.debug("Key event " + event.getEventType() + " is inside " +
-                    currentEditor.isInside(getSceneX(), getSceneY(), event.getClass()));
+        if (Config.DEV_DEBUG_JFX_KEY_INPUT) {
+            LOGGER.debug(this, event, notNull(currentEditor), (red, ev, editor) -> "Key event " + ev.getEventType() +
+                    " is inside " + editor.isInside(red.getSceneX(), red.getSceneY(), ev.getClass()));
         }
 
         if (currentEditor == null || eventType != KeyEvent.KEY_RELEASED && !currentEditor.isInside(getSceneX(), getSceneY(), event.getClass())) {
             return;
         }
 
-        if (Config.DEV_DEBUG_JFX_KEY_INPUT && LOGGER.isEnabledDebug()) {
-            LOGGER.debug("Redirect event " + event);
+        if (Config.DEV_DEBUG_JFX_KEY_INPUT) {
+            LOGGER.debug(this, event, ev -> "Redirect event " + ev);
         }
 
         Event.fireEvent(destination, event.copyFor(event.getSource(), destination));
@@ -201,7 +202,7 @@ private void redirect(@NotNull final InputEvent event) {
     /**
      * Update mouse coords.
      */
-    private void updateCoords(final MouseEvent event) {
+    private void updateCoords(@NotNull final MouseEvent event) {
         this.sceneX = event.getSceneX();
         this.sceneY = event.getSceneY();
     }