implemented actions to copy/paste nodes in model editor.

JavaSaBr · JavaSaBr · commit 8711d652c97c · 2018-01-02T11:49:26.000+03:00
diff --git a/src/main/java/com/ss/editor/Messages.java b/src/main/java/com/ss/editor/Messages.java
@@ -240,10 +240,12 @@ public class Messages {
     public static final String MODEL_NODE_TREE_ACTION_ANIMATION_PLAY_SETTINGS;
     public static final String MODEL_NODE_TREE_ACTION_ANIMATION_STOP;
     public static final String MODEL_NODE_TREE_ACTION_ANIMATION_PAUSE;
-    public static final String MODEL_NODE_TREE_ACTION_ANIMATION_MANUAL_EXTRAXT_SUB_ANIMATION;
+    public static final String MODEL_NODE_TREE_ACTION_ANIMATION_MANUAL_EXTRACT_SUB_ANIMATION;
     public static final String MODEL_NODE_TREE_ACTION_CREATE_AUDIO_NODE;
     public static final String MODEL_NODE_TREE_ACTION_AUDIO_PLAY;
     public static final String MODEL_NODE_TREE_ACTION_AUDIO_STOP;
+    public static final String MODEL_NODE_TREE_ACTION_COPY;
+    public static final String MODEL_NODE_TREE_ACTION_PASTE;
     public static final String MODEL_NODE_TREE_ACTION_CREATE_TONEG0D_PARTICLE_EMITTER;
     public static final String MODEL_NODE_TREE_ACTION_CREATE_SOFT_TONEG0D_PARTICLE_EMITTER;
     public static final String MODEL_NODE_TREE_ACTION_CREATE_DEFAULT_PARTICLE_EMITTER;
@@ -918,10 +920,12 @@ public class Messages {
         MODEL_NODE_TREE_ACTION_ANIMATION_PLAY_SETTINGS = bundle.getString("ModelNodeTreeActionAnimationPlaySettings");
         MODEL_NODE_TREE_ACTION_ANIMATION_STOP = bundle.getString("ModelNodeTreeActionAnimationStop");
         MODEL_NODE_TREE_ACTION_ANIMATION_PAUSE = bundle.getString("ModelNodeTreeActionAnimationPause");
-        MODEL_NODE_TREE_ACTION_ANIMATION_MANUAL_EXTRAXT_SUB_ANIMATION = bundle.getString("ModelNodeTreeActionAnimationManualExtractSubAnimation");
+        MODEL_NODE_TREE_ACTION_ANIMATION_MANUAL_EXTRACT_SUB_ANIMATION = bundle.getString("ModelNodeTreeActionAnimationManualExtractSubAnimation");
         MODEL_NODE_TREE_ACTION_CREATE_AUDIO_NODE = bundle.getString("ModelNodeTreeActionCreateAudioNode");
         MODEL_NODE_TREE_ACTION_AUDIO_PLAY = bundle.getString("ModelNodeTreeActionAudioPlay");
         MODEL_NODE_TREE_ACTION_AUDIO_STOP = bundle.getString("ModelNodeTreeActionAudioStop");
+        MODEL_NODE_TREE_ACTION_COPY = bundle.getString("ModelNodeTreeActionCopy");
+        MODEL_NODE_TREE_ACTION_PASTE = bundle.getString("ModelNodeTreeActionPaste");
         MODEL_NODE_TREE_ACTION_CREATE_TONEG0D_PARTICLE_EMITTER = bundle.getString("ModelNodeTreeActionCreateToneg0dParticleEmitter");
         MODEL_NODE_TREE_ACTION_CREATE_SOFT_TONEG0D_PARTICLE_EMITTER = bundle.getString("ModelNodeTreeActionCreateSoftToneg0dParticleEmitter");
         MODEL_NODE_TREE_ACTION_CREATE_DEFAULT_PARTICLE_EMITTER = bundle.getString("ModelNodeTreeActionCreateDefaultParticleEmitter");
diff --git a/src/main/java/com/ss/editor/ui/control/layer/node/SceneLayerTreeNode.java b/src/main/java/com/ss/editor/ui/control/layer/node/SceneLayerTreeNode.java
@@ -88,8 +88,8 @@ public boolean hasChildren(@NotNull final NodeTree<?> nodeTree) {
 
     @Override
     @FXThread
-    public boolean canAccept(@NotNull final TreeNode<?> child, final boolean isCopy) {
-        final Object element = child.getElement();
+    public boolean canAccept(@NotNull final TreeNode<?> treeNode, final boolean isCopy) {
+        final Object element = treeNode.getElement();
         return element instanceof Spatial && SceneLayer.getLayer((Spatial) element) != getElement();
     }
 
diff --git a/src/main/java/com/ss/editor/ui/control/model/node/spatial/GeometryTreeNode.java b/src/main/java/com/ss/editor/ui/control/model/node/spatial/GeometryTreeNode.java
@@ -78,9 +78,9 @@ public void add(@NotNull final TreeNode<?> child) {
     }
 
     @Override
-    public boolean canAccept(@NotNull final TreeNode<?> child, final boolean isCopy) {
-        final Object element = child.getElement();
-        return (element instanceof Material && isCopy) || super.canAccept(child, isCopy);
+    public boolean canAccept(@NotNull final TreeNode<?> treeNode, final boolean isCopy) {
+        final Object element = treeNode.getElement();
+        return (element instanceof Material && isCopy) || super.canAccept(treeNode, isCopy);
     }
 
     @Override
diff --git a/src/main/java/com/ss/editor/ui/control/model/node/spatial/NodeTreeNode.java b/src/main/java/com/ss/editor/ui/control/model/node/spatial/NodeTreeNode.java
@@ -146,16 +146,16 @@ public boolean hasChildren(@NotNull final NodeTree<?> nodeTree) {
     }
 
     @Override
-    public boolean canAccept(@NotNull final TreeNode<?> child, final boolean isCopy) {
-        if (child == this) return false;
+    public boolean canAccept(@NotNull final TreeNode<?> treeNode, final boolean isCopy) {
+        if (treeNode == this) return false;
 
-        final Object element = child.getElement();
+        final Object element = treeNode.getElement();
 
         if (element instanceof Spatial) {
             return GeomUtils.canAttach(getElement(), (Spatial) element, isCopy);
         }
 
-        return super.canAccept(child, isCopy);
+        return super.canAccept(treeNode, isCopy);
     }
 
     @Override
diff --git a/src/main/java/com/ss/editor/ui/control/model/node/spatial/SpatialTreeNode.java b/src/main/java/com/ss/editor/ui/control/model/node/spatial/SpatialTreeNode.java
@@ -101,9 +101,9 @@ public boolean canCopy() {
 
     @Override
     @FXThread
-    public boolean canAccept(@NotNull final TreeNode<?> child, final boolean isCopy) {
-        final Object element = child.getElement();
-        return element instanceof AbstractControl || super.canAccept(child, isCopy);
+    public boolean canAccept(@NotNull final TreeNode<?> treeNode, final boolean isCopy) {
+        final Object element = treeNode.getElement();
+        return element instanceof AbstractControl || super.canAccept(treeNode, isCopy);
     }
 
     @Override
diff --git a/src/main/java/com/ss/editor/ui/control/model/node/spatial/scene/SceneNodeTreeNode.java b/src/main/java/com/ss/editor/ui/control/model/node/spatial/scene/SceneNodeTreeNode.java
@@ -55,7 +55,7 @@ public boolean canMove() {
     }
 
     @Override
-    public boolean canAccept(@NotNull final TreeNode<?> child, final boolean isCopy) {
+    public boolean canAccept(@NotNull final TreeNode<?> treeNode, final boolean isCopy) {
         return false;
     }
 
diff --git a/src/main/java/com/ss/editor/ui/control/model/tree/action/CopyNodeAction.java b/src/main/java/com/ss/editor/ui/control/model/tree/action/CopyNodeAction.java
@@ -0,0 +1,53 @@
+package com.ss.editor.ui.control.model.tree.action;
+
+import static com.ss.editor.ui.control.tree.NodeTreeCell.DATA_FORMAT;
+import com.ss.editor.Messages;
+import com.ss.editor.annotation.FXThread;
+import com.ss.editor.model.undo.editor.ModelChangeConsumer;
+import com.ss.editor.ui.Icons;
+import com.ss.editor.ui.control.tree.NodeTree;
+import com.ss.editor.ui.control.tree.action.AbstractNodeAction;
+import com.ss.editor.ui.control.tree.node.TreeNode;
+import javafx.scene.image.Image;
+import javafx.scene.input.Clipboard;
+import javafx.scene.input.ClipboardContent;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * The action to copy a node in model.
+ *
+ * @author JavaSaBr
+ */
+public class CopyNodeAction extends AbstractNodeAction<ModelChangeConsumer> {
+
+    public CopyNodeAction(@NotNull final NodeTree<?> nodeTree, @NotNull final TreeNode<?> node) {
+        super(nodeTree, node);
+    }
+
+    @Override
+    @FXThread
+    protected @NotNull String getName() {
+        return Messages.MODEL_NODE_TREE_ACTION_COPY;
+    }
+
+    @Override
+    @FXThread
+    protected @Nullable Image getIcon() {
+        return Icons.COPY_16;
+    }
+
+    @Override
+    @FXThread
+    protected void process() {
+        super.process();
+
+        final TreeNode<?> node = getNode();
+
+        final ClipboardContent content = new ClipboardContent();
+        content.put(DATA_FORMAT, node.getObjectId());
+
+        final Clipboard clipboard = Clipboard.getSystemClipboard();
+        clipboard.setContent(content);
+    }
+}
diff --git a/src/main/java/com/ss/editor/ui/control/model/tree/action/PasteNodeAction.java b/src/main/java/com/ss/editor/ui/control/model/tree/action/PasteNodeAction.java
@@ -0,0 +1,56 @@
+package com.ss.editor.ui.control.model.tree.action;
+
+import static com.ss.rlib.util.ObjectUtils.notNull;
+import com.ss.editor.Messages;
+import com.ss.editor.annotation.FXThread;
+import com.ss.editor.model.undo.editor.ModelChangeConsumer;
+import com.ss.editor.ui.Icons;
+import com.ss.editor.ui.control.tree.NodeTree;
+import com.ss.editor.ui.control.tree.action.AbstractNodeAction;
+import com.ss.editor.ui.control.tree.node.TreeNode;
+import javafx.scene.image.Image;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * The action to paste a node in model.
+ *
+ * @author JavaSaBr
+ */
+public class PasteNodeAction extends AbstractNodeAction<ModelChangeConsumer> {
+
+    /**
+     * The copied node.
+     */
+    @NotNull
+    private final TreeNode<?> copiedNode;
+
+    public PasteNodeAction(@NotNull final NodeTree<?> nodeTree, @NotNull final TreeNode<?> node,
+                           @NotNull final TreeNode<?> copiedNode) {
+        super(nodeTree, node);
+        this.copiedNode = copiedNode;
+    }
+
+    @Override
+    @FXThread
+    protected @NotNull String getName() {
+        return Messages.MODEL_NODE_TREE_ACTION_PASTE;
+    }
+
+    @Override
+    @FXThread
+    protected @Nullable Image getIcon() {
+        return Icons.PASTE_16;
+    }
+
+    @Override
+    @FXThread
+    protected void process() {
+        super.process();
+
+        final ModelChangeConsumer changeConsumer = notNull(getNodeTree().getChangeConsumer());
+
+        final TreeNode<?> node = getNode();
+        node.accept(changeConsumer, copiedNode.getElement(), true);
+    }
+}
diff --git a/src/main/java/com/ss/editor/ui/control/model/tree/action/animation/ManualExtractSubAnimationAction.java b/src/main/java/com/ss/editor/ui/control/model/tree/action/animation/ManualExtractSubAnimationAction.java
@@ -27,7 +27,7 @@ public ManualExtractSubAnimationAction(@NotNull final NodeTree<?> nodeTree, @Not
     @Override
     @FXThread
     protected @NotNull String getName() {
-        return Messages.MODEL_NODE_TREE_ACTION_ANIMATION_MANUAL_EXTRAXT_SUB_ANIMATION;
+        return Messages.MODEL_NODE_TREE_ACTION_ANIMATION_MANUAL_EXTRACT_SUB_ANIMATION;
     }
 
     @Override
diff --git a/src/main/java/com/ss/editor/ui/control/tree/NodeTreeCell.java b/src/main/java/com/ss/editor/ui/control/tree/NodeTreeCell.java
@@ -39,6 +39,9 @@
  */
 public class NodeTreeCell<C extends ChangeConsumer, M extends NodeTree<C>> extends TextFieldTreeCell<TreeNode<?>> {
 
+    @NotNull
+    public static final DataFormat DATA_FORMAT = new DataFormat(NodeTreeCell.class.getName());
+
     @NotNull
     private static final PseudoClass DROP_AVAILABLE_PSEUDO_CLASS = PseudoClass.getPseudoClass("drop-available");
 
@@ -51,9 +54,6 @@ public class NodeTreeCell<C extends ChangeConsumer, M extends NodeTree<C>> exten
     @NotNull
     private static final ExecutorManager EXECUTOR_MANAGER = ExecutorManager.getInstance();
 
-    @NotNull
-    private static final DataFormat DATA_FORMAT = new DataFormat(NodeTreeCell.class.getName());
-
     @NotNull
     private final StringConverter<TreeNode<?>> stringConverter = new StringConverter<TreeNode<?>>() {
 
diff --git a/src/main/java/com/ss/editor/ui/control/tree/node/TreeNode.java b/src/main/java/com/ss/editor/ui/control/tree/node/TreeNode.java
@@ -1,17 +1,23 @@
 package com.ss.editor.ui.control.tree.node;
 
+import static com.ss.editor.ui.control.tree.NodeTreeCell.DATA_FORMAT;
 import com.ss.editor.Editor;
 import com.ss.editor.annotation.FXThread;
 import com.ss.editor.annotation.FromAnyThread;
 import com.ss.editor.model.UObject;
 import com.ss.editor.model.undo.editor.ChangeConsumer;
+import com.ss.editor.ui.control.model.tree.action.CopyNodeAction;
+import com.ss.editor.ui.control.model.tree.action.PasteNodeAction;
 import com.ss.editor.ui.control.model.tree.action.RenameNodeAction;
 import com.ss.editor.ui.control.tree.NodeTree;
+import com.ss.editor.ui.util.UIUtils;
 import com.ss.rlib.util.array.Array;
 import com.ss.rlib.util.array.ArrayFactory;
 import javafx.collections.ObservableList;
 import javafx.scene.control.MenuItem;
+import javafx.scene.control.TreeItem;
 import javafx.scene.image.Image;
+import javafx.scene.input.Clipboard;
 import javafx.scene.input.Dragboard;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -172,6 +178,16 @@ protected void setParent(@Nullable final TreeNode<?> parent) {
     @FXThread
     public void fillContextMenu(@NotNull final NodeTree<?> nodeTree, @NotNull final ObservableList<MenuItem> items) {
         if (canEditName()) items.add(new RenameNodeAction(nodeTree, this));
+        if (canCopy()) items.add(new CopyNodeAction(nodeTree, this));
+
+        final Clipboard clipboard = Clipboard.getSystemClipboard();
+        final Long objectId = (Long) clipboard.getContent(DATA_FORMAT);
+        final TreeItem<?> treeItem = objectId == null ? null : UIUtils.findItem(nodeTree.getTreeView(), objectId);
+        final TreeNode<?> treeNode = treeItem == null ? null : (TreeNode<?>) treeItem.getValue();
+
+        if (treeNode != null && canAccept(treeNode, true)) {
+            items.add(new PasteNodeAction(nodeTree, this, treeNode));
+        }
     }
 
     /**
@@ -203,14 +219,14 @@ public void changeName(@NotNull final NodeTree<?> nodeTree, @NotNull final Strin
     }
 
     /**
-     * Can accept boolean.
+     * Check of possibility to accept the tree node as a new child.
      *
-     * @param child  the child
-     * @param isCopy true if need to copy the object.
-     * @return true of this node can accept the child.
+     * @param treeNode the node.
+     * @param isCopy   true if need to copy the node.
+     * @return true if this node can be accept.
      */
     @FXThread
-    public boolean canAccept(@NotNull final TreeNode<?> child, final boolean isCopy) {
+    public boolean canAccept(@NotNull final TreeNode<?> treeNode, final boolean isCopy) {
         return false;
     }
 
diff --git a/src/main/resources/messages/messages.properties b/src/main/resources/messages/messages.properties
@@ -222,6 +222,8 @@ ModelNodeTreeActionAnimationManualExtractSubAnimation=Extract sub-animation manu
 ModelNodeTreeActionCreateAudioNode=Audio node
 ModelNodeTreeActionAudioPlay=Play
 ModelNodeTreeActionAudioStop=Stop
+ModelNodeTreeActionCopy=Copy
+ModelNodeTreeActionPaste=Paste
 ModelNodeTreeActionCreateToneg0dParticleEmitter=Toneg0d particles emitter
 ModelNodeTreeActionCreateSoftToneg0dParticleEmitter=Toneg0d soft particle emitter
 ModelNodeTreeActionCreateDefaultParticleEmitter=Default particle emitter
diff --git a/src/main/resources/messages/messages_de.properties b/src/main/resources/messages/messages_de.properties
@@ -222,6 +222,8 @@ ModelNodeTreeActionAnimationManualExtractSubAnimation=Manuelles Entnehmen der An
 ModelNodeTreeActionCreateAudioNode=Audio-Node
 ModelNodeTreeActionAudioPlay=Abspielen
 ModelNodeTreeActionAudioStop=Stoppen
+ModelNodeTreeActionCopy=Copy
+ModelNodeTreeActionPaste=Paste
 ModelNodeTreeActionCreateToneg0dParticleEmitter=Toneg0d Partikelemitter
 ModelNodeTreeActionCreateSoftToneg0dParticleEmitter=Toneg0d Weichpartikelemitter
 ModelNodeTreeActionCreateDefaultParticleEmitter=Standard Partikel-Emitter
diff --git a/src/main/resources/messages/messages_ru.properties b/src/main/resources/messages/messages_ru.properties
@@ -224,6 +224,8 @@ ModelNodeTreeActionAnimationManualExtractSubAnimation=Извлечь вручн
 ModelNodeTreeActionCreateAudioNode=Аудио узел
 ModelNodeTreeActionAudioPlay=Проиграть
 ModelNodeTreeActionAudioStop=Остановить
+ModelNodeTreeActionCopy=Скопировать
+ModelNodeTreeActionPaste=Вставить
 ModelNodeTreeActionCreateToneg0dParticleEmitter=Toneg0d источник частиц
 ModelNodeTreeActionCreateSoftToneg0dParticleEmitter=Toneg0d источник мягких частиц
 ModelNodeTreeActionCreateDefaultParticleEmitter=Стандартный источник частиц
diff --git a/src/main/resources/messages/messages_zh_CN.properties b/src/main/resources/messages/messages_zh_CN.properties
@@ -224,6 +224,8 @@ ModelNodeTreeActionAnimationManualExtractSubAnimation=\u624b\u52a8\u89e3\u538b\u
 ModelNodeTreeActionCreateAudioNode=AudioNode
 ModelNodeTreeActionAudioPlay=\u64ad\u653e
 ModelNodeTreeActionAudioStop=\u505c\u6b62
+ModelNodeTreeActionCopy=Copy
+ModelNodeTreeActionPaste=Paste
 ModelNodeTreeActionCreateToneg0dParticleEmitter=Toneg0d\u7c92\u5b50\u53d1\u751f\u5668
 ModelNodeTreeActionCreateSoftToneg0dParticleEmitter=Toneg0d\u8f6f\u7c92\u5b50\u53d1\u751f\u5668
 ModelNodeTreeActionCreateDefaultParticleEmitter=\u9ed8\u8ba4\u7c92\u5b50\u53d1\u751f\u5668

Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,8 @@ public boolean hasChildren(@NotNull final NodeTree<?> nodeTree) {`
`88`	`88`
`89`	`89`	`@Override`
`90`	`90`	`@FXThread`
`91`		`- public boolean canAccept(@NotNull final TreeNode<?> child, final boolean isCopy) {`
`92`		`- final Object element = child.getElement();`
	`91`	`+ public boolean canAccept(@NotNull final TreeNode<?> treeNode, final boolean isCopy) {`
	`92`	`+ final Object element = treeNode.getElement();`
`93`	`93`	`return element instanceof Spatial && SceneLayer.getLayer((Spatial) element) != getElement();`
`94`	`94`	`}`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -78,9 +78,9 @@ public void add(@NotNull final TreeNode<?> child) {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`@Override`
`81`		`- public boolean canAccept(@NotNull final TreeNode<?> child, final boolean isCopy) {`
`82`		`- final Object element = child.getElement();`
`83`		`- return (element instanceof Material && isCopy) \|\| super.canAccept(child, isCopy);`
	`81`	`+ public boolean canAccept(@NotNull final TreeNode<?> treeNode, final boolean isCopy) {`
	`82`	`+ final Object element = treeNode.getElement();`
	`83`	`+ return (element instanceof Material && isCopy) \|\| super.canAccept(treeNode, isCopy);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -146,16 +146,16 @@ public boolean hasChildren(@NotNull final NodeTree<?> nodeTree) {`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`@Override`
`149`		`- public boolean canAccept(@NotNull final TreeNode<?> child, final boolean isCopy) {`
`150`		`- if (child == this) return false;`
	`149`	`+ public boolean canAccept(@NotNull final TreeNode<?> treeNode, final boolean isCopy) {`
	`150`	`+ if (treeNode == this) return false;`
`151`	`151`
`152`		`- final Object element = child.getElement();`
	`152`	`+ final Object element = treeNode.getElement();`
`153`	`153`
`154`	`154`	`if (element instanceof Spatial) {`
`155`	`155`	`return GeomUtils.canAttach(getElement(), (Spatial) element, isCopy);`
`156`	`156`	`}`
`157`	`157`
`158`		`- return super.canAccept(child, isCopy);`
	`158`	`+ return super.canAccept(treeNode, isCopy);`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public boolean canMove() {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@Override`
`58`		`- public boolean canAccept(@NotNull final TreeNode<?> child, final boolean isCopy) {`
	`58`	`+ public boolean canAccept(@NotNull final TreeNode<?> treeNode, final boolean isCopy) {`
`59`	`59`	`return false;`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public ManualExtractSubAnimationAction(@NotNull final NodeTree<?> nodeTree, @Not`
`27`	`27`	`@Override`
`28`	`28`	`@FXThread`
`29`	`29`	`protected @NotNull String getName() {`
`30`		`- return Messages.MODEL_NODE_TREE_ACTION_ANIMATION_MANUAL_EXTRAXT_SUB_ANIMATION;`
	`30`	`+ return Messages.MODEL_NODE_TREE_ACTION_ANIMATION_MANUAL_EXTRACT_SUB_ANIMATION;`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`@Override`