moved rename action.

Author: JavaSaBr

src/main/java/com/ss/editor/ui/control/model/node/spatial/SpatialTreeNode.java

@@ -26,7 +26,6 @@
 import com.ss.editor.ui.control.model.tree.ModelNodeTree;
 import com.ss.editor.ui.control.model.tree.action.AddUserDataAction;
 import com.ss.editor.ui.control.model.tree.action.RemoveNodeAction;
-import com.ss.editor.ui.control.model.tree.action.RenameNodeAction;
 import com.ss.editor.ui.control.model.tree.action.control.CreateCustomControlAction;
 import com.ss.editor.ui.control.model.tree.action.control.CreateMotionControlAction;
 import com.ss.editor.ui.control.model.tree.action.control.physics.CreateCharacterControlAction;
@@ -75,7 +74,6 @@ public void fillContextMenu(@NotNull final NodeTree<?> nodeTree,
             if (toolMenu != null) items.add(toolMenu);
         }
 
-        if (canEditName()) items.add(new RenameNodeAction(nodeTree, this));
         if (canRemove()) items.add(new RemoveNodeAction(nodeTree, this));
 
         if (linkNode == null) {
@@ -100,14 +98,8 @@ public boolean canCopy() {
     @Override
     @FXThread
     public boolean canAccept(@NotNull final TreeNode<?> child, final boolean isCopy) {
-
         final Object element = child.getElement();
-
-        if (element instanceof AbstractControl) {
-            return true;
-        }
-
-        return super.canAccept(child, isCopy);
+        return element instanceof AbstractControl || super.canAccept(child, isCopy);
     }
 
     @Override
@@ -227,9 +219,9 @@ public void changeName(@NotNull final NodeTree<?> nodeTree, @NotNull final Strin
         consumer.execute(new RenameNodeOperation(spatial.getName(), newName, spatial));
     }
 
-    @NotNull
     @Override
-    public Array<TreeNode<?>> getChildren(@NotNull final NodeTree<?> nodeTree) {
+    @FXThread
+    public @NotNull Array<TreeNode<?>> getChildren(@NotNull final NodeTree<?> nodeTree) {
 
         final Array<TreeNode<?>> result = ArrayFactory.newArray(TreeNode.class);
         final Spatial element = getElement();

src/main/java/com/ss/editor/ui/control/tree/node/TreeNode.java

@@ -5,6 +5,7 @@
 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.RenameNodeAction;
 import com.ss.editor.ui.control.tree.NodeTree;
 import com.ss.rlib.util.array.Array;
 import com.ss.rlib.util.array.ArrayFactory;
@@ -170,6 +171,7 @@ 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));
     }
 
     /**