updated extension lib, small improvements.

Author: JavaSaBr

build.gradle

@@ -94,7 +94,7 @@ dependencies {
     compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3'
 
     // extensions
-    compile ('com.github.JavaSaBr:jme3-spaceshift-extension:1.3.0') {
+    compile ('com.github.JavaSaBr:jme3-spaceshift-extension:1.4.2') {
         exclude group: 'org.jmonkeyengine'
     }
     compile ('com.github.JavaSaBr:tonegodemitter:2.2.4') {

src/main/java/com/jme3/water/WaterFilter.java

@@ -105,7 +105,7 @@ public static void main(final String[] args) throws IOException {
         // JavaFX
         System.setProperty("prism.lcdtext", "false");
         System.setProperty("prism.text", "t2k");
-        System.setProperty("javafx.animation.fullspeed", "true");
+        System.setProperty("javafx.animation.fullspeed", "false");
 
         final EditorConfig editorConfig = EditorConfig.getInstance();
         final OpenGLVersion openGLVersion = editorConfig.getOpenGLVersion();

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

@@ -29,6 +29,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.prefs.BackingStoreException;
 import java.util.prefs.Preferences;
@@ -863,6 +864,10 @@ private void init() {
             this.currentAsset = get(currentAssetURI, uri -> Paths.get(new URI(uri)));
         }
 
+        if (currentAsset != null && !Files.exists(currentAsset)) {
+            this.currentAsset = null;
+        }
+
         final String classpathURI = prefs.get(PREF_OTHER_ADDITIONAL_CLASSPATH, null);
 
         if (classpathURI != null) {
@@ -895,7 +900,19 @@ private void init() {
 
         final List<String> lastOpenedAssets = getLastOpenedAssets();
         try {
+
             lastOpenedAssets.addAll(EditorUtil.deserialize(byteArray));
+
+            for (Iterator<String> iterator = lastOpenedAssets.iterator(); iterator.hasNext(); ) {
+
+                final String assetUrl = iterator.next();
+                final Path assetPath = get(assetUrl, uri -> Paths.get(new URI(uri)));
+
+                if (!Files.exists(assetPath)) {
+                    iterator.remove();
+                }
+            }
+
         } catch (final RuntimeException e) {
             LOGGER.warning(e);
         }

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

@@ -99,13 +99,17 @@ public class FileIconManager {
         EXTENSION_TO_CONTENT_TYPE.put(FileExtensions.MODEL_XBUF, "image-svg+xml-compressed");
     }
 
+    @NotNull
     private static final Array<Path> MIME_TYPES_FOLDERS = ArrayFactory.newArray(Path.class);
 
     static {
         MIME_TYPES_FOLDERS.add(Paths.get("/ui/icons/filetypes/emerald/mimetypes"));
         MIME_TYPES_FOLDERS.add(Paths.get("/ui/icons/filetypes/"));
     }
 
+    private static boolean supportedRepaint = true;
+
+
     @Nullable
     private static FileIconManager instance;
 
@@ -299,24 +303,35 @@ private Image buildImage(@NotNull final String url, final int size) {
         final EditorConfig config = EditorConfig.getInstance();
         final CssColorTheme theme = config.getTheme();
 
-        if (!theme.isDark()) {
+        if (theme.needRepaintIcons() && supportedRepaint) {
+            try {
+
+                final Color iconColor = theme.getIconColor();
+
+                final int width = (int) image.getWidth();
+                final int height = (int) image.getHeight();
+
+                final WritableImage wimage = new WritableImage(width, height);
 
-            final WritableImage wimage = new WritableImage(size, size);
-            final PixelWriter pixelWriter = wimage.getPixelWriter();
-            final PixelReader pixelReader = image.getPixelReader();
+                final PixelWriter pixelWriter = wimage.getPixelWriter();
+                final PixelReader pixelReader = image.getPixelReader();
 
-            for (int i = 0; i < size; i++) {
-                for (int j = 0; j < size; j++) {
-                    final Color color = pixelReader.getColor(i, j);
-                    if (color.getOpacity() > 0.1) {
-                        pixelWriter.setColor(i, j, color.invert());
+                for (int i = 0; i < width; i++) {
+                    for (int j = 0; j < height; j++) {
+                        final Color color = pixelReader.getColor(i, j);
+                        if (color.getOpacity() > 0.1) {
+                            pixelWriter.setColor(i, j, new Color(iconColor.getRed(), iconColor.getGreen(), iconColor.getBlue(), color.getOpacity()));
+                        }
                     }
                 }
-            }
 
-            originalImageCache.put(wimage, image);
+                originalImageCache.put(wimage, image);
+
+                return wimage;
 
-            return wimage;
+            } catch (final Throwable e) {
+                supportedRepaint = false;
+            }
         }
 
         originalImageCache.put(image, image);
@@ -332,11 +347,6 @@ private Image buildImage(@NotNull final String url, final int size) {
      */
     @NotNull
     public Image getOriginal(@NotNull final Image image) {
-
-        if (!(image instanceof WritableImage)) {
-            throw new IllegalArgumentException("The image " + image.impl_getUrl() + " wasn't edited");
-        }
-
         return notNull(originalImageCache.get(image), "not found original for " + image.impl_getUrl());
     }
 

src/main/java/com/ss/editor/manager/FileIconManager.java

@@ -44,23 +44,23 @@ public interface SceneChangeConsumer extends ModelChangeConsumer {
      * @param sceneFilter the scene filter
      */
     @FXThread
-    void notifyAddedFilter(@NotNull SceneFilter<?> sceneFilter);
+    void notifyAddedFilter(@NotNull SceneFilter sceneFilter);
 
     /**
      * Notify about removed a filter.
      *
      * @param sceneFilter the scene filter
      */
     @FXThread
-    void notifyRemovedFilter(@NotNull SceneFilter<?> sceneFilter);
+    void notifyRemovedFilter(@NotNull SceneFilter sceneFilter);
 
     /**
      * Notify about changed a filter.
      *
      * @param sceneFilter the scene filter
      */
     @FXThread
-    void notifyChangedFilter(@NotNull SceneFilter<?> sceneFilter);
+    void notifyChangedFilter(@NotNull SceneFilter sceneFilter);
 
     @NotNull
     @Override

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

@@ -145,11 +145,11 @@ private void removeAppStateImpl(@NotNull final SceneAppState appState) {
      * @param sceneFilter the scene filter.
      */
     @FromAnyThread
-    public void addFilter(@NotNull final SceneFilter<?> sceneFilter) {
+    public void addFilter(@NotNull final SceneFilter sceneFilter) {
         EXECUTOR_MANAGER.addJMETask(() -> addFilterImpl(sceneFilter));
     }
 
-    private void addFilterImpl(@NotNull final SceneFilter<?> sceneFilter) {
+    private void addFilterImpl(@NotNull final SceneFilter sceneFilter) {
         final FilterPostProcessor postProcessor = EDITOR.getPostProcessor();
         postProcessor.addFilter(sceneFilter.get());
     }
@@ -160,11 +160,11 @@ private void addFilterImpl(@NotNull final SceneFilter<?> sceneFilter) {
      * @param sceneFilter the scene filter.
      */
     @FromAnyThread
-    public void removeFilter(@NotNull final SceneFilter<?> sceneFilter) {
+    public void removeFilter(@NotNull final SceneFilter sceneFilter) {
         EXECUTOR_MANAGER.addJMETask(() -> removeFilterImpl(sceneFilter));
     }
 
-    private void removeFilterImpl(@NotNull final SceneFilter<?> sceneFilter) {
+    private void removeFilterImpl(@NotNull final SceneFilter sceneFilter) {
         final FilterPostProcessor postProcessor = EDITOR.getPostProcessor();
         postProcessor.removeFilter(sceneFilter.get());
     }

src/main/java/com/ss/editor/state/editor/impl/scene/SceneEditor3DState.java

@@ -413,7 +413,7 @@ private void selectAppStateFromList(@Nullable final EditableSceneAppState appSta
      * Handle the selected filter from the list.
      */
     @FXThread
-    private void selectFilterFromList(@Nullable final EditableSceneFilter<?> sceneFilter) {
+    private void selectFilterFromList(@Nullable final EditableSceneFilter sceneFilter) {
         if (!isNeedSyncSelection()) return;
 
         setNeedSyncSelection(false);
@@ -531,10 +531,12 @@ protected void handleAddedObject(@NotNull final Spatial model) {
         final SceneNode sceneNode = (SceneNode) model;
         final SceneEditor3DState editor3DState = getEditor3DState();
 
-        sceneNode.getFilters().forEach(ScenePresentable.class::isInstance,
-                filter -> editor3DState.addPresentable((ScenePresentable) filter));
-        sceneNode.getAppStates().forEach(ScenePresentable.class::isInstance,
-                state -> editor3DState.addPresentable((ScenePresentable) state));
+        sceneNode.getFilters().stream()
+                .filter(ScenePresentable.class::isInstance)
+                .forEach(filter -> editor3DState.addPresentable((ScenePresentable) filter));
+        sceneNode.getAppStates().stream()
+                .filter(ScenePresentable.class::isInstance)
+                .forEach(state -> editor3DState.addPresentable((ScenePresentable) state));
     }
 
     @Override
@@ -548,10 +550,12 @@ protected void handleRemovedObject(@NotNull final Spatial model) {
         final SceneNode sceneNode = (SceneNode) model;
         final SceneEditor3DState editor3DState = getEditor3DState();
 
-        sceneNode.getFilters().forEach(ScenePresentable.class::isInstance,
-                filter -> editor3DState.removePresentable((ScenePresentable) filter));
-        sceneNode.getAppStates().forEach(ScenePresentable.class::isInstance,
-                state -> editor3DState.removePresentable((ScenePresentable) state));
+        sceneNode.getFilters().stream()
+                .filter(ScenePresentable.class::isInstance)
+                .forEach(filter -> editor3DState.removePresentable((ScenePresentable) filter));
+        sceneNode.getAppStates().stream()
+                .filter(ScenePresentable.class::isInstance)
+                .forEach(state -> editor3DState.removePresentable((ScenePresentable) state));
     }
 
     @Override
@@ -651,7 +655,7 @@ public void notifyChangedAppState(@NotNull final SceneAppState appState) {
     }
 
     @Override
-    public void notifyAddedFilter(@NotNull final SceneFilter<?> sceneFilter) {
+    public void notifyAddedFilter(@NotNull final SceneFilter sceneFilter) {
 
         final SceneEditor3DState editor3DState = getEditor3DState();
         editor3DState.addFilter(sceneFilter);
@@ -664,7 +668,7 @@ public void notifyAddedFilter(@NotNull final SceneFilter<?> sceneFilter) {
     }
 
     @Override
-    public void notifyRemovedFilter(@NotNull final SceneFilter<?> sceneFilter) {
+    public void notifyRemovedFilter(@NotNull final SceneFilter sceneFilter) {
 
         final SceneEditor3DState editor3DState = getEditor3DState();
         editor3DState.removeFilter(sceneFilter);
@@ -677,7 +681,7 @@ public void notifyRemovedFilter(@NotNull final SceneFilter<?> sceneFilter) {
     }
 
     @Override
-    public void notifyChangedFilter(@NotNull final SceneFilter<?> sceneFilter) {
+    public void notifyChangedFilter(@NotNull final SceneFilter sceneFilter) {
         getFilterList().fill(getCurrentModel());
     }
 

src/main/java/com/ss/editor/ui/component/editor/impl/scene/SceneFileEditor.java

@@ -29,6 +29,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.awt.*;
+import java.util.List;
 
 /**
  * The dialog to create a scene app state.
@@ -167,8 +168,8 @@ protected void processOk() {
 
         final CheckBox customCheckBox = getCustomCheckBox();
         final SceneNode currentModel = changeConsumer.getCurrentModel();
-        final Array<SceneAppState> appStates = currentModel.getAppStates();
-        final Array<SceneFilter<?>> filters = currentModel.getFilters();
+        final List<SceneAppState> appStates = currentModel.getAppStates();
+        final List<SceneFilter> filters = currentModel.getFilters();
 
         if (customCheckBox.isSelected()) {
 
@@ -200,7 +201,7 @@ protected void processOk() {
         super.processOk();
     }
 
-    private void check(@NotNull final Array<SceneAppState> appStates, @NotNull final Array<SceneFilter<?>> filters,
+    private void check(@NotNull final List<SceneAppState> appStates, @NotNull final List<SceneFilter> filters,
                        @NotNull final SceneAppState newExample) {
 
         if (!(newExample instanceof EditableSceneAppState)) return;

src/main/java/com/ss/editor/ui/control/app/state/dialog/CreateSceneAppStateDialog.java

@@ -14,7 +14,6 @@
 import com.ss.editor.ui.scene.EditorFXScene;
 import com.ss.editor.ui.util.DynamicIconSupport;
 import com.ss.rlib.ui.util.FXUtils;
-import com.ss.rlib.util.array.Array;
 import javafx.collections.ObservableList;
 import javafx.scene.control.Button;
 import javafx.scene.control.ListView;
@@ -25,6 +24,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
 import java.util.function.Consumer;
 
 /**
@@ -122,7 +122,7 @@ public void fill(@NotNull final SceneNode sceneNode) {
         final ObservableList<EditableSceneAppState> items = listView.getItems();
         items.clear();
 
-        final Array<SceneAppState> appStates = sceneNode.getAppStates();
+        final List<SceneAppState> appStates = sceneNode.getAppStates();
         appStates.stream().filter(EditableSceneAppState.class::isInstance)
                 .map(EditableSceneAppState.class::cast)
                 .forEach(items::add);