some fixes

JavaSaBr · JavaSaBr · commit a0fd282b7dc6 · 2017-08-30T15:17:48.000+03:00
diff --git a/src/main/java/com/ss/editor/model/EditorCamera.java b/src/main/java/com/ss/editor/model/EditorCamera.java
@@ -451,7 +451,7 @@ protected void verticalRotateCamera(final float value) {
      *
      * @param tpf the tpf
      */
-    protected void updateCamera(float tpf) {
+    public void updateCamera(float tpf) {
         if (!enabled) return;
 
         targetLocation.set(target.getWorldTranslation()).addLocal(lookAtOffset);
@@ -688,7 +688,6 @@ public void setSpatial(Spatial spatial) {
      * update the camera control, should only be used internally
      */
     public void update(float tpf) {
-        updateCamera(tpf);
     }
 
     /**
diff --git a/src/main/java/com/ss/editor/plugin/api/property/control/AssetResourcePropertyEditorControl.java b/src/main/java/com/ss/editor/plugin/api/property/control/AssetResourcePropertyEditorControl.java
@@ -52,7 +52,7 @@ protected Array<String> getExtensions() {
     @Override
     protected void processSelect() {
         super.processSelect();
-        UIUtils.openAssetDialog(this::processSelect, getExtensions(), getActionTester());
+        UIUtils.openFileAssetDialog(this::processSelect, getExtensions(), getActionTester());
     }
 
     /**
diff --git a/src/main/java/com/ss/editor/state/editor/impl/AdvancedAbstractEditor3DState.java b/src/main/java/com/ss/editor/state/editor/impl/AdvancedAbstractEditor3DState.java
@@ -1096,7 +1096,7 @@ protected void cameraUpdate(final float tpf) {
             return;
         }
 
-        editorCamera.update(tpf);
+        editorCamera.updateCamera(tpf);
 
         final boolean[] cameraKeysState = getCameraKeysState();
 
diff --git a/src/main/java/com/ss/editor/ui/control/choose/ChooseFolderControl.java b/src/main/java/com/ss/editor/ui/control/choose/ChooseFolderControl.java
@@ -8,9 +8,8 @@
 import com.ss.editor.ui.component.asset.tree.context.menu.action.NewFileAction;
 import com.ss.editor.ui.component.asset.tree.context.menu.action.RenameFileAction;
 import com.ss.editor.ui.css.CSSClasses;
-import com.ss.editor.ui.dialog.asset.AssetEditorDialog;
-import com.ss.editor.ui.dialog.asset.FolderAssetEditorDialog;
 import com.ss.editor.ui.util.DynamicIconSupport;
+import com.ss.editor.ui.util.UIUtils;
 import com.ss.rlib.ui.util.FXUtils;
 import com.ss.rlib.util.StringUtils;
 import javafx.scene.control.Button;
@@ -119,9 +118,7 @@ private Label getFolderLabel() {
      * Add a folder.
      */
     private void processAdd() {
-        final AssetEditorDialog<Path> dialog = new FolderAssetEditorDialog(this::setFolder);
-        dialog.setActionTester(ACTION_TESTER);
-        dialog.show(this);
+        UIUtils.openFolderAssetDialog(this::setFolder, ACTION_TESTER);
     }
 
     /**
diff --git a/src/main/java/com/ss/editor/ui/control/choose/ChooseTextureControl.java b/src/main/java/com/ss/editor/ui/control/choose/ChooseTextureControl.java
@@ -191,7 +191,7 @@ protected void createComponents() {
      * Add new texture.
      */
     private void processAdd() {
-        UIUtils.openAssetDialog(this::setTextureFile, TEXTURE_EXTENSIONS, ACTION_TESTER);
+        UIUtils.openFileAssetDialog(this::setTextureFile, TEXTURE_EXTENSIONS, ACTION_TESTER);
     }
 
     /**
diff --git a/src/main/java/com/ss/editor/ui/control/model/tree/action/LinkModelAction.java b/src/main/java/com/ss/editor/ui/control/model/tree/action/LinkModelAction.java
@@ -77,7 +77,7 @@ protected String getName() {
     @Override
     protected void process() {
         super.process();
-        UIUtils.openAssetDialog(this::processOpen, MODEL_EXTENSIONS, ACTION_TESTER);
+        UIUtils.openFileAssetDialog(this::processOpen, MODEL_EXTENSIONS, ACTION_TESTER);
     }
 
     /**
diff --git a/src/main/java/com/ss/editor/ui/control/model/tree/action/LoadModelAction.java b/src/main/java/com/ss/editor/ui/control/model/tree/action/LoadModelAction.java
@@ -74,7 +74,7 @@ protected String getName() {
     @Override
     protected void process() {
         super.process();
-        UIUtils.openAssetDialog(this::processOpen, MODEL_EXTENSIONS, ACTION_TESTER);
+        UIUtils.openFileAssetDialog(this::processOpen, MODEL_EXTENSIONS, ACTION_TESTER);
     }
 
     /**
diff --git a/src/main/java/com/ss/editor/ui/control/model/tree/action/particle/emitter/toneg0d/mesh/LoadModelParticlesMeshAction.java b/src/main/java/com/ss/editor/ui/control/model/tree/action/particle/emitter/toneg0d/mesh/LoadModelParticlesMeshAction.java
@@ -76,7 +76,7 @@ protected String getName() {
     @FXThread
     @Override
     protected void process() {
-        UIUtils.openAssetDialog(this::processOpen, MODEL_EXTENSIONS, ACTION_TESTER);
+        UIUtils.openFileAssetDialog(this::processOpen, MODEL_EXTENSIONS, ACTION_TESTER);
     }
 
     /**
diff --git a/src/main/java/com/ss/editor/ui/control/model/tree/action/particle/emitter/toneg0d/shape/LoadModelShapeEmitterAction.java b/src/main/java/com/ss/editor/ui/control/model/tree/action/particle/emitter/toneg0d/shape/LoadModelShapeEmitterAction.java
@@ -72,7 +72,7 @@ protected String getName() {
     @FXThread
     @Override
     protected void process() {
-        UIUtils.openAssetDialog(this::processOpen, MODEL_EXTENSIONS, ACTION_TESTER);
+        UIUtils.openFileAssetDialog(this::processOpen, MODEL_EXTENSIONS, ACTION_TESTER);
     }
 
     /**
diff --git a/src/main/java/com/ss/editor/ui/control/property/impl/AudioKeyPropertyControl.java b/src/main/java/com/ss/editor/ui/control/property/impl/AudioKeyPropertyControl.java
@@ -109,7 +109,7 @@ protected void createComponents(@NotNull final HBox container) {
      * Show dialog for choosing another audio key.
      */
     protected void processChange() {
-        UIUtils.openAssetDialog(this::addAudioData, AUDIO_EXTENSIONS, DEFAULT_ACTION_TESTER);
+        UIUtils.openFileAssetDialog(this::addAudioData, AUDIO_EXTENSIONS, DEFAULT_ACTION_TESTER);
     }
 
     private void addAudioData(@NotNull final Path file) {
diff --git a/src/main/java/com/ss/editor/ui/control/property/impl/MaterialKeyPropertyControl.java b/src/main/java/com/ss/editor/ui/control/property/impl/MaterialKeyPropertyControl.java
@@ -30,7 +30,7 @@ public MaterialKeyPropertyControl(@Nullable final MaterialKey element, @NotNull
 
     @Override
     protected void processChange() {
-        UIUtils.openAssetDialog(this::addMaterial, MATERIAL_EXTENSIONS, DEFAULT_ACTION_TESTER);
+        UIUtils.openFileAssetDialog(this::addMaterial, MATERIAL_EXTENSIONS, DEFAULT_ACTION_TESTER);
     }
 
     @Override
diff --git a/src/main/java/com/ss/editor/ui/control/property/impl/Texture2DPropertyControl.java b/src/main/java/com/ss/editor/ui/control/property/impl/Texture2DPropertyControl.java
@@ -187,7 +187,7 @@ protected void processRemove() {
      * Process to add a new texture.
      */
     protected void processAdd() {
-        UIUtils.openAssetDialog(this::setTexture, TEXTURE_EXTENSIONS, DEFAULT_ACTION_TESTER);
+        UIUtils.openFileAssetDialog(this::setTexture, TEXTURE_EXTENSIONS, DEFAULT_ACTION_TESTER);
     }
 
     /**
diff --git a/src/main/java/com/ss/editor/ui/dialog/asset/FileAssetEditorDialog.java b/src/main/java/com/ss/editor/ui/dialog/asset/FileAssetEditorDialog.java
@@ -18,21 +18,10 @@
  */
 public class FileAssetEditorDialog extends AssetEditorDialog<Path> {
 
-    /**
-     * Instantiates a new File asset editor dialog.
-     *
-     * @param consumer the consumer
-     */
     public FileAssetEditorDialog(@NotNull final Consumer<Path> consumer) {
         super(consumer);
     }
 
-    /**
-     * Instantiates a new File asset editor dialog.
-     *
-     * @param consumer  the consumer
-     * @param validator the validator
-     */
     public FileAssetEditorDialog(@NotNull final Consumer<Path> consumer, @Nullable final Function<Path, String> validator) {
         super(consumer, validator);
     }
@@ -56,7 +45,7 @@ protected void validate(@NotNull final Label warningLabel, @Nullable final Resou
         final Function<Path, String> validator = getValidator();
         String message = validator == null ? null : validator.apply(element.getFile());
 
-        if (message == null && element instanceof FolderResourceElement) {
+        if (message == null && element instanceof FolderResourceElement ) {
             message = Messages.ASSET_EDITOR_DIALOG_WARNING_SELECT_FILE;
         }
 
diff --git a/src/main/java/com/ss/editor/ui/dialog/asset/FolderAssetEditorDialog.java b/src/main/java/com/ss/editor/ui/dialog/asset/FolderAssetEditorDialog.java
@@ -14,27 +14,42 @@
  *
  * @author JavaSaBr
  */
-public class FolderAssetEditorDialog extends FileAssetEditorDialog {
+public class FolderAssetEditorDialog extends AssetEditorDialog<Path> {
 
-    /**
-     * Instantiates a new Folder asset editor dialog.
-     *
-     * @param consumer the consumer
-     */
     public FolderAssetEditorDialog(@NotNull final Consumer<Path> consumer) {
         super(consumer);
         setOnlyFolders(true);
     }
 
-    /**
-     * Instantiates a new Folder asset editor dialog.
-     *
-     * @param consumer  the consumer
-     * @param validator the validator
-     */
     public FolderAssetEditorDialog(@NotNull final Consumer<Path> consumer,
                                    @Nullable final Function<Path, String> validator) {
         super(consumer, validator);
         setOnlyFolders(true);
     }
+
+    @Override
+    protected void processOpen(@NotNull final ResourceElement element) {
+        super.processOpen(element);
+        final Consumer<Path> consumer = getConsumer();
+        consumer.accept(element.getFile());
+    }
+
+    @Override
+    protected void validate(@NotNull final Label warningLabel, @Nullable final ResourceElement element) {
+        super.validate(warningLabel, element);
+
+        if (element == null) {
+            LOGGER.warning(this, "The element is null.");
+            return;
+        }
+
+        final Function<Path, String> validator = getValidator();
+        String message = validator == null ? null : validator.apply(element.getFile());
+
+        if (message != null) {
+            warningLabel.setText(message);
+        }
+
+        warningLabel.setVisible(message != null);
+    }
 }
diff --git a/src/main/java/com/ss/editor/ui/util/UIUtils.java b/src/main/java/com/ss/editor/ui/util/UIUtils.java
@@ -9,6 +9,7 @@
 import com.ss.editor.ui.component.ScreenComponent;
 import com.ss.editor.ui.dialog.asset.AssetEditorDialog;
 import com.ss.editor.ui.dialog.asset.FileAssetEditorDialog;
+import com.ss.editor.ui.dialog.asset.FolderAssetEditorDialog;
 import com.ss.editor.ui.dialog.save.SaveAsEditorDialog;
 import com.ss.rlib.util.ClassUtils;
 import com.ss.rlib.util.FileUtils;
@@ -535,15 +536,31 @@ public static void updateEditedCell(final Labeled cell) {
      * @param actionTester the action tester.
      */
     @FXThread
-    public static void openAssetDialog(@NotNull final Consumer<Path> handler, @NotNull final Array<String> extensions,
-                                       @Nullable final Predicate<Class<?>> actionTester) {
+    public static void openFileAssetDialog(@NotNull final Consumer<Path> handler,
+                                           @NotNull final Array<String> extensions,
+                                           @Nullable final Predicate<Class<?>> actionTester) {
 
         final AssetEditorDialog<Path> dialog = new FileAssetEditorDialog(handler);
         dialog.setExtensionFilter(extensions);
         dialog.setActionTester(actionTester);
         dialog.show();
     }
 
+    /**
+     * Open an asset dialog.
+     *
+     * @param handler      the result handler.
+     * @param actionTester the action tester.
+     */
+    @FXThread
+    public static void openFolderAssetDialog(@NotNull final Consumer<Path> handler,
+                                             @Nullable final Predicate<Class<?>> actionTester) {
+
+        final AssetEditorDialog<Path> dialog = new FolderAssetEditorDialog(handler);
+        dialog.setActionTester(actionTester);
+        dialog.show();
+    }
+
     /**
      * Open a save as dialog.
      *

Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,7 @@ protected void verticalRotateCamera(final float value) {`
`451`	`451`	`*`
`452`	`452`	`* @param tpf the tpf`
`453`	`453`	`*/`
`454`		`- protected void updateCamera(float tpf) {`
	`454`	`+ public void updateCamera(float tpf) {`
`455`	`455`	`if (!enabled) return;`
`456`	`456`
`457`	`457`	`targetLocation.set(target.getWorldTranslation()).addLocal(lookAtOffset);`
`@@ -688,7 +688,6 @@ public void setSpatial(Spatial spatial) {`
`688`	`688`	`* update the camera control, should only be used internally`
`689`	`689`	`*/`
`690`	`690`	`public void update(float tpf) {`
`691`		`- updateCamera(tpf);`
`692`	`691`	`}`
`693`	`692`
`694`	`693`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ protected Array<String> getExtensions() {`
`52`	`52`	`@Override`
`53`	`53`	`protected void processSelect() {`
`54`	`54`	`super.processSelect();`
`55`		`- UIUtils.openAssetDialog(this::processSelect, getExtensions(), getActionTester());`
	`55`	`+ UIUtils.openFileAssetDialog(this::processSelect, getExtensions(), getActionTester());`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1096,7 +1096,7 @@ protected void cameraUpdate(final float tpf) {`
`1096`	`1096`	`return;`
`1097`	`1097`	`}`
`1098`	`1098`
`1099`		`- editorCamera.update(tpf);`
	`1099`	`+ editorCamera.updateCamera(tpf);`
`1100`	`1100`
`1101`	`1101`	`final boolean[] cameraKeysState = getCameraKeysState();`
`1102`	`1102`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ protected void createComponents() {`
`191`	`191`	`* Add new texture.`
`192`	`192`	`*/`
`193`	`193`	`private void processAdd() {`
`194`		`- UIUtils.openAssetDialog(this::setTextureFile, TEXTURE_EXTENSIONS, ACTION_TESTER);`
	`194`	`+ UIUtils.openFileAssetDialog(this::setTextureFile, TEXTURE_EXTENSIONS, ACTION_TESTER);`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ protected String getName() {`
`77`	`77`	`@Override`
`78`	`78`	`protected void process() {`
`79`	`79`	`super.process();`
`80`		`- UIUtils.openAssetDialog(this::processOpen, MODEL_EXTENSIONS, ACTION_TESTER);`
	`80`	`+ UIUtils.openFileAssetDialog(this::processOpen, MODEL_EXTENSIONS, ACTION_TESTER);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ protected String getName() {`
`74`	`74`	`@Override`
`75`	`75`	`protected void process() {`
`76`	`76`	`super.process();`
`77`		`- UIUtils.openAssetDialog(this::processOpen, MODEL_EXTENSIONS, ACTION_TESTER);`
	`77`	`+ UIUtils.openFileAssetDialog(this::processOpen, MODEL_EXTENSIONS, ACTION_TESTER);`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ protected String getName() {`
`76`	`76`	`@FXThread`
`77`	`77`	`@Override`
`78`	`78`	`protected void process() {`
`79`		`- UIUtils.openAssetDialog(this::processOpen, MODEL_EXTENSIONS, ACTION_TESTER);`
	`79`	`+ UIUtils.openFileAssetDialog(this::processOpen, MODEL_EXTENSIONS, ACTION_TESTER);`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ protected String getName() {`
`72`	`72`	`@FXThread`
`73`	`73`	`@Override`
`74`	`74`	`protected void process() {`
`75`		`- UIUtils.openAssetDialog(this::processOpen, MODEL_EXTENSIONS, ACTION_TESTER);`
	`75`	`+ UIUtils.openFileAssetDialog(this::processOpen, MODEL_EXTENSIONS, ACTION_TESTER);`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ protected void createComponents(@NotNull final HBox container) {`
`109`	`109`	`* Show dialog for choosing another audio key.`
`110`	`110`	`*/`
`111`	`111`	`protected void processChange() {`
`112`		`- UIUtils.openAssetDialog(this::addAudioData, AUDIO_EXTENSIONS, DEFAULT_ACTION_TESTER);`
	`112`	`+ UIUtils.openFileAssetDialog(this::addAudioData, AUDIO_EXTENSIONS, DEFAULT_ACTION_TESTER);`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`private void addAudioData(@NotNull final Path file) {`