Reformat and contract improvments.

Author: Oren (electricessence)

AsyncProcess.cs

@@ -1,7 +1,8 @@
-using System;
-using System.Threading.Tasks;
+using Open.Disposable;
+using System;
+using System.Diagnostics.Contracts;
 using System.Threading;
-using Open.Disposable;
+using System.Threading.Tasks;
 
 namespace Open.Threading
 {
@@ -68,8 +69,9 @@ public bool HasBeenRun
 		//long _processCount = 0;
 		protected virtual void Process(object progress)
 		{
-			if(progress==null)
-				throw new ArgumentNullException("progress");
+			if (progress == null)
+				throw new ArgumentNullException(nameof(progress));
+			Contract.EndContractBlock();
 
 			var p = (T)progress;
 			try
@@ -78,7 +80,7 @@ protected virtual void Process(object progress)
 				Closure(p);
 				SyncLock.Write(() => LatestCompleted = DateTime.Now);
 			}
-			catch(Exception ex)
+			catch (Exception ex)
 			{
 				SyncLock.Write(() => LastFault = ex);
 			}
@@ -92,18 +94,20 @@ protected virtual Task EnsureProcess(bool once, TimeSpan? timeAllowedBeforeRefre
 		{
 			Task task = null;
 			SyncLock.ReadWriteConditionalOptimized(
-				write=>{
+				write =>
+				{
 					task = InternalTask;
 					return (task == null || !once && !task.IsActive()) // No action, or completed?
 						&& (!timeAllowedBeforeRefresh.HasValue // Now?
 							|| timeAllowedBeforeRefresh.Value < DateTime.Now - LatestCompleted); // Or later?
-				}, () => {
+				}, () =>
+				{
 
 					task = new Task(Process, new T());
 					task.Start(Scheduler);
 					InternalTask = task;
 					Count++;
-					
+
 				}
 			);
 
@@ -126,7 +130,7 @@ public bool IsRunning
 		public void Wait(bool once = true)
 		{
 			EnsureActive(once);
-            InternalTask?.Wait();
+			InternalTask?.Wait();
 		}
 
 		public bool EnsureActive(bool once = false)

AsyncQuery.cs

@@ -3,7 +3,7 @@
 
 namespace Open.Threading.Tasks
 {
-    public class AsyncQuery<TResult> : AsyncProcess
+	public class AsyncQuery<TResult> : AsyncProcess
 	{
 		TResult _latest;
 

Container.cs

@@ -165,14 +165,14 @@ protected virtual void OnValueUpdated(T originalValue, T newValue) { }
 		private void OnValueInitializedInternal(T initValue)
 		{
 			OnValueInitialized(initValue);
-            ValueInitialzed?.Invoke(this, initValue);
-        }
+			ValueInitialzed?.Invoke(this, initValue);
+		}
 
 		private void OnValueUpdatedInternal(T originalValue, T newValue)
 		{
 			OnValueUpdated(originalValue, newValue);
-            ValueUpdated?.Invoke(this, originalValue, newValue);
-        }
+			ValueUpdated?.Invoke(this, originalValue, newValue);
+		}
 		#endregion
 
 

ModificationSynchronizedBase.cs

@@ -65,21 +65,18 @@ bool SetSync(IModificationSynchronizer value, bool resetOwnership = true)
 		{
 			if (resetOwnership)
 				_syncOwned = false;
-			var valueM = value as ModificationSynchronizer;
-			if (valueM != null)
+			if (value is ModificationSynchronizer valueM)
 				valueM.Modified += OnModified;
 			var old = _sync;
 			_sync = value;
-			var oldM = old as ModificationSynchronizer;
-			if (oldM != null)
+			if (old is ModificationSynchronizer oldM)
 				oldM.Modified -= OnModified;
 			return old != value;
 		}
 
 		void SetSyncSynced(IModificationSynchronizer value)
 		{
-			var sync = _sync as ModificationSynchronizer;
-			if (sync != null)
+			if (_sync is ModificationSynchronizer sync)
 			{
 				bool owned = false;
 				// Allow for wrap-up.
@@ -126,8 +123,7 @@ protected virtual void OnModified()
 
 		public void Freeze()
 		{
-			var sync = _sync as ModificationSynchronizer;
-			if (sync != null)
+			if (_sync is ModificationSynchronizer sync)
 			{
 				// Allow for wrap-up.
 				sync.Modifying(() =>

ModificationSynchronizer.cs

@@ -1,6 +1,6 @@
+using Open.Disposable;
 using System;
 using System.Threading;
-using Open.Disposable;
 
 namespace Open.Threading
 {
@@ -117,20 +117,20 @@ protected override void OnDispose(bool calledExplicitly)
 
 		public virtual void Reading(Action action)
 		{
-            AssertIsAlive();
+			AssertIsAlive();
 			action();
 		}
 
 		public virtual T Reading<T>(Func<T> action)
 		{
-            AssertIsAlive();
+			AssertIsAlive();
 			return action();
 		}
 
 		protected void SignalModified()
 		{
-            Modified?.Invoke(this, EventArgs.Empty);
-        }
+			Modified?.Invoke(this, EventArgs.Empty);
+		}
 
 		public bool Modifying(Func<bool> action)
 		{
@@ -149,7 +149,7 @@ public bool Modifying(Action action, bool assumeChange = false)
 
 		public virtual bool Modifying(Func<bool> condition, Func<bool> action)
 		{
-            AssertIsAlive();
+			AssertIsAlive();
 			if (condition != null && !condition())
 				return false;
 
@@ -165,7 +165,7 @@ public virtual bool Modifying(Func<bool> condition, Func<bool> action)
 
 		public virtual bool Modifying<T>(ref T target, T newValue)
 		{
-            AssertIsAlive();
+			AssertIsAlive();
 			if (target.Equals(newValue)) return false;
 
 			IncrementVersion();
@@ -190,7 +190,7 @@ public SimpleLockingModificationSynchronizer(object sync = null)
 
 		public override void Reading(Action action)
 		{
-            AssertIsAlive();
+			AssertIsAlive();
 			lock (_sync) action();
 		}
 
@@ -329,4 +329,4 @@ public override bool Modifying<T>(ref T target, T newValue)
 
 	}
 
-}
+}

Progress.cs

@@ -5,7 +5,8 @@ namespace Open.Threading
 {
 	public class Progress
 	{
-		public Progress() {
+		public Progress()
+		{
 			Index = 0;
 			Count = 0;
 
@@ -66,8 +67,8 @@ public void Start(int? newCount = null)
 
 		public void Run(Action closure, bool propagateException = false)
 		{
-			if(closure==null)
-				throw new ArgumentNullException("closure");
+			if (closure == null)
+				throw new ArgumentNullException(nameof(closure));
 
 			Start();
 			try
@@ -85,8 +86,8 @@ public void Run(Action closure, bool propagateException = false)
 
 		public T Execute<T>(Func<T> query, bool propagateException = false)
 		{
-			if(query==null)
-				throw new ArgumentNullException("query");
+			if (query == null)
+				throw new ArgumentNullException(nameof(query));
 
 			Start();
 			try
@@ -95,7 +96,7 @@ public T Execute<T>(Func<T> query, bool propagateException = false)
 				Finish();
 				return result;
 			}
-			catch(Exception ex)
+			catch (Exception ex)
 			{
 				Failed(ex.ToString());
 				if (propagateException)
@@ -127,7 +128,7 @@ public double Value
 				if (Count == 0)
 					return 0; // Signify it hasn'T started.
 
-				return (double) Index / Count;
+				return (double)Index / Count;
 			}
 		}
 
@@ -145,9 +146,9 @@ public string Message
 
 		public void Failed(Exception ex)
 		{
-			if(ex==null)
-				throw new ArgumentNullException("ex");
-			
+			if (ex == null)
+				throw new ArgumentNullException(nameof(ex));
+
 			Failed(ex.ToString());
 		}
 
@@ -188,7 +189,7 @@ public TimeSpan EstimatedTimeLeft
 		{
 			get
 			{
-				if(Index==0 || Count==0)
+				if (Index == 0 || Count == 0)
 					return TimeSpan.MaxValue;
 
 				var remaining = Count - Index;
@@ -205,7 +206,7 @@ public string EstimatedTimeLeftString
 		{
 			get
 			{
-                return EstimatedTimeLeft.ToString();//.ToStringVerbose();
+				return EstimatedTimeLeft.ToString();//.ToStringVerbose();
 			}
 		}