diff --git a/Source/Scheduling/ThreadOperation.cs b/Source/Scheduling/ThreadOperation.cs index ef1b15c..4e137eb 100644 --- a/Source/Scheduling/ThreadOperation.cs +++ b/Source/Scheduling/ThreadOperation.cs @@ -66,10 +66,6 @@ namespace Nuclex.Support.Scheduling { /// Invokes the delegate passed as an argument /// Not used private void callMethod(object state) { -#if PROGRESSION_STARTABLE - OnAsyncStarted(); -#endif - try { Execute(); } diff --git a/Source/Tracking/IdleStateEventArgs.cs b/Source/Tracking/IdleStateEventArgs.cs index 9a42536..7d180e4 100644 --- a/Source/Tracking/IdleStateEventArgs.cs +++ b/Source/Tracking/IdleStateEventArgs.cs @@ -20,7 +20,6 @@ License along with this library using System; using System.Collections.Generic; -using System.Text; namespace Nuclex.Support.Tracking { diff --git a/Source/Tracking/Internal/ObservedWeightedProgression.cs b/Source/Tracking/Internal/ObservedWeightedProgression.cs index ffd0a44..d59a92b 100644 --- a/Source/Tracking/Internal/ObservedWeightedProgression.cs +++ b/Source/Tracking/Internal/ObservedWeightedProgression.cs @@ -20,7 +20,6 @@ License along with this library using System; using System.Collections.Generic; -using System.Text; namespace Nuclex.Support.Tracking { diff --git a/Source/Tracking/ProgressUpdateEventArgs.cs b/Source/Tracking/ProgressUpdateEventArgs.cs index f79318c..a9ff914 100644 --- a/Source/Tracking/ProgressUpdateEventArgs.cs +++ b/Source/Tracking/ProgressUpdateEventArgs.cs @@ -20,7 +20,6 @@ License along with this library using System; using System.Collections.Generic; -using System.Text; namespace Nuclex.Support.Tracking { diff --git a/Source/Tracking/Progression.cs b/Source/Tracking/Progression.cs index 99080e3..f104b32 100644 --- a/Source/Tracking/Progression.cs +++ b/Source/Tracking/Progression.cs @@ -50,9 +50,6 @@ namespace Nuclex.Support.Tracking { /// Initializes a new ended dummy progression public EndedDummyProgression() { -#if PROGRESSION_STARTABLE - OnAsyncStarted(); -#endif OnAsyncEnded(); } @@ -71,42 +68,14 @@ namespace Nuclex.Support.Tracking { /// will be triggered to report when progress has been achieved public event EventHandler AsyncProgressUpdated; -#if PROGRESSION_STARTABLE - /// Will be triggered when the progression has ended - public event EventHandler AsyncStarted; -#endif - /// Will be triggered when the progression has ended public event EventHandler AsyncEnded; -#if PROGRESSION_STARTABLE - /// True when the progression has been started. - /// - /// This is also true if the progression has been started but is already finished. - /// To find out whether the progression is running just now, use the IsRunning - /// property instead. - /// - public bool Started { - get { return this.started; } - } -#endif - /// Whether the progression has ended already public bool Ended { get { return this.ended; } } -#if PROGRESSION_STARTABLE - /// Whether the progression is currently executing. - /// - /// This property is true when the progression is executing right at the time of - /// the call (eg. when it has been started and has not ended yet). - /// - public bool IsRunning { - get { return (this.started && !base.Ended); } - } -#endif - /// WaitHandle that can be used to wait for the progression to end public WaitHandle WaitHandle { get { @@ -156,41 +125,6 @@ namespace Nuclex.Support.Tracking { copy(this, eventArguments); } -#if PROGRESSION_STARTABLE - /// Fires the AsyncStarted event - /// - /// - /// This event should be fired once when the implementing class begins its - /// work to indicate any observers that the process is now running. - /// - /// - /// Calling this method is mandatory. Care should be taken that it is called - /// exactly once and that it is called before OnAsyncEnded(). - /// - /// - protected virtual void OnAsyncStarted() { - - // Make sure that the progression is not started more than once. - lock(this) { - - // No double lock here as it would be an implementation fault if this exception - // should be triggered. There's no sense in sacrificing normal runtime speed - // for improved performance in a case that should never occur in the first place. - if(this.started) - throw new InvalidOperationException("The operation has already been started"); - - this.started = true; - - } - - // Fire the AsyncStarted event - EventHandler copy = AsyncStarted; - if(copy != null) - copy(this, EventArgs.Empty); - - } -#endif - /// Fires the AsyncEnded event /// /// @@ -242,10 +176,6 @@ namespace Nuclex.Support.Tracking { /// the WaitHandle property. /// private volatile ManualResetEvent doneEvent; -#if PROGRESSION_STARTABLE - /// Whether the operation has been started yet - private volatile bool started; -#endif /// Whether the operation has completed yet private volatile bool ended; diff --git a/Source/Tracking/WeightedProgression.cs b/Source/Tracking/WeightedProgression.cs index b4442ef..b248663 100644 --- a/Source/Tracking/WeightedProgression.cs +++ b/Source/Tracking/WeightedProgression.cs @@ -20,7 +20,6 @@ License along with this library using System; using System.Collections.Generic; -using System.Text; namespace Nuclex.Support.Tracking {