From 78990782b9ca2a632cbf9f14253ee5d5b4bd08cf Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Thu, 17 Mar 2016 23:51:38 -0700 Subject: [PATCH] Shifted a number of classes to DataBinding folder/namespace --- OSCADSharp/OSCADSharp.ConsoleTests/Program.cs | 1 + .../Booleans/DifferenceTests.cs | 1 + .../OSCADSharp.UnitTests/OSCADObjectTests.cs | 1 + .../Scripting/VariableTests.cs | 3 ++- .../OSCADSharp.UnitTests/SettingsTests.cs | 1 + .../OSCADSharp.UnitTests/Solids/CubeTests.cs | 1 + .../Solids/CylinderTests.cs | 1 + .../OSCADSharp.UnitTests/Solids/SphereTests.cs | 1 + .../OSCADSharp.UnitTests/Solids/Text3DTests.cs | 1 + .../Transforms/ColorTests.cs | 1 + .../Transforms/MirrorTests.cs | 1 + .../Transforms/ResizeTests.cs | 1 + .../Transforms/RotateTests.cs | 1 + .../Transforms/ScaleTests.cs | 1 + .../Transforms/TranslateTests.cs | 1 + OSCADSharp/OSCADSharp/ColoredObject.cs | 3 ++- OSCADSharp/OSCADSharp/Cube.cs | 3 ++- OSCADSharp/OSCADSharp/Cylinder.cs | 3 ++- .../{ => DataBinding}/BindableBoolean.cs | 4 ++-- .../{ => DataBinding}/BindableVector.cs | 2 +- .../OSCADSharp/{ => DataBinding}/Binding.cs | 2 +- .../OSCADSharp/{ => DataBinding}/Bindings.cs | 2 +- .../{ => DataBinding}/CompoundVariable.cs | 2 +- .../OSCADSharp/{ => DataBinding}/IBindable.cs | 2 +- .../OSCADSharp/{ => DataBinding}/Variable.cs | 2 +- .../{ => DataBinding}/VariableCalculator.cs | 2 +- .../OSCADSharp/{ => DataBinding}/Variables.cs | 2 +- OSCADSharp/OSCADSharp/MirroredObject.cs | 3 ++- OSCADSharp/OSCADSharp/MultiStatementObject.cs | 3 ++- OSCADSharp/OSCADSharp/OSCADObject.cs | 3 ++- OSCADSharp/OSCADSharp/OSCADSharp.csproj | 18 +++++++++--------- OSCADSharp/OSCADSharp/ResizedObject.cs | 3 ++- OSCADSharp/OSCADSharp/RotatedObject.cs | 3 ++- OSCADSharp/OSCADSharp/ScaledObject.cs | 3 ++- OSCADSharp/OSCADSharp/Sphere.cs | 1 + OSCADSharp/OSCADSharp/StatementBuilder.cs | 7 ++++--- OSCADSharp/OSCADSharp/Text3D.cs | 3 ++- OSCADSharp/OSCADSharp/TranslatedObject.cs | 3 ++- 38 files changed, 62 insertions(+), 34 deletions(-) rename OSCADSharp/OSCADSharp/{ => DataBinding}/BindableBoolean.cs (95%) rename OSCADSharp/OSCADSharp/{ => DataBinding}/BindableVector.cs (98%) rename OSCADSharp/OSCADSharp/{ => DataBinding}/Binding.cs (89%) rename OSCADSharp/OSCADSharp/{ => DataBinding}/Bindings.cs (99%) rename OSCADSharp/OSCADSharp/{ => DataBinding}/CompoundVariable.cs (89%) rename OSCADSharp/OSCADSharp/{ => DataBinding}/IBindable.cs (93%) rename OSCADSharp/OSCADSharp/{ => DataBinding}/Variable.cs (99%) rename OSCADSharp/OSCADSharp/{ => DataBinding}/VariableCalculator.cs (98%) rename OSCADSharp/OSCADSharp/{ => DataBinding}/Variables.cs (99%) diff --git a/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs b/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs index 3a3ec27..0003c9a 100644 --- a/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs +++ b/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs @@ -1,4 +1,5 @@  +using OSCADSharp.DataBinding; using OSCADSharp.Spatial; using OSCADSharp.Utility; diff --git a/OSCADSharp/OSCADSharp.UnitTests/Booleans/DifferenceTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Booleans/DifferenceTests.cs index 890c5ef..e4e57b1 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Booleans/DifferenceTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Booleans/DifferenceTests.cs @@ -1,6 +1,7 @@ using System; using Microsoft.VisualStudio.TestTools.UnitTesting; using System.Linq; +using OSCADSharp.DataBinding; namespace OSCADSharp.UnitTests { diff --git a/OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs b/OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs index 43688e2..f0fc119 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs @@ -1,5 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; +using OSCADSharp.DataBinding; using OSCADSharp.IO; using OSCADSharp.Utility; using System; diff --git a/OSCADSharp/OSCADSharp.UnitTests/Scripting/VariableTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Scripting/VariableTests.cs index cf86e53..dbb5481 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Scripting/VariableTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Scripting/VariableTests.cs @@ -1,4 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; +using OSCADSharp.DataBinding; using OSCADSharp.Utility; using System; using System.Collections.Generic; @@ -25,7 +26,7 @@ namespace OSCADSharp.UnitTests.Scripting var compound = new Variable("x", 5) / 12; string type = compound.GetType().ToString(); - Assert.AreEqual("OSCADSharp.CompoundVariable", type); + Assert.AreEqual("OSCADSharp.DataBinding.CompoundVariable", type); } } } diff --git a/OSCADSharp/OSCADSharp.UnitTests/SettingsTests.cs b/OSCADSharp/OSCADSharp.UnitTests/SettingsTests.cs index 9713cc8..997dcb1 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/SettingsTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/SettingsTests.cs @@ -1,5 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; +using OSCADSharp.DataBinding; using OSCADSharp.IO; using OSCADSharp.Utility; using System; diff --git a/OSCADSharp/OSCADSharp.UnitTests/Solids/CubeTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Solids/CubeTests.cs index 57df87e..5ae45dc 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Solids/CubeTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Solids/CubeTests.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using Microsoft.VisualStudio.TestTools.UnitTesting; using OSCADSharp.Utility; using OSCADSharp.Spatial; +using OSCADSharp.DataBinding; namespace OSCADSharp.UnitTests { diff --git a/OSCADSharp/OSCADSharp.UnitTests/Solids/CylinderTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Solids/CylinderTests.cs index 53025b6..f47a478 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Solids/CylinderTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Solids/CylinderTests.cs @@ -1,4 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; +using OSCADSharp.DataBinding; using OSCADSharp.Spatial; using OSCADSharp.Utility; using System; diff --git a/OSCADSharp/OSCADSharp.UnitTests/Solids/SphereTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Solids/SphereTests.cs index a03fa34..bf58ee8 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Solids/SphereTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Solids/SphereTests.cs @@ -2,6 +2,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using OSCADSharp.Utility; using OSCADSharp.Spatial; +using OSCADSharp.DataBinding; namespace OSCADSharp.UnitTests { diff --git a/OSCADSharp/OSCADSharp.UnitTests/Solids/Text3DTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Solids/Text3DTests.cs index 56c187a..cc78cd4 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Solids/Text3DTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Solids/Text3DTests.cs @@ -1,4 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; +using OSCADSharp.DataBinding; using OSCADSharp.Spatial; using System; using System.Collections.Generic; diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ColorTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ColorTests.cs index 8e68042..a3dfaf0 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ColorTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ColorTests.cs @@ -1,4 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; +using OSCADSharp.DataBinding; using System; using System.Collections.Generic; using System.Linq; diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/MirrorTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/MirrorTests.cs index 7798ece..4222762 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/MirrorTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/MirrorTests.cs @@ -1,4 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; +using OSCADSharp.DataBinding; using OSCADSharp.Spatial; using System; using System.Collections.Generic; diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ResizeTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ResizeTests.cs index ec6f2d2..bde1257 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ResizeTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ResizeTests.cs @@ -1,4 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; +using OSCADSharp.DataBinding; using OSCADSharp.Spatial; using System; using System.Collections.Generic; diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/RotateTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/RotateTests.cs index 4219246..35fbed0 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/RotateTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/RotateTests.cs @@ -1,4 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; +using OSCADSharp.DataBinding; using OSCADSharp.Spatial; using System; using System.Collections.Generic; diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ScaleTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ScaleTests.cs index f2be633..f634203 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ScaleTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ScaleTests.cs @@ -1,4 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; +using OSCADSharp.DataBinding; using OSCADSharp.Spatial; using System; using System.Collections.Generic; diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/TranslateTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/TranslateTests.cs index 70f1dda..e52b7c5 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/TranslateTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/TranslateTests.cs @@ -1,4 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; +using OSCADSharp.DataBinding; using OSCADSharp.Spatial; using OSCADSharp.Utility; using System; diff --git a/OSCADSharp/OSCADSharp/ColoredObject.cs b/OSCADSharp/OSCADSharp/ColoredObject.cs index 7c8e1e0..4123555 100644 --- a/OSCADSharp/OSCADSharp/ColoredObject.cs +++ b/OSCADSharp/OSCADSharp/ColoredObject.cs @@ -1,4 +1,5 @@ -using OSCADSharp.Spatial; +using OSCADSharp.DataBinding; +using OSCADSharp.Spatial; using System; using System.Collections.Generic; using System.Linq; diff --git a/OSCADSharp/OSCADSharp/Cube.cs b/OSCADSharp/OSCADSharp/Cube.cs index c98a08f..6314b30 100644 --- a/OSCADSharp/OSCADSharp/Cube.cs +++ b/OSCADSharp/OSCADSharp/Cube.cs @@ -1,4 +1,5 @@ -using OSCADSharp.Spatial; +using OSCADSharp.DataBinding; +using OSCADSharp.Spatial; using System; using System.Collections.Generic; using System.Linq; diff --git a/OSCADSharp/OSCADSharp/Cylinder.cs b/OSCADSharp/OSCADSharp/Cylinder.cs index d0e7a9d..53e4f1c 100644 --- a/OSCADSharp/OSCADSharp/Cylinder.cs +++ b/OSCADSharp/OSCADSharp/Cylinder.cs @@ -1,4 +1,5 @@ -using OSCADSharp.Spatial; +using OSCADSharp.DataBinding; +using OSCADSharp.Spatial; using System; using System.Collections.Generic; using System.Linq; diff --git a/OSCADSharp/OSCADSharp/BindableBoolean.cs b/OSCADSharp/OSCADSharp/DataBinding/BindableBoolean.cs similarity index 95% rename from OSCADSharp/OSCADSharp/BindableBoolean.cs rename to OSCADSharp/OSCADSharp/DataBinding/BindableBoolean.cs index 9202c59..16c555c 100644 --- a/OSCADSharp/OSCADSharp/BindableBoolean.cs +++ b/OSCADSharp/OSCADSharp/DataBinding/BindableBoolean.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp +namespace OSCADSharp.DataBinding { internal class BindableBoolean : IBindable { @@ -46,7 +46,7 @@ namespace OSCADSharp return this.bindings.Get(this.boundProperty).BoundVariable.Text; } - public BindableBoolean Clone() + internal BindableBoolean Clone() { var clone = new BindableBoolean(this.boundProperty); clone.bindings = this.bindings; diff --git a/OSCADSharp/OSCADSharp/BindableVector.cs b/OSCADSharp/OSCADSharp/DataBinding/BindableVector.cs similarity index 98% rename from OSCADSharp/OSCADSharp/BindableVector.cs rename to OSCADSharp/OSCADSharp/DataBinding/BindableVector.cs index 767d1df..f82b173 100644 --- a/OSCADSharp/OSCADSharp/BindableVector.cs +++ b/OSCADSharp/OSCADSharp/DataBinding/BindableVector.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp +namespace OSCADSharp.DataBinding { internal class BindableVector : Vector3, IBindable { diff --git a/OSCADSharp/OSCADSharp/Binding.cs b/OSCADSharp/OSCADSharp/DataBinding/Binding.cs similarity index 89% rename from OSCADSharp/OSCADSharp/Binding.cs rename to OSCADSharp/OSCADSharp/DataBinding/Binding.cs index 5ff243b..d695508 100644 --- a/OSCADSharp/OSCADSharp/Binding.cs +++ b/OSCADSharp/OSCADSharp/DataBinding/Binding.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp +namespace OSCADSharp.DataBinding { internal class Binding { diff --git a/OSCADSharp/OSCADSharp/Bindings.cs b/OSCADSharp/OSCADSharp/DataBinding/Bindings.cs similarity index 99% rename from OSCADSharp/OSCADSharp/Bindings.cs rename to OSCADSharp/OSCADSharp/DataBinding/Bindings.cs index 888a052..e650664 100644 --- a/OSCADSharp/OSCADSharp/Bindings.cs +++ b/OSCADSharp/OSCADSharp/DataBinding/Bindings.cs @@ -5,7 +5,7 @@ using System.Reflection; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp +namespace OSCADSharp.DataBinding { internal class Bindings { diff --git a/OSCADSharp/OSCADSharp/CompoundVariable.cs b/OSCADSharp/OSCADSharp/DataBinding/CompoundVariable.cs similarity index 89% rename from OSCADSharp/OSCADSharp/CompoundVariable.cs rename to OSCADSharp/OSCADSharp/DataBinding/CompoundVariable.cs index 4e1c4b4..40b0024 100644 --- a/OSCADSharp/OSCADSharp/CompoundVariable.cs +++ b/OSCADSharp/OSCADSharp/DataBinding/CompoundVariable.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp +namespace OSCADSharp.DataBinding { internal class CompoundVariable : Variable { diff --git a/OSCADSharp/OSCADSharp/IBindable.cs b/OSCADSharp/OSCADSharp/DataBinding/IBindable.cs similarity index 93% rename from OSCADSharp/OSCADSharp/IBindable.cs rename to OSCADSharp/OSCADSharp/DataBinding/IBindable.cs index c1c9b98..3ea43d6 100644 --- a/OSCADSharp/OSCADSharp/IBindable.cs +++ b/OSCADSharp/OSCADSharp/DataBinding/IBindable.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp +namespace OSCADSharp.DataBinding { /// /// An object whose properties can be bound to variables diff --git a/OSCADSharp/OSCADSharp/Variable.cs b/OSCADSharp/OSCADSharp/DataBinding/Variable.cs similarity index 99% rename from OSCADSharp/OSCADSharp/Variable.cs rename to OSCADSharp/OSCADSharp/DataBinding/Variable.cs index adc2b68..5ca7795 100644 --- a/OSCADSharp/OSCADSharp/Variable.cs +++ b/OSCADSharp/OSCADSharp/DataBinding/Variable.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp +namespace OSCADSharp.DataBinding { /// /// A value for setting object properties in script output to diff --git a/OSCADSharp/OSCADSharp/VariableCalculator.cs b/OSCADSharp/OSCADSharp/DataBinding/VariableCalculator.cs similarity index 98% rename from OSCADSharp/OSCADSharp/VariableCalculator.cs rename to OSCADSharp/OSCADSharp/DataBinding/VariableCalculator.cs index 3e8cafe..ffd2e5e 100644 --- a/OSCADSharp/OSCADSharp/VariableCalculator.cs +++ b/OSCADSharp/OSCADSharp/DataBinding/VariableCalculator.cs @@ -6,7 +6,7 @@ using System.Linq.Expressions; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp +namespace OSCADSharp.DataBinding { internal static class VariableCalculator { diff --git a/OSCADSharp/OSCADSharp/Variables.cs b/OSCADSharp/OSCADSharp/DataBinding/Variables.cs similarity index 99% rename from OSCADSharp/OSCADSharp/Variables.cs rename to OSCADSharp/OSCADSharp/DataBinding/Variables.cs index d343d39..fd0d6c1 100644 --- a/OSCADSharp/OSCADSharp/Variables.cs +++ b/OSCADSharp/OSCADSharp/DataBinding/Variables.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp +namespace OSCADSharp.DataBinding { /// /// A collection of names/values for variables diff --git a/OSCADSharp/OSCADSharp/MirroredObject.cs b/OSCADSharp/OSCADSharp/MirroredObject.cs index a85117a..0911191 100644 --- a/OSCADSharp/OSCADSharp/MirroredObject.cs +++ b/OSCADSharp/OSCADSharp/MirroredObject.cs @@ -1,4 +1,5 @@ -using OSCADSharp.Spatial; +using OSCADSharp.DataBinding; +using OSCADSharp.Spatial; using System; using System.Collections.Generic; using System.Linq; diff --git a/OSCADSharp/OSCADSharp/MultiStatementObject.cs b/OSCADSharp/OSCADSharp/MultiStatementObject.cs index 68ca83c..ee204d4 100644 --- a/OSCADSharp/OSCADSharp/MultiStatementObject.cs +++ b/OSCADSharp/OSCADSharp/MultiStatementObject.cs @@ -1,4 +1,5 @@ -using OSCADSharp.Spatial; +using OSCADSharp.DataBinding; +using OSCADSharp.Spatial; using System; using System.Collections.Generic; using System.Linq; diff --git a/OSCADSharp/OSCADSharp/OSCADObject.cs b/OSCADSharp/OSCADSharp/OSCADObject.cs index 4de6931..334fab1 100644 --- a/OSCADSharp/OSCADSharp/OSCADObject.cs +++ b/OSCADSharp/OSCADSharp/OSCADObject.cs @@ -1,4 +1,5 @@ -using OSCADSharp.IO; +using OSCADSharp.DataBinding; +using OSCADSharp.IO; using OSCADSharp.Spatial; using OSCADSharp.Utility; using System; diff --git a/OSCADSharp/OSCADSharp/OSCADSharp.csproj b/OSCADSharp/OSCADSharp/OSCADSharp.csproj index 426c29b..4a382da 100644 --- a/OSCADSharp/OSCADSharp/OSCADSharp.csproj +++ b/OSCADSharp/OSCADSharp/OSCADSharp.csproj @@ -42,9 +42,9 @@ - - - + + + @@ -52,15 +52,15 @@ - - - + + + - + - + @@ -83,7 +83,7 @@ - + diff --git a/OSCADSharp/OSCADSharp/ResizedObject.cs b/OSCADSharp/OSCADSharp/ResizedObject.cs index 7f95b4c..c08a589 100644 --- a/OSCADSharp/OSCADSharp/ResizedObject.cs +++ b/OSCADSharp/OSCADSharp/ResizedObject.cs @@ -1,4 +1,5 @@ -using OSCADSharp.Spatial; +using OSCADSharp.DataBinding; +using OSCADSharp.Spatial; using System; using System.Collections.Generic; diff --git a/OSCADSharp/OSCADSharp/RotatedObject.cs b/OSCADSharp/OSCADSharp/RotatedObject.cs index 5927e36..70833d3 100644 --- a/OSCADSharp/OSCADSharp/RotatedObject.cs +++ b/OSCADSharp/OSCADSharp/RotatedObject.cs @@ -1,4 +1,5 @@ -using OSCADSharp.Spatial; +using OSCADSharp.DataBinding; +using OSCADSharp.Spatial; using System; using System.Collections.Generic; using System.Linq; diff --git a/OSCADSharp/OSCADSharp/ScaledObject.cs b/OSCADSharp/OSCADSharp/ScaledObject.cs index 6efe8d0..ab77ac9 100644 --- a/OSCADSharp/OSCADSharp/ScaledObject.cs +++ b/OSCADSharp/OSCADSharp/ScaledObject.cs @@ -1,4 +1,5 @@ -using OSCADSharp.Spatial; +using OSCADSharp.DataBinding; +using OSCADSharp.Spatial; using System; using System.Collections.Generic; diff --git a/OSCADSharp/OSCADSharp/Sphere.cs b/OSCADSharp/OSCADSharp/Sphere.cs index 1ea8300..aec64fb 100644 --- a/OSCADSharp/OSCADSharp/Sphere.cs +++ b/OSCADSharp/OSCADSharp/Sphere.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using System.Collections.Concurrent; using System.Reflection; using OSCADSharp.Spatial; +using OSCADSharp.DataBinding; namespace OSCADSharp { diff --git a/OSCADSharp/OSCADSharp/StatementBuilder.cs b/OSCADSharp/OSCADSharp/StatementBuilder.cs index 2a56783..591619e 100644 --- a/OSCADSharp/OSCADSharp/StatementBuilder.cs +++ b/OSCADSharp/OSCADSharp/StatementBuilder.cs @@ -1,4 +1,5 @@ -using System; +using OSCADSharp.DataBinding; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -26,7 +27,7 @@ namespace OSCADSharp /// The Name of the value-pair /// The value - if null this method does nothing /// (optional) Flag indicating whether a comma should be added before the value-pair - public void AppendValuePairIfExists(string name, object value, bool prefixWithComma = false) + internal void AppendValuePairIfExists(string name, object value, bool prefixWithComma = false) { bool useBinding = this.shouldUseBinding(name); @@ -60,7 +61,7 @@ namespace OSCADSharp /// Pass-through for StringBuilder.Append /// /// - public void Append(string text) + internal void Append(string text) { SB.Append(text); } diff --git a/OSCADSharp/OSCADSharp/Text3D.cs b/OSCADSharp/OSCADSharp/Text3D.cs index 9e4ce72..347b052 100644 --- a/OSCADSharp/OSCADSharp/Text3D.cs +++ b/OSCADSharp/OSCADSharp/Text3D.cs @@ -1,4 +1,5 @@ -using OSCADSharp.Spatial; +using OSCADSharp.DataBinding; +using OSCADSharp.Spatial; using System; using System.Collections.Generic; using System.Linq; diff --git a/OSCADSharp/OSCADSharp/TranslatedObject.cs b/OSCADSharp/OSCADSharp/TranslatedObject.cs index 7da36dd..5450048 100644 --- a/OSCADSharp/OSCADSharp/TranslatedObject.cs +++ b/OSCADSharp/OSCADSharp/TranslatedObject.cs @@ -1,4 +1,5 @@ -using OSCADSharp.Spatial; +using OSCADSharp.DataBinding; +using OSCADSharp.Spatial; using System; using System.Collections.Generic;