refactoring

Author: JavaSaBr

src/main/java/com/ss/editor/model/undo/UndoableEditor.java

@@ -1,5 +1,7 @@
 package com.ss.editor.model.undo;
 
+import com.ss.editor.annotation.FXThread;
+
 /**
  * The interface to implement an undoable editor.
  *
@@ -10,10 +12,12 @@ public interface UndoableEditor {
     /**
      * Increment changes count.
      */
+    @FXThread
     void incrementChange();
 
     /**
      * Decrement changes count.
      */
+    @FXThread
     void decrementChange();
 }

src/main/java/com/ss/editor/model/undo/editor/MaterialChangeConsumer.java

@@ -3,6 +3,7 @@
 import com.jme3.material.Material;
 import com.ss.editor.annotation.FXThread;
 
+import com.ss.editor.annotation.FromAnyThread;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -18,7 +19,7 @@ public interface MaterialChangeConsumer {
      * @return the current material.
      */
     @NotNull
-    @FXThread
+    @FromAnyThread
     Material getCurrentMaterial();
 
     /**

src/main/java/com/ss/editor/state/editor/impl/material/MaterialEditor3DState.java

@@ -134,7 +134,7 @@ public MaterialEditor3DState(@NotNull final MaterialFileEditor fileEditor) {
         this.testSphere = new Geometry("Sphere", new Sphere(30, 30, 2));
         this.testQuad = new Geometry("Quad", new Quad(4, 4));
         this.testQuad.setLocalTranslation(QUAD_OFFSET);
-        this.lightEnabled = true;
+        this.lightEnabled = MaterialFileEditor.DEFAULT_LIGHT_ENABLED;
 
         TangentGenerator.useMikktspaceGenerator(testBox);
         TangentGenerator.useMikktspaceGenerator(testSphere);

src/main/java/com/ss/editor/ui/component/editor/impl/AbstractFileEditor.java

@@ -238,6 +238,7 @@ private void processMousePressed(@NotNull final MouseEvent mouseEvent) {
      *
      * @param event the event
      */
+    @FXThread
     protected void processKeyReleased(@NotNull final KeyEvent event) {
 
         final KeyCode code = event.getCode();
@@ -290,6 +291,7 @@ protected void processKeyPressed(@NotNull final KeyEvent event) {
      *
      * @param container the container
      */
+    @FXThread
     protected void createToolbar(@NotNull final HBox container) {
     }
 
@@ -365,6 +367,7 @@ protected void postSave() {
      *
      * @return true if this editor needs a toolbar.
      */
+    @FXThread
     protected boolean needToolbar() {
         return false;
     }
@@ -375,13 +378,15 @@ protected boolean needToolbar() {
      * @return the new root.
      */
     @NotNull
+    @FXThread
     protected abstract R createRoot();
 
     /**
      * Create content.
      *
      * @param root the root
      */
+    @FXThread
     protected abstract void createContent(@NotNull final R root);
 
     @NotNull
@@ -405,8 +410,8 @@ public String getFileName() {
         return fileName.toString();
     }
 
-    @FXThread
     @Override
+    @FXThread
     public void openFile(@NotNull final Path file) {
         FX_EVENT_MANAGER.addEventHandler(FileChangedEvent.EVENT_TYPE, getFileChangedHandler());
 
@@ -535,6 +540,7 @@ public void notifyClosed() {
      *
      * @param event the event
      */
+    @FXThread
     protected void processChangedFile(@NotNull final FileChangedEvent event) {
 
         final Path file = event.getFile();
@@ -555,6 +561,7 @@ protected void processChangedFile(@NotNull final FileChangedEvent event) {
     /**
      * Handle external changes of the edited file.
      */
+    @FXThread
     protected void handleExternalChanges() {
 
     }