доработки по AssetTree

Author: JavaSaBr

src/com/ss/editor/state/editor/impl/post/filter/PostFilterEditorState.java

@@ -123,7 +123,7 @@ private void addFilterImpl(Material material) {
 
             filters.put(key, genericFilter);
 
-            if(isInitialized()) {
+            if (isInitialized()) {
                 postProcessor.addFilter(genericFilter);
             }
 
@@ -154,7 +154,7 @@ private void removeFilterImpl(Material material) {
                 return;
             }
 
-            if(isInitialized()) {
+            if (isInitialized()) {
                 postProcessor.removeFilter(genericFilter);
             }
 

src/com/ss/editor/ui/component/asset/AssetComponent.java

@@ -94,7 +94,7 @@ private void processRefresh() {
     private void createContent() {
 
         this.barComponent = new AssetBarComponent();
-        this.resourceTree = new ResourceTree();
+        this.resourceTree = new ResourceTree(false);
 
         FXUtils.addToPane(barComponent, this);
         FXUtils.addToPane(resourceTree, this);

src/com/ss/editor/ui/component/asset/tree/ResourceTree.java

@@ -17,6 +17,7 @@
 import com.ss.editor.util.EditorUtil;
 
 import java.nio.file.Path;
+import java.util.function.Consumer;
 
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
@@ -68,6 +69,12 @@ public class ResourceTree extends TreeView<ResourceElement> {
         return NAME_COMPARATOR.compare(firstElement, secondElement);
     };
 
+    private static final Consumer<ResourceElement> DEFAULT_FUNCTION = element -> {
+        final OpenFileAction action = new OpenFileAction(element);
+        final EventHandler<ActionEvent> onAction = action.getOnAction();
+        onAction.handle(null);
+    };
+
     /**
      * Развернутые элементы.
      */
@@ -78,7 +85,23 @@ public class ResourceTree extends TreeView<ResourceElement> {
      */
     private final Array<ResourceElement> selectedElements;
 
-    public ResourceTree() {
+    /**
+     * Функция окрытия файла.
+     */
+    private final Consumer<ResourceElement> openFunction;
+
+    /**
+     * Режим только чтения.
+     */
+    private final boolean readOnly;
+
+    public ResourceTree(final boolean readOnly) {
+        this(DEFAULT_FUNCTION, readOnly);
+    }
+
+    public ResourceTree(final Consumer<ResourceElement> openFunction, final boolean readOnly) {
+        this.openFunction = openFunction;
+        this.readOnly = readOnly;
         this.expandedElements = ArrayFactory.newConcurrentAtomicArray(ResourceElement.class);
         this.selectedElements = ArrayFactory.newConcurrentAtomicArray(ResourceElement.class);
 
@@ -89,11 +112,22 @@ public ResourceTree() {
         setShowRoot(true);
     }
 
+    /**
+     * @return режим только чтения.
+     */
+    private boolean isReadOnly() {
+        return readOnly;
+    }
+
     /**
      * Обновление контекстного меню под указанный элемент.
      */
     public void updateContextMenu(final ResourceElement element) {
 
+        if(isReadOnly()) {
+            return;
+        }
+
         final EditorConfig editorConfig = EditorConfig.getInstance();
         final Path currentAsset = editorConfig.getCurrentAsset();
 
@@ -395,6 +429,10 @@ public void notifyDeleted(final Path file) {
      */
     private void processKey(final KeyEvent event) {
 
+        if(isReadOnly()) {
+            return;
+        }
+
         final MultipleSelectionModel<TreeItem<ResourceElement>> selectionModel = getSelectionModel();
         final TreeItem<ResourceElement> selectedItem = selectionModel.getSelectedItem();
 
@@ -429,4 +467,11 @@ private void processKey(final KeyEvent event) {
             onAction.handle(null);
         }
     }
+
+    /**
+     * @return функция окрытия файла.
+     */
+    public Consumer<ResourceElement> getOpenFunction() {
+        return openFunction;
+    }
 }

src/com/ss/editor/ui/component/asset/tree/ResourceTreeCell.java

@@ -1,16 +1,14 @@
 package com.ss.editor.ui.component.asset.tree;
 
 import com.ss.editor.manager.FileIconManager;
-import com.ss.editor.ui.component.asset.tree.context.menu.action.OpenFileAction;
 import com.ss.editor.ui.component.asset.tree.resource.FolderElement;
 import com.ss.editor.ui.component.asset.tree.resource.ResourceElement;
 import com.ss.editor.ui.component.asset.tree.resource.ResourceLoadingElement;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.function.Consumer;
 
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
 import javafx.geometry.Side;
 import javafx.scene.Cursor;
 import javafx.scene.control.ContextMenu;
@@ -111,7 +109,7 @@ private void processClick(final MouseEvent event) {
 
         final ResourceElement item = getItem();
 
-        if (item == null || item instanceof FolderElement) {
+        if (item == null) {
             return;
         }
 
@@ -129,11 +127,9 @@ private void processClick(final MouseEvent event) {
 
             contextMenu.show(this, Side.BOTTOM, 0, 0);
 
-        } else if (event.getButton() == MouseButton.PRIMARY && event.getClickCount() > 1) {
-
-            final OpenFileAction action = new OpenFileAction(item);
-            final EventHandler<ActionEvent> onAction = action.getOnAction();
-            onAction.handle(null);
+        } else if (!(item instanceof FolderElement) && event.getButton() == MouseButton.PRIMARY && event.getClickCount() > 1) {
+            final Consumer<ResourceElement> openFunction = treeView.getOpenFunction();
+            openFunction.accept(item);
         }
     }
 

src/com/ss/editor/ui/component/asset/tree/context/menu/action/PasteFileAction.java

@@ -61,10 +61,13 @@ private void processPaste() {
         }
 
         final Path currentFile = element.getFile();
-        final Path file = files.get(0).toPath();
-
         final boolean isCut = "cut".equals(clipboard.getContent(EditorUtil.JAVA_PARAM));
 
+        files.forEach(file -> pasteFile(clipboard, currentFile, file.toPath(), isCut));
+    }
+
+    private void pasteFile(Clipboard clipboard, Path currentFile, Path file, boolean isCut) {
+
         if (Files.isDirectory(currentFile)) {
 
             final String fileName = FileUtils.getFirstFreeName(currentFile, file);

src/com/ss/editor/ui/component/editor/area/EditorAreaComponent.java

@@ -63,13 +63,13 @@ public EditorAreaComponent() {
      */
     private void processChangeTabs(final ListChangeListener.Change<? extends Tab> change) {
 
-        if(!change.next()) {
+        if (!change.next()) {
             return;
         }
 
         final List<? extends Tab> removed = change.getRemoved();
 
-        if(removed == null || removed.isEmpty()) {
+        if (removed == null || removed.isEmpty()) {
             return;
         }
 

src/com/ss/editor/ui/component/editor/impl/post/filter/PostFilterEditor.java

@@ -202,7 +202,7 @@ private void processChangedFile(final FileChangedEvent event) {
         final Path file = event.getFile();
         final String fileName = file.getFileName().toString();
 
-        if(!fileName.endsWith(FileExtensions.JME_MATERIAL)) {
+        if (!fileName.endsWith(FileExtensions.JME_MATERIAL)) {
             return;
         }
 
@@ -211,7 +211,7 @@ private void processChangedFile(final FileChangedEvent event) {
         final PostFilterViewFile currentFile = getCurrentFile();
         final List<String> materials = currentFile.getMaterials();
 
-        if(!materials.contains(assetFile.toString())) {
+        if (!materials.contains(assetFile.toString())) {
             return;
         }
 

src/com/ss/editor/ui/dialog/asset/AssetEditorDialog.java

@@ -51,8 +51,15 @@ public AssetEditorDialog(final Consumer<Path> consumer) {
     protected void createContent(final VBox root) {
 
         final EditorConfig editorConfig = EditorConfig.getInstance();
+        final Consumer<ResourceElement> openFunction = element -> {
 
-        resourceTree = new ResourceTree();
+            hide();
+
+            final Consumer<Path> consumer = getConsumer();
+            consumer.accept(element.getFile());
+        };
+
+        resourceTree = new ResourceTree(openFunction, true);
         resourceTree.fill(editorConfig.getCurrentAsset());
         resourceTree.prefHeightProperty().bind(root.heightProperty());