From 763479985b3100b113105282eefd99b8ce895f63 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Wed, 24 Feb 2016 23:18:54 -0800 Subject: [PATCH] Renamed MultiBlockStatementObject to simply 'MultiStatementObject' --- OSCADSharp/OSCADSharp/Booleans/Difference.cs | 2 +- OSCADSharp/OSCADSharp/Booleans/Intersection.cs | 2 +- OSCADSharp/OSCADSharp/Booleans/Union.cs | 2 +- OSCADSharp/OSCADSharp/OSCADSharp.csproj | 2 +- ...MultiBlockStatementObject.cs => MultiStatementObject.cs} | 6 +++--- OSCADSharp/OSCADSharp/Transforms/HulledObject.cs | 2 +- OSCADSharp/OSCADSharp/Transforms/MinkowskiedObject.cs | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) rename OSCADSharp/OSCADSharp/Scripting/{MultiBlockStatementObject.cs => MultiStatementObject.cs} (91%) diff --git a/OSCADSharp/OSCADSharp/Booleans/Difference.cs b/OSCADSharp/OSCADSharp/Booleans/Difference.cs index 932b7a9..7a7feb9 100644 --- a/OSCADSharp/OSCADSharp/Booleans/Difference.cs +++ b/OSCADSharp/OSCADSharp/Booleans/Difference.cs @@ -11,7 +11,7 @@ namespace OSCADSharp.Booleans /// /// Subtracts the 2nd (and all further) child nodes from the first one (logical and not). /// - internal class Difference : MultiBlockStatementObject + internal class Difference : MultiStatementObject { /// /// Creates a subtraction of child nodes diff --git a/OSCADSharp/OSCADSharp/Booleans/Intersection.cs b/OSCADSharp/OSCADSharp/Booleans/Intersection.cs index aaabfe2..596a57e 100644 --- a/OSCADSharp/OSCADSharp/Booleans/Intersection.cs +++ b/OSCADSharp/OSCADSharp/Booleans/Intersection.cs @@ -11,7 +11,7 @@ namespace OSCADSharp.Booleans /// /// Creates the intersection of all child nodes /// - internal class Intersection : MultiBlockStatementObject + internal class Intersection : MultiStatementObject { /// /// Creates the intersection of all child nodes diff --git a/OSCADSharp/OSCADSharp/Booleans/Union.cs b/OSCADSharp/OSCADSharp/Booleans/Union.cs index 37992fb..432e1ef 100644 --- a/OSCADSharp/OSCADSharp/Booleans/Union.cs +++ b/OSCADSharp/OSCADSharp/Booleans/Union.cs @@ -10,7 +10,7 @@ namespace OSCADSharp.Booleans /// /// A union of child nodes. This is the sum of all children (logical or). /// - internal class Union : MultiBlockStatementObject + internal class Union : MultiStatementObject { /// /// Create a union that is the combination of all children diff --git a/OSCADSharp/OSCADSharp/OSCADSharp.csproj b/OSCADSharp/OSCADSharp/OSCADSharp.csproj index 3be8f51..b07c370 100644 --- a/OSCADSharp/OSCADSharp/OSCADSharp.csproj +++ b/OSCADSharp/OSCADSharp/OSCADSharp.csproj @@ -56,7 +56,7 @@ - + diff --git a/OSCADSharp/OSCADSharp/Scripting/MultiBlockStatementObject.cs b/OSCADSharp/OSCADSharp/Scripting/MultiStatementObject.cs similarity index 91% rename from OSCADSharp/OSCADSharp/Scripting/MultiBlockStatementObject.cs rename to OSCADSharp/OSCADSharp/Scripting/MultiStatementObject.cs index 8faa9d7..d7f6193 100644 --- a/OSCADSharp/OSCADSharp/Scripting/MultiBlockStatementObject.cs +++ b/OSCADSharp/OSCADSharp/Scripting/MultiStatementObject.cs @@ -12,11 +12,11 @@ namespace OSCADSharp.Scripting /// A statement that has multiple child nodes, whose ToString output /// is more or less just an aggregate of the children /// - internal class MultiBlockStatementObject : OSCADObject + internal class MultiStatementObject : OSCADObject { private string outerStatement; - internal MultiBlockStatementObject(string outerStatement, IEnumerable children) + internal MultiStatementObject(string outerStatement, IEnumerable children) { this.outerStatement = outerStatement; this.children = children.ToList(); @@ -46,7 +46,7 @@ namespace OSCADSharp.Scripting childClones.Add(child.Clone()); } - return new MultiBlockStatementObject(this.outerStatement, childClones) + return new MultiStatementObject(this.outerStatement, childClones) { Name = this.Name }; diff --git a/OSCADSharp/OSCADSharp/Transforms/HulledObject.cs b/OSCADSharp/OSCADSharp/Transforms/HulledObject.cs index 04d3b00..d7dd4a6 100644 --- a/OSCADSharp/OSCADSharp/Transforms/HulledObject.cs +++ b/OSCADSharp/OSCADSharp/Transforms/HulledObject.cs @@ -10,7 +10,7 @@ namespace OSCADSharp.Transforms /// /// Creates an object that's the convex hull of child objects /// - internal class HulledObject : MultiBlockStatementObject + internal class HulledObject : MultiStatementObject { public HulledObject(IEnumerable children) : base("hull()", children) { diff --git a/OSCADSharp/OSCADSharp/Transforms/MinkowskiedObject.cs b/OSCADSharp/OSCADSharp/Transforms/MinkowskiedObject.cs index 3b88499..bdc7b3d 100644 --- a/OSCADSharp/OSCADSharp/Transforms/MinkowskiedObject.cs +++ b/OSCADSharp/OSCADSharp/Transforms/MinkowskiedObject.cs @@ -11,7 +11,7 @@ namespace OSCADSharp.Transforms /// /// Creates an object that's the minkowski sum of child objects /// - internal class MinkowskiedObject : MultiBlockStatementObject + internal class MinkowskiedObject : MultiStatementObject { public MinkowskiedObject(IEnumerable children) : base("minkowski()", children)