fixed some problems with access to files.

Author: JavaSaBr

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

@@ -1,24 +1,17 @@
 package com.ss.editor;
 
-import static java.nio.file.Files.newInputStream;
-
 import com.jme3.asset.AssetInfo;
 import com.jme3.asset.AssetKey;
 import com.jme3.asset.AssetLocator;
 import com.jme3.asset.AssetManager;
-import com.jme3.asset.StreamAssetInfo;
-import com.jme3.asset.plugins.UrlAssetInfo;
 import com.ss.editor.config.EditorConfig;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
-import java.net.URL;
+import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-
-import org.jetbrains.annotations.NotNull;
-import com.ss.rlib.util.FileUtils;
-import com.ss.rlib.util.array.Array;
-import com.ss.rlib.util.array.ArrayFactory;
+import java.nio.file.StandardOpenOption;
 
 /**
  * The implementation of {@link AssetLocator} to load data from an asset folder.
@@ -27,15 +20,9 @@
  */
 public class FolderAssetLocator implements AssetLocator {
 
-    @NotNull
-    private static final Array<String> URL_EXTENSIONS = ArrayFactory.newArray(String.class);
-
-    static {
-        URL_EXTENSIONS.add(FileExtensions.MODEL_SCENE);
-    }
-
     @Override
     public void setRootPath(@NotNull final String rootPath) {
+        System.out.println(rootPath);
     }
 
     @Override
@@ -49,21 +36,27 @@ public AssetInfo locate(final AssetManager manager, final AssetKey key) {
         final Path resolve = currentAsset.resolve(name);
         if (!Files.exists(resolve)) return null;
 
-        final String extension = FileUtils.getExtension(resolve);
+        return new PathAssetInfo(manager, key, resolve);
+    }
+
+    private class PathAssetInfo extends AssetInfo {
 
-        if (URL_EXTENSIONS.contains(extension)) {
+        @NotNull
+        private final Path path;
+
+        private PathAssetInfo(@NotNull final AssetManager manager, @NotNull final AssetKey key,
+                              @NotNull final Path path) {
+            super(manager, key);
+            this.path = path;
+        }
+
+        @Override
+        public @NotNull InputStream openStream() {
             try {
-                final URL url = resolve.toUri().toURL();
-                return UrlAssetInfo.create(manager, key, url);
+                return Files.newInputStream(path, StandardOpenOption.READ);
             } catch (final IOException e) {
                 throw new RuntimeException(e);
             }
         }
-
-        try {
-            return new StreamAssetInfo(manager, key, newInputStream(resolve));
-        } catch (final IOException e) {
-            throw new RuntimeException(e);
-        }
     }
 }

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

@@ -183,6 +183,11 @@ public class Messages {
      * The constant ASSET_EDITOR_DIALOG_TITLE.
      */
     public static final String ASSET_EDITOR_DIALOG_TITLE;
+    /**
+     * The constant ASSET_EDITOR_DIALOG_WARNING_SELECT_FILE.
+     */
+    public static final String ASSET_EDITOR_DIALOG_WARNING_SELECT_FILE;
+
     /**
      * The constant SAVE_AS_EDITOR_DIALOG_TITLE.
      */
@@ -2425,6 +2430,7 @@ public class Messages {
         MATERIAL_FILE_EDITOR_ACTION_LIGHT = bundle.getString("MaterialFileEditorActionLight");
 
         ASSET_EDITOR_DIALOG_TITLE = bundle.getString("AssetEditorDialogTitle");
+        ASSET_EDITOR_DIALOG_WARNING_SELECT_FILE = bundle.getString("AssetEditorDialogWarningSelectFile");
         SAVE_AS_EDITOR_DIALOG_TITLE = bundle.getString("SaveAsEditorDialogTitle");
         SAVE_AS_EDITOR_DIALOG_FIELD_FILENAME = bundle.getString("SaveAsEditorDialogFieldFilename");
 

src/main/java/com/ss/editor/ui/control/choose/ChooseTextureControl.java

@@ -115,8 +115,7 @@ public void setChangeHandler(@Nullable final Runnable changeHandler) {
     /**
      * tThe handler.
      */
-    @Nullable
-    private Runnable getChangeHandler() {
+    private @Nullable Runnable getChangeHandler() {
         return changeHandler;
     }
 
@@ -168,8 +167,7 @@ protected void createComponents() {
      *
      * @return the label for the path to a texture.
      */
-    @NotNull
-    protected Label getTextureLabel() {
+    protected @NotNull Label getTextureLabel() {
         return notNull(textureLabel);
     }
 
@@ -178,16 +176,14 @@ protected Label getTextureLabel() {
      *
      * @return the wrapper.
      */
-    @NotNull
-    protected HBox getWrapper() {
+    protected @NotNull HBox getWrapper() {
         return notNull(wrapper);
     }
 
     /**
      * @return The image channels preview.
      */
-    @NotNull
-    private ImageChannelPreview getTextureTooltip() {
+    private @NotNull ImageChannelPreview getTextureTooltip() {
         return notNull(textureTooltip);
     }
 
@@ -203,8 +199,7 @@ private void processAdd() {
      *
      * @return the selected file.
      */
-    @Nullable
-    public Path getTextureFile() {
+    public @Nullable Path getTextureFile() {
         return textureFile;
     }
 
@@ -232,8 +227,7 @@ private void processRemove() {
     /**
      * @return the image preview.
      */
-    @NotNull
-    private ImageView getTexturePreview() {
+    private @NotNull ImageView getTexturePreview() {
         return notNull(texturePreview);
     }
 

src/main/java/com/ss/editor/ui/dialog/asset/FileAssetEditorDialog.java

@@ -1,16 +1,16 @@
 package com.ss.editor.ui.dialog.asset;
 
+import com.ss.editor.Messages;
+import com.ss.editor.ui.component.asset.tree.resource.FolderResourceElement;
 import com.ss.editor.ui.component.asset.tree.resource.ResourceElement;
-
+import javafx.scene.control.Label;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.nio.file.Path;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import javafx.scene.control.Label;
-
 /**
  * The implementation of the {@link AssetEditorDialog} for choosing the {@link Path} from asset.
  *
@@ -56,6 +56,10 @@ 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) {
+            message = Messages.ASSET_EDITOR_DIALOG_WARNING_SELECT_FILE;
+        }
+
         if (message != null) {
             warningLabel.setText(message);
         }

src/main/resources/messages/messages.properties

@@ -48,6 +48,7 @@ TextFileEditorName=Text editor
 MaterialFileEditorName=Material Editor
 
 AssetEditorDialogTitle=Choose resource
+AssetEditorDialogWarningSelectFile=Need to select a file instead of a folder.
 
 SaveAsEditorDialogTitle=Save as file
 SaveAsEditorDialogFieldFilename=File name

src/main/resources/messages/messages_de.properties

@@ -48,6 +48,7 @@ TextFileEditorName=Texteditor
 MaterialFileEditorName=Materialeditor
 
 AssetEditorDialogTitle=Ressource wählen
+AssetEditorDialogWarningSelectFile=Need to select a file instead of a folder.
 
 SaveAsEditorDialogTitle=Save as file
 SaveAsEditorDialogFieldFilename=File name

src/main/resources/messages/messages_ru.properties

@@ -49,6 +49,7 @@ TextFileEditorName=Текстовый редактор
 MaterialFileEditorName=Редактор материалов
 
 AssetEditorDialogTitle=Выбор ресурса
+AssetEditorDialogWarningSelectFile=Нужно выбрать файл а не папку.
 
 SaveAsEditorDialogTitle=Сохранить как файл
 SaveAsEditorDialogFieldFilename=Имя файла