refactoring, small fixes.

Author: JavaSaBr

build.gradle

@@ -57,7 +57,9 @@ dependencies {
     compile "com.github.JavaSaBr.jmonkeyengine:jme3-effects:$jmeVersion"
     compile "com.github.JavaSaBr.jmonkeyengine:jme3-blender:$jmeVersion"
     compile "com.github.JavaSaBr.jmonkeyengine:jme3-jogg:$jmeVersion"
-    compile "com.github.JavaSaBr.jmonkeyengine:jme3-testdata:$jmeVersion"
+    compile ("com.github.JavaSaBr.jmonkeyengine:jme3-testdata:$jmeVersion") {
+        exclude group: 'lessvoid'
+    }
 
     // LWJGL
     compile "org.lwjgl:lwjgl:${lwjglVersion}"

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

@@ -161,6 +161,7 @@ protected AbstractFileEditor() {
      *
      * @param editor3DState the editor app state
      */
+    @FXThread
     protected void addEditorState(@NotNull final Editor3DState editor3DState) {
         this.editorStates.add(editor3DState);
     }
@@ -170,13 +171,15 @@ protected void addEditorState(@NotNull final Editor3DState editor3DState) {
      *
      * @param file the edit file.
      */
+    @FXThread
     protected void setEditFile(@NotNull final Path file) {
         this.file = file;
     }
 
     /**
      * Create content of this editor.
      */
+    @FXThread
     protected void createContent() {
 
         final VBox container = new VBox();
@@ -218,6 +221,7 @@ protected void createContent() {
     /**
      * Handle the mouse released event.
      */
+    @FXThread
     private void processMouseReleased(@NotNull final MouseEvent mouseEvent) {
         setButtonLeftDown(mouseEvent.isPrimaryButtonDown());
         setButtonMiddleDown(mouseEvent.isMiddleButtonDown());
@@ -227,6 +231,7 @@ private void processMouseReleased(@NotNull final MouseEvent mouseEvent) {
     /**
      * Handle the mouse pressed event.
      */
+    @FXThread
     private void processMousePressed(@NotNull final MouseEvent mouseEvent) {
         setButtonLeftDown(mouseEvent.isPrimaryButtonDown());
         setButtonMiddleDown(mouseEvent.isMiddleButtonDown());
@@ -317,8 +322,8 @@ protected Button createSaveAction() {
         return action;
     }
 
-    @FXThread
     @Override
+    @FXThread
     public void save() {
         if(isSaving()) return;
         notifyStartSaving();
@@ -391,19 +396,22 @@ protected boolean needToolbar() {
 
     @NotNull
     @Override
+    @FXThread
     public Pane getPage() {
         final R pane = notNull(root);
         return (Pane) pane.getParent().getParent();
     }
 
     @NotNull
     @Override
+    @FXThread
     public Path getEditFile() {
         return notNull(file);
     }
 
     @NotNull
     @Override
+    @FXThread
     public String getFileName() {
         final Path editFile = getEditFile();
         final Path fileName = editFile.getFileName();
@@ -428,11 +436,13 @@ public void openFile(@NotNull final Path file) {
 
     @NotNull
     @Override
+    @FXThread
     public BooleanProperty dirtyProperty() {
         return dirtyProperty;
     }
 
     @Override
+    @FXThread
     public boolean isDirty() {
         return dirtyProperty.get();
     }
@@ -442,22 +452,26 @@ public boolean isDirty() {
      *
      * @param dirty the dirty
      */
+    @FXThread
     protected void setDirty(final boolean dirty) {
         this.dirtyProperty.setValue(dirty);
     }
 
     @NotNull
     @Override
+    @FXThread
     public Array<Editor3DState> get3DStates() {
         return editorStates;
     }
 
     @Override
+    @FXThread
     public void notifyRenamed(@NotNull final Path prevFile, @NotNull final Path newFile) {
         notifyChangedEditedFile(prevFile, newFile);
     }
 
     @Override
+    @FXThread
     public void notifyMoved(@NotNull final Path prevFile, final @NotNull Path newFile) {
         notifyChangedEditedFile(prevFile, newFile);
     }
@@ -500,6 +514,7 @@ public void notifyChangedCamera(@NotNull final Vector3f cameraLocation, final fl
     }
 
     @Override
+    @FXThread
     public void notifyShowed() {
         this.showedTime = LocalTime.now();
 
@@ -508,6 +523,7 @@ public void notifyShowed() {
     }
 
     @Override
+    @FXThread
     public void notifyHided() {
 
         final Duration duration = Duration.between(showedTime, LocalTime.now());
@@ -520,6 +536,7 @@ public void notifyHided() {
     }
 
     @Override
+    @FXThread
     public void notifyClosed() {
         FX_EVENT_MANAGER.removeEventHandler(FileChangedEvent.EVENT_TYPE, getFileChangedHandler());
 
@@ -570,6 +587,7 @@ protected void handleExternalChanges() {
      * @return the file changes listener.
      */
     @NotNull
+    @FXThread
     private EventHandler<Event> getFileChangedHandler() {
         return fileChangedHandler;
     }
@@ -587,6 +605,7 @@ public String toString() {
      *
      * @param buttonLeftDown the left button is pressed.
      */
+    @FXThread
     protected void setButtonLeftDown(final boolean buttonLeftDown) {
         this.buttonLeftDown = buttonLeftDown;
     }
@@ -596,6 +615,7 @@ protected void setButtonLeftDown(final boolean buttonLeftDown) {
      *
      * @param buttonMiddleDown the middle button is pressed.
      */
+    @FXThread
     protected void setButtonMiddleDown(final boolean buttonMiddleDown) {
         this.buttonMiddleDown = buttonMiddleDown;
     }
@@ -605,6 +625,7 @@ protected void setButtonMiddleDown(final boolean buttonMiddleDown) {
      *
      * @param buttonRightDown the right button is pressed.
      */
+    @FXThread
     protected void setButtonRightDown(final boolean buttonRightDown) {
         this.buttonRightDown = buttonRightDown;
     }
@@ -614,6 +635,7 @@ protected void setButtonRightDown(final boolean buttonRightDown) {
      *
      * @return true if left button is pressed.
      */
+    @FXThread
     protected boolean isButtonLeftDown() {
         return buttonLeftDown;
     }
@@ -623,6 +645,7 @@ protected boolean isButtonLeftDown() {
      *
      * @return true if middle button is pressed.
      */
+    @FXThread
     protected boolean isButtonMiddleDown() {
         return buttonMiddleDown;
     }
@@ -632,6 +655,7 @@ protected boolean isButtonMiddleDown() {
      *
      * @return true if right button is pressed.
      */
+    @FXThread
     protected boolean isButtonRightDown() {
         return buttonRightDown;
     }
@@ -641,6 +665,7 @@ protected boolean isButtonRightDown() {
      *
      * @return the boolean
      */
+    @FXThread
     protected boolean isSaving() {
         return saving;
     }
@@ -650,13 +675,15 @@ protected boolean isSaving() {
      *
      * @param saving the saving
      */
+    @FXThread
     protected void setSaving(final boolean saving) {
         this.saving = saving;
     }
 
     /**
      * Notify start saving.
      */
+    @FXThread
     protected void notifyStartSaving() {
         final EditorFXScene scene = JFX_APPLICATION.getScene();
         scene.incrementLoading();
@@ -666,6 +693,7 @@ protected void notifyStartSaving() {
     /**
      * Notify finish saving.
      */
+    @FXThread
     protected void notifyFinishSaving() {
         setSaving(false);
         final EditorFXScene scene = JFX_APPLICATION.getScene();

src/main/java/com/ss/editor/ui/component/editor/impl/model/ModelFileEditor.java

@@ -95,7 +95,7 @@ private ModelFileEditor() {
 
     @NotNull
     @Override
-    protected ModelEditor3DState createEditorAppState() {
+    protected ModelEditor3DState createEditor3DState() {
         return new ModelEditor3DState(this);
     }