From cf7eaa900000b90213adbd5d9617120cf69e46b1 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Mon, 21 Mar 2016 00:37:57 -0700 Subject: [PATCH] Made a number of fields ReadOnly that are never mutated --- OSCADSharp/OSCADSharp/DataBinding/BindableBoolean.cs | 2 +- OSCADSharp/OSCADSharp/DataBinding/Bindings.cs | 2 +- OSCADSharp/OSCADSharp/DataBinding/Variables.cs | 2 +- OSCADSharp/OSCADSharp/IO/OutputSettings.cs | 2 +- OSCADSharp/OSCADSharp/OSCADObject.AbstractTransforms.cs | 6 +++--- OSCADSharp/OSCADSharp/OSCADObject.BaseTransform.cs | 2 +- OSCADSharp/OSCADSharp/OSCADObject.cs | 2 +- OSCADSharp/OSCADSharp/Spatial/Matrix.cs | 2 +- OSCADSharp/OSCADSharp/Utility/Ids.cs | 2 +- OSCADSharp/OSCADSharp/Utility/SingleBlockFormatter.cs | 6 +++--- OSCADSharp/OSCADSharp/Utility/StatementBuilder.cs | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/OSCADSharp/OSCADSharp/DataBinding/BindableBoolean.cs b/OSCADSharp/OSCADSharp/DataBinding/BindableBoolean.cs index 16c555c..f7b56b8 100644 --- a/OSCADSharp/OSCADSharp/DataBinding/BindableBoolean.cs +++ b/OSCADSharp/OSCADSharp/DataBinding/BindableBoolean.cs @@ -31,7 +31,7 @@ namespace OSCADSharp.DataBinding this.bindings.Synonym("innervalue", propertyName); } - private string boundProperty = null; + private readonly string boundProperty = null; internal bool IsBound { get; set; } = false; public void Bind(string property, Variable variable) diff --git a/OSCADSharp/OSCADSharp/DataBinding/Bindings.cs b/OSCADSharp/OSCADSharp/DataBinding/Bindings.cs index e650664..5dd7a4a 100644 --- a/OSCADSharp/OSCADSharp/DataBinding/Bindings.cs +++ b/OSCADSharp/OSCADSharp/DataBinding/Bindings.cs @@ -11,7 +11,7 @@ namespace OSCADSharp.DataBinding { #region Fields private Dictionary bindings = new Dictionary(); - private Dictionary propertyNametoOpenSCADFieldMappings = new Dictionary(); + private readonly Dictionary propertyNametoOpenSCADFieldMappings = new Dictionary(); private Dictionary synonyms = new Dictionary(); #endregion diff --git a/OSCADSharp/OSCADSharp/DataBinding/Variables.cs b/OSCADSharp/OSCADSharp/DataBinding/Variables.cs index fd0d6c1..938024f 100644 --- a/OSCADSharp/OSCADSharp/DataBinding/Variables.cs +++ b/OSCADSharp/OSCADSharp/DataBinding/Variables.cs @@ -17,7 +17,7 @@ namespace OSCADSharp.DataBinding /// top of OpenSCAD scripts /// public static Variables Global { get; set; } = new Variables(); - private ConcurrentDictionary variables = new ConcurrentDictionary(); + private readonly ConcurrentDictionary variables = new ConcurrentDictionary(); /// /// Adds a variable to the collection diff --git a/OSCADSharp/OSCADSharp/IO/OutputSettings.cs b/OSCADSharp/OSCADSharp/IO/OutputSettings.cs index 5519ac7..635afcb 100644 --- a/OSCADSharp/OSCADSharp/IO/OutputSettings.cs +++ b/OSCADSharp/OSCADSharp/IO/OutputSettings.cs @@ -31,7 +31,7 @@ namespace OSCADSharp.IO /// private class OpenSCADPathFinder { - private string[] possibleFilePaths = new string[] + private readonly string[] possibleFilePaths = new string[] { @"C:\Program Files (x86)\OpenSCAD\openscad.exe", @"C:\Program Files\OpenSCAD\openscad.exe" diff --git a/OSCADSharp/OSCADSharp/OSCADObject.AbstractTransforms.cs b/OSCADSharp/OSCADSharp/OSCADObject.AbstractTransforms.cs index 0bc197c..aac58fa 100644 --- a/OSCADSharp/OSCADSharp/OSCADObject.AbstractTransforms.cs +++ b/OSCADSharp/OSCADSharp/OSCADObject.AbstractTransforms.cs @@ -15,7 +15,7 @@ namespace OSCADSharp /// /// An object that's mirrored on a plane /// - internal class MirroredObject : SingleStatementObject + private class MirroredObject : SingleStatementObject { /// /// The normal vector of a plane intersecting the origin of the object, @@ -133,7 +133,7 @@ namespace OSCADSharp /// /// Creates an object that's the convex hull of child objects /// - internal class HulledObject : MultiStatementObject + private class HulledObject : MultiStatementObject { internal HulledObject(IEnumerable children) : base("hull()", children) { @@ -145,7 +145,7 @@ namespace OSCADSharp /// /// Creates an object that's the minkowski sum of child objects /// - internal class MinkowskiedObject : MultiStatementObject + private class MinkowskiedObject : MultiStatementObject { internal MinkowskiedObject(IEnumerable children) : base("minkowski()", children) diff --git a/OSCADSharp/OSCADSharp/OSCADObject.BaseTransform.cs b/OSCADSharp/OSCADSharp/OSCADObject.BaseTransform.cs index 0b96d62..0049c18 100644 --- a/OSCADSharp/OSCADSharp/OSCADObject.BaseTransform.cs +++ b/OSCADSharp/OSCADSharp/OSCADObject.BaseTransform.cs @@ -18,7 +18,7 @@ namespace OSCADSharp /// internal class MultiStatementObject : OSCADObject { - private string outerStatement; + private readonly string outerStatement; internal MultiStatementObject(string outerStatement, IEnumerable children) { diff --git a/OSCADSharp/OSCADSharp/OSCADObject.cs b/OSCADSharp/OSCADSharp/OSCADObject.cs index 2433867..507b389 100644 --- a/OSCADSharp/OSCADSharp/OSCADObject.cs +++ b/OSCADSharp/OSCADSharp/OSCADObject.cs @@ -20,7 +20,7 @@ namespace OSCADSharp public abstract partial class OSCADObject : IBindable { #region Attributes - private int id = Ids.Get(); + private readonly int id = Ids.Get(); /// /// The unique Id of the object diff --git a/OSCADSharp/OSCADSharp/Spatial/Matrix.cs b/OSCADSharp/OSCADSharp/Spatial/Matrix.cs index a05c558..be381af 100644 --- a/OSCADSharp/OSCADSharp/Spatial/Matrix.cs +++ b/OSCADSharp/OSCADSharp/Spatial/Matrix.cs @@ -14,7 +14,7 @@ namespace OSCADSharp.Spatial internal class Matrix { #region Fields/Properties - private double[] values; + private readonly double[] values; internal int ColumnCount { get; private set; } internal int RowCount { get; private set; } diff --git a/OSCADSharp/OSCADSharp/Utility/Ids.cs b/OSCADSharp/OSCADSharp/Utility/Ids.cs index 0d1df61..be6ca71 100644 --- a/OSCADSharp/OSCADSharp/Utility/Ids.cs +++ b/OSCADSharp/OSCADSharp/Utility/Ids.cs @@ -12,7 +12,7 @@ namespace OSCADSharp.Utility internal static class Ids { private static int globalId = 0; - private static object idLockObject = new object(); + private readonly static object idLockObject = new object(); /// /// Gets a unique auto-incrementing integer id diff --git a/OSCADSharp/OSCADSharp/Utility/SingleBlockFormatter.cs b/OSCADSharp/OSCADSharp/Utility/SingleBlockFormatter.cs index 86b7fb1..ff79217 100644 --- a/OSCADSharp/OSCADSharp/Utility/SingleBlockFormatter.cs +++ b/OSCADSharp/OSCADSharp/Utility/SingleBlockFormatter.cs @@ -13,9 +13,9 @@ namespace OSCADSharp.Utility /// internal class SingleBlockFormatter { - private string outerCode; - private string innerCode; - private string indentationAmount = " "; + private readonly string outerCode; + private readonly string innerCode; + private readonly string indentationAmount = " "; internal SingleBlockFormatter(string outerCode, string innerCode) { diff --git a/OSCADSharp/OSCADSharp/Utility/StatementBuilder.cs b/OSCADSharp/OSCADSharp/Utility/StatementBuilder.cs index 76d45b9..cbf2a78 100644 --- a/OSCADSharp/OSCADSharp/Utility/StatementBuilder.cs +++ b/OSCADSharp/OSCADSharp/Utility/StatementBuilder.cs @@ -14,7 +14,7 @@ namespace OSCADSharp.Utility internal class StatementBuilder { private StringBuilder SB { get; set; } = new StringBuilder(); - private Bindings bindings = null; + private readonly Bindings bindings = null; internal StatementBuilder(Bindings bindings) {