улучшено лагирование и добавлена чистка воркспейса от открытыз файлов…

… в случае краша рендера
JavaSaBr · Jun 18, 2016 · 4b6c902 · 4b6c902
1 parent 3f5a3a1
commit 4b6c902
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/src/com/ss/editor/Editor.java b/src/com/ss/editor/Editor.java
@@ -18,6 +18,7 @@
 import com.jme3.post.filters.FXAAFilter;
 import com.jme3.post.filters.ToneMapFilter;
 import com.jme3.renderer.Camera;
+import com.jme3.renderer.RendererException;
 import com.jme3.scene.Node;
 import com.jme3.system.AppSettings;
 import com.jme3x.jfx.JmeFxContainer;
@@ -356,6 +357,12 @@ public void update() {
             final WorkspaceManager workspaceManager = WorkspaceManager.getInstance();
             workspaceManager.save();
             System.exit(1);
+        } catch (final RendererException e) {
+            LOGGER.warning(e);
+            final WorkspaceManager workspaceManager = WorkspaceManager.getInstance();
+            workspaceManager.clear();
+            workspaceManager.save();
+            System.exit(1);
         } finally {
             syncUnlock(stamp);
         }

diff --git a/src/com/ss/editor/manager/WorkspaceManager.java b/src/com/ss/editor/manager/WorkspaceManager.java
@@ -91,6 +91,14 @@ public synchronized Workspace getWorkspace(final Path assetFolder) {
         return workspace;
     }
 
+    /**
+     * Очистить воркспейсы.
+     */
+    public synchronized void clear() {
+        final ObjectDictionary<Path, Workspace> workspaces = getWorkspaces();
+        workspaces.forEach(Workspace::save);
+    }
+
     /**
      * Сохранить воркспейсы.
      */

diff --git a/src/com/ss/editor/model/workspace/Workspace.java b/src/com/ss/editor/model/workspace/Workspace.java
@@ -194,14 +194,18 @@ private void incrementChanges() {
         changes.incrementAndGet();
     }
 
+    /**
+     * Очистка воркспейса.
+     */
+    public void clear() {
+        getOpenedFiles().clear();
+    }
+
     /**
      * Сохранение состояния в файл.
      */
     public void save() {
-
-        if (changes.get() == 0) {
-            return;
-        }
+        if (changes.get() == 0) return;
 
         final Path assetFolder = getAssetFolder();
         final Path workspaceFile = assetFolder.resolve(WorkspaceManager.FOLDER_EDITOR).resolve(WorkspaceManager.FILE_WORKSPACE);

diff --git a/src/com/ss/editor/ui/component/editor/impl/material/MaterialFileEditor.java b/src/com/ss/editor/ui/component/editor/impl/material/MaterialFileEditor.java
@@ -500,7 +500,6 @@ protected void createToolbar(final HBox container) {
      * Обработка смны Bucket типа.
      */
     private void changeBucketType(final RenderQueue.Bucket newValue) {
-
         final MaterialEditorState editorState = getEditorState();
         editorState.changeBucketType(newValue);
     }
@@ -509,11 +508,7 @@ private void changeBucketType(final RenderQueue.Bucket newValue) {
      * Обработка смены типа материала.
      */
     private void changeType(final String newType) {
-
-        if (isIgnoreListeners()) {
-            return;
-        }
-
+        if (isIgnoreListeners()) return;
         processChangeTypeImpl(newType);
     }
 
@@ -570,10 +565,7 @@ private ToggleButton getSphereButton() {
      * Обработка смены режима модели.
      */
     private void changeModelType(final ToggleButton button, final Boolean newValue) {
-
-        if (newValue == Boolean.FALSE) {
-            return;
-        }
+        if (newValue == Boolean.FALSE) return;
 
         final MaterialEditorState editorState = getEditorState();