重命名集合节点

DeedyDesigner/Deedy.Activity/Contract/Interface/ICombinedElement.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Deedy.Activity
+{
+    public interface ICombinedElement : IDeedyElement
+    {
+        public DeedyElementCollection Elements { get; set; }
+    }
+}

DeedyDesigner/Deedy.Activity/Contract/Interface/IContainerElement.cs

@@ -1,14 +1,15 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace Deedy.Activity
 {
-    public interface IContainerElement : IDeedyElement
+    public interface IContainerElement : ICombinedElement
     {
-        public DeedyElementCollection Elements { get; set; }
+        public void Append(IDeedyElement deedyElement);
+        public void Remove(IDeedyElement deedyElement);
+        public void SwapIndex(IDeedyElement element1, IDeedyElement element2);
     }
 }

DeedyDesigner/Deedy.Activity/Contract/Interface/IVariableContainer.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Deedy.Activity
-{
-    public interface IVariableContainer : IContainerElement
-    {
-        public void Append(IDeedyElement deedyElement);
-        public void Remove(IDeedyElement deedyElement);
-        public void SwapIndex(IDeedyElement element1, IDeedyElement element2);
-    }
-}

DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/CombinedDiagram.cs

@@ -6,8 +6,8 @@ using System.Threading.Tasks;
 
 namespace Deedy.Activity
 {
-    public abstract class CombineDiagram : FlowAction
+    public abstract class CombinedDiagram : FlowAction
     {
-        public CombineDiagram() { }
+        public CombinedDiagram() { }
     }
 }

DeedyDesigner/Deedy.Activity/DeedyAction/FuncAction/CombinedFunction.cs

@@ -6,8 +6,8 @@ using System.Threading.Tasks;
 
 namespace Deedy.Activity
 {
-    public abstract class CombineFunction : FuncAction
+    public abstract class CombinedFunction : FuncAction
     {
-        public CombineFunction() { }
+        public CombinedFunction() { }
     }
 }

DeedyDesigner/Deedy.Activity/DeedyVisual/IDeedyLayout.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace Deedy.Activity
 {
-    public interface IDeedyLayout : IVariableContainer
+    public interface IDeedyLayout : IContainerElement
     {
     }
 }