update

Author: saadshams

PureMVC/Core/Controller.cs

@@ -53,15 +53,13 @@ public class Controller: IController
         /// <remarks>This <c>IController</c> implementation is a Multiton, 
         ///     so you should not call the constructor 
         ///     directly, but instead call the static Multiton
-        ///     Factory method <c>Controller.getInstance(multitonKey, () => new Controller(multitonKey))</c>
+        ///     Factory method <c>Controller.getInstance(multitonKey, key => new Controller(key))</c>
         /// </remarks>
         /// <param name="key">Key of controller</param>
-        /// <exception cref="System.Exception">Thrown if instance for this Multiton key has already been constructed</exception>
         public Controller(string key)
         {
-            if (instanceMap.TryGetValue(key, out Lazy<IController> _) && multitonKey != null) throw new Exception(MULTITON_MSG);
             multitonKey = key;
-            instanceMap.TryAdd(multitonKey, new Lazy<IController>(() => this));
+            InstanceMap.TryAdd(multitonKey, new Lazy<IController>(this));
             commandMap = new ConcurrentDictionary<string, Func<ICommand>>();
             InitializeController();
         }
@@ -88,18 +86,18 @@ public Controller(string key)
         /// </remarks>
         protected virtual void InitializeController()
         {
-            view = View.GetInstance(multitonKey, () => new View(multitonKey));
+            view = View.GetInstance(multitonKey, key => new View(key));
         }
 
         /// <summary>
         /// <c>Controller</c> Multiton Factory method.
         /// </summary>
         /// <param name="key">Key of controller</param>
-        /// <param name="controllerFunc">the <c>FuncDelegate</c> of the <c>IController</c></param>
+        /// <param name="func">the <c>FuncDelegate</c> of the <c>IController</c></param>
         /// <returns>the Multiton instance of <c>Controller</c></returns>
-        public static IController GetInstance(string key, Func<IController> controllerFunc)
+        public static IController GetInstance(string key, Func<string, IController> func)
         {
-            return instanceMap.GetOrAdd(key, (k) => new Lazy<IController>(controllerFunc)).Value;
+            return InstanceMap.GetOrAdd(key, new Lazy<IController>(() => func(key))).Value;
         }
 
         /// <summary>
@@ -109,9 +107,9 @@ public static IController GetInstance(string key, Func<IController> controllerFu
         /// <param name="notification">note an <c>INotification</c></param>
         public virtual void ExecuteCommand(INotification notification)
         {
-            if (commandMap.TryGetValue(notification.Name, out Func<ICommand> commandFunc))
+            if (commandMap.TryGetValue(notification.Name, out var commandFunc))
             {
-                ICommand commandInstance = commandFunc();
+                var commandInstance = commandFunc();
                 commandInstance.InitializeNotifier(multitonKey);
                 commandInstance.Execute(notification);
             }
@@ -136,7 +134,7 @@ public virtual void ExecuteCommand(INotification notification)
         /// <param name="commandFunc">the <c>Func Delegate</c> of the <c>ICommand</c></param>
         public virtual void RegisterCommand(string notificationName, Func<ICommand> commandFunc)
         {
-            if (commandMap.TryGetValue(notificationName, out Func<ICommand> _) == false)
+            if (commandMap.TryGetValue(notificationName, out _) == false)
             {
                 view.RegisterObserver(notificationName, new Observer(ExecuteCommand, this));
             }
@@ -149,7 +147,7 @@ public virtual void RegisterCommand(string notificationName, Func<ICommand> comm
         /// <param name="notificationName">the name of the <c>INotification</c> to remove the <c>ICommand</c> mapping for</param>
         public virtual void RemoveCommand(string notificationName)
         {
-            if (commandMap.TryRemove(notificationName, out Func<ICommand> _))
+            if (commandMap.TryRemove(notificationName, out _))
             {
                 view.RemoveObserver(notificationName, this);
             }
@@ -171,22 +169,20 @@ public virtual bool HasCommand(string notificationName)
         /// <param name="key">multitonKey of IController instance to remove</param>
         public static void RemoveController(string key)
         {
-            instanceMap.TryRemove(key, out Lazy<IController> _);
+            InstanceMap.TryRemove(key, out _);
         }
 
         /// <summary>Local reference to View</summary>
         protected IView view;
 
         /// <summary>The Multiton Key for this Core</summary>
-        protected string multitonKey;
+        protected readonly string multitonKey;
 
         /// <summary>Mapping of Notification names to Command Class references</summary>
-        protected ConcurrentDictionary<string, Func<ICommand>> commandMap;
+        protected readonly ConcurrentDictionary<string, Func<ICommand>> commandMap;
 
         /// <summary>The Multiton Controller instanceMap.</summary>
-        protected static ConcurrentDictionary<string, Lazy<IController>> instanceMap = new ConcurrentDictionary<string, Lazy<IController>>();
-
-        /// <summary>Message Constants</summary>
-        protected const string MULTITON_MSG = "Controller instance for this Multiton key already constructed!";
+        protected static readonly ConcurrentDictionary<string, Lazy<IController>> InstanceMap = new ConcurrentDictionary<string, Lazy<IController>>();
+        
     }
 }

PureMVC/Core/Model.cs

@@ -40,16 +40,14 @@ public class Model: IModel
         ///         This <c>IModel</c> implementation is a Multiton, 
         ///         so you should not call the constructor 
         ///         directly, but instead call the static Multiton 
-        ///         Factory method <c>Model.getInstance(multitonKey, () => new Model(multitonKey))</c>
+        ///         Factory method <c>Model.getInstance(multitonKey, key => new Model(key))</c>
         ///     </para>
         /// </remarks>
         /// <param name="key">Key of model</param>
-        /// <exception cref="System.Exception">Thrown if instance for this Multiton key has already been constructed</exception>
         public Model(string key)
         {
-            if (instanceMap.ContainsKey(key) && multitonKey != null) throw new Exception(MULTITON_MSG);
             multitonKey = key;
-            instanceMap.TryAdd(key, new Lazy<IModel>(() => this));
+            InstanceMap.TryAdd(key, new Lazy<IModel>(this));
             proxyMap = new ConcurrentDictionary<string, IProxy>();
             InitializeModel();
         }
@@ -73,11 +71,11 @@ protected virtual void InitializeModel()
         /// <c>Model</c> Multiton Factory method. 
         /// </summary>
         /// <param name="key">Key of model</param>
-        /// <param name="modelFunc">the <c>FuncDelegate</c> of the <c>IModel</c></param>
+        /// <param name="func">the <c>FuncDelegate</c> of the <c>IModel</c></param>
         /// <returns>the instance for this Multiton key </returns>
-        public static IModel GetInstance(string key, Func<IModel> modelFunc)
+        public static IModel GetInstance(string key, Func<string, IModel> func)
         {
-            return instanceMap.GetOrAdd(key, new Lazy<IModel>(modelFunc)).Value;
+            return InstanceMap.GetOrAdd(key, new Lazy<IModel>(() => func(key))).Value;
         }
 
         /// <summary>
@@ -98,7 +96,7 @@ public virtual void RegisterProxy(IProxy proxy)
         /// <returns>the <c>IProxy</c> instance previously registered with the given <c>proxyName</c>.</returns>
         public virtual IProxy RetrieveProxy(string proxyName)
         {
-            return proxyMap.TryGetValue(proxyName, out IProxy proxy) ? proxy : null;
+            return proxyMap.TryGetValue(proxyName, out var proxy) ? proxy : null;
         }
 
         /// <summary>
@@ -108,7 +106,7 @@ public virtual IProxy RetrieveProxy(string proxyName)
         /// <returns>the <c>IProxy</c> that was removed from the <c>Model</c></returns>
         public virtual IProxy RemoveProxy(string proxyName)
         {
-            if (proxyMap.TryRemove(proxyName, out IProxy proxy))
+            if (proxyMap.TryRemove(proxyName, out var proxy))
             {
                 proxy.OnRemove();
             }
@@ -131,19 +129,16 @@ public virtual bool HasProxy(string proxyName)
         /// <param name="key">multitonKey of IModel instance to remove</param>
         public static void RemoveModel(string key)
         {
-            instanceMap.TryRemove(key, out Lazy<IModel> _);
+            InstanceMap.TryRemove(key, out _);
         }
 
         /// <summary>The Multiton Key for this Core</summary>
-        protected string multitonKey;
+        protected readonly string multitonKey;
 
         /// <summary>Mapping of proxyNames to IProxy instances</summary>
         protected readonly ConcurrentDictionary<string, IProxy> proxyMap;
 
         /// <summary>The Multiton Model instanceMap.</summary>
-        protected static readonly ConcurrentDictionary<string, Lazy<IModel>> instanceMap = new ConcurrentDictionary<string, Lazy<IModel>>();
-
-        /// <summary>Message Constants</summary>
-        protected const string MULTITON_MSG = "Model instance for this Multiton key already constructed!";
+        protected static readonly ConcurrentDictionary<string, Lazy<IModel>> InstanceMap = new ConcurrentDictionary<string, Lazy<IModel>>();
     }
 }

PureMVC/Core/View.cs

@@ -40,16 +40,14 @@ public class View: IView
         ///         This <c>IView</c> implementation is a Multiton, 
         ///         so you should not call the constructor 
         ///         directly, but instead call the static Multiton 
-        ///         Factory method <c>View.getInstance(multitonKey, () => new View(multitonKey))</c>
+        ///         Factory method <c>View.getInstance(multitonKey, key => new View(key))</c>
         ///     </para>
         /// </remarks>
         /// <param name="key">Key of view</param>
-        /// <exception cref="System.Exception">Thrown if instance for this Multiton key has already been constructed</exception>
         public View(string key)
         {
-            if (instanceMap.TryGetValue(key, out Lazy<IView> _) && multitonKey != null) throw new Exception(MULTITON_MSG);
             multitonKey = key;
-            instanceMap.TryAdd(key, new Lazy<IView>(() => this));
+            InstanceMap.TryAdd(key, new Lazy<IView>(this));
             mediatorMap = new ConcurrentDictionary<string, IMediator>();
             observerMap = new ConcurrentDictionary<string, IList<IObserver>>();
             InitializeView();
@@ -74,11 +72,11 @@ protected virtual void InitializeView()
         /// <c>View</c> Multiton Factory method. 
         /// </summary>
         /// <param name="key">Key of view</param>
-        /// <param name="viewFunc">the <c>FuncDelegate</c> of the <c>IView</c></param>
+        /// <param name="func">the <c>FuncDelegate</c> of the <c>IView</c></param>
         /// <returns>the instance for this Multiton key </returns>
-        public static IView GetInstance(string key, Func<IView> viewFunc)
+        public static IView GetInstance(string key, Func<string, IView> func)
         {
-            return instanceMap.GetOrAdd(key, new Lazy<IView>(viewFunc)).Value;
+            return InstanceMap.GetOrAdd(key, new Lazy<IView>(() => func(key))).Value;
         }
 
         /// <summary>
@@ -89,7 +87,7 @@ public static IView GetInstance(string key, Func<IView> viewFunc)
         /// <param name="observer">the <c>IObserver</c> to register</param>
         public virtual void RegisterObserver(string notificationName, IObserver observer)
         {
-            if (observerMap.TryGetValue(notificationName, out IList<IObserver> observers))
+            if (observerMap.TryGetValue(notificationName, out var observers))
             {
                 observers.Add(observer);
             }
@@ -113,12 +111,12 @@ public virtual void RegisterObserver(string notificationName, IObserver observer
         public virtual void NotifyObservers(INotification notification)
         {
             // Get a reference to the observers list for this notification name
-            if (observerMap.TryGetValue(notification.Name, out IList<IObserver> observers_ref))
+            if (observerMap.TryGetValue(notification.Name, out var observersRef))
             {
                 // Copy observers from reference array to working array, 
                 // since the reference array may change during the notification loop
-                var observers = new List<IObserver>(observers_ref);
-                foreach (IObserver observer in observers)
+                var observers = new List<IObserver>(observersRef);
+                foreach (var observer in observers)
                 {
                     observer.NotifyObserver(notification);
                 }
@@ -132,9 +130,9 @@ public virtual void NotifyObservers(INotification notification)
         /// <param name="notifyContext">remove the observer with this object as its notifyContext</param>
         public virtual void RemoveObserver(string notificationName, object notifyContext)
         {
-            if (observerMap.TryGetValue(notificationName, out IList<IObserver> observers))
+            if (observerMap.TryGetValue(notificationName, out var observers))
             {
-                for (int i = 0; i < observers.Count; i++)
+                for (var i = 0; i < observers.Count; i++)
                 {
                     if (observers[i].CompareNotifyContext(notifyContext))
                     {
@@ -146,7 +144,7 @@ public virtual void RemoveObserver(string notificationName, object notifyContext
                 // Also, when a Notification's Observer list length falls to
                 // zero, delete the notification key from the observer map
                 if (observers.Count == 0)
-                    observerMap.TryRemove(notificationName, out IList<IObserver> _);
+                    observerMap.TryRemove(notificationName, out _);
             }
         }
 
@@ -174,14 +172,14 @@ public virtual void RegisterMediator(IMediator mediator)
             {
                 mediator.InitializeNotifier(multitonKey);
 
-                string[] interests = mediator.ListNotificationInterests();
+                var interests = mediator.ListNotificationInterests();
 
                 if (interests.Length > 0)
                 {
                     IObserver observer = new Observer(mediator.HandleNotification, mediator);
-                    for (int i = 0; i < interests.Length; i++)
+                    foreach (var interest in interests)
                     {
-                        RegisterObserver(interests[i], observer);
+                        RegisterObserver(interest, observer);
                     }
                 }
                 // alert the mediator that it has been registered
@@ -196,7 +194,7 @@ public virtual void RegisterMediator(IMediator mediator)
         /// <returns>the <c>IMediator</c> instance previously registered with the given <c>mediatorName</c>.</returns>
         public virtual IMediator RetrieveMediator(string mediatorName)
         {
-            return mediatorMap.TryGetValue(mediatorName, out IMediator mediator) ? mediator : null;
+            return mediatorMap.TryGetValue(mediatorName, out var mediator) ? mediator : null;
         }
 
         /// <summary>
@@ -206,12 +204,12 @@ public virtual IMediator RetrieveMediator(string mediatorName)
         /// <returns>the <c>IMediator</c> that was removed from the <c>View</c></returns>
         public virtual IMediator RemoveMediator(string mediatorName)
         {
-            if (mediatorMap.TryRemove(mediatorName, out IMediator mediator))
+            if (mediatorMap.TryRemove(mediatorName, out var mediator))
             {
-                string[] interests = mediator.ListNotificationInterests();
-                for (int i = 0; i < interests.Length; i++)
+                var interests = mediator.ListNotificationInterests();
+                foreach (var interest in interests)
                 {
-                    RemoveObserver(interests[i], mediator);
+                    RemoveObserver(interest, mediator);
                 }
                 mediator.OnRemove();
             }
@@ -234,22 +232,20 @@ public virtual bool HasMediator(string mediatorName)
         /// <param name="key">multitonKey of IView instance to remove</param>
         public static void RemoveView(string key)
         {
-            instanceMap.TryRemove(key, out Lazy<IView> _);
+            InstanceMap.TryRemove(key, out _);
         }
 
         /// <summary>The Multiton Key for this Core</summary>
-        protected string multitonKey;
+        protected readonly string multitonKey;
 
         /// <summary>Mapping of Mediator names to Mediator instances</summary>
-        protected ConcurrentDictionary<string, IMediator> mediatorMap;
+        protected readonly ConcurrentDictionary<string, IMediator> mediatorMap;
 
         /// <summary>Mapping of Notification names to Observer lists</summary>
-        protected ConcurrentDictionary<string, IList<IObserver>> observerMap;
+        protected readonly ConcurrentDictionary<string, IList<IObserver>> observerMap;
 
         /// <summary>The Multiton View instanceMap.</summary>
-        protected static ConcurrentDictionary<string, Lazy<IView>> instanceMap = new ConcurrentDictionary<string, Lazy<IView>>();
+        protected static readonly ConcurrentDictionary<string, Lazy<IView>> InstanceMap = new ConcurrentDictionary<string, Lazy<IView>>();
 
-        /// <summary>Message Constants</summary>
-        protected const string MULTITON_MSG = "View instance for this Multiton key already constructed!";
     }
 }

PureMVC/Interfaces/ICommand.cs

@@ -16,7 +16,7 @@ public interface ICommand: INotifier
         /// <summary>
         /// Execute the <c>ICommand</c>'s logic to handle a given <c>INotification</c>.
         /// </summary>
-        /// <param name="Notification">an <c>INotification</c> to handle.</param>
-        void Execute(INotification Notification);
+        /// <param name="notification">an <c>INotification</c> to handle.</param>
+        void Execute(INotification notification);
     }
 }

PureMVC/Interfaces/IObserver.cs

@@ -71,7 +71,7 @@ public interface IObserver
         void NotifyObserver(INotification notification);
 
         /// <summary>
-        /// Compare the given object to the notificaiton context object.
+        /// Compare the given object to the notification context object.
         /// </summary>
         /// <param name="obj">the object to compare.</param>
         /// <returns>indicating if the notification context and the object are the same.</returns>

PureMVC/Patterns/Command/MacroCommand.cs

@@ -38,7 +38,7 @@ namespace PureMVC.Patterns.Command
     /// <seealso cref="PureMVC.Core.Controller"/>
     /// <seealso cref="PureMVC.Patterns.Observer.Notification"/>
     /// <seealso cref="PureMVC.Patterns.Command.SimpleCommand"/>
-    public class MacroCommand : Notifier, ICommand, INotifier
+    public class MacroCommand : Notifier, ICommand
     {
         /// <summary>
         /// Constructor.
@@ -113,20 +113,20 @@ protected void AddSubCommand(Func<ICommand> commandFunc)
         ///         order.
         ///     </para>
         /// </remarks>
-        /// <param name="notification">the <c>INotification</c> object to be passsed to each <i>SubCommand</i>.</param>
+        /// <param name="notification">the <c>INotification</c> object to be passed to each <i>SubCommand</i>.</param>
         public virtual void Execute(INotification notification)
         {
             while(subcommands.Count > 0)
             {
-                Func<ICommand> commandFunc = subcommands[0];
-                ICommand commandInstance = commandFunc();
+                var commandFunc = subcommands[0];
+                var commandInstance = commandFunc();
                 commandInstance.InitializeNotifier(MultitonKey);
                 commandInstance.Execute(notification);
                 subcommands.RemoveAt(0);
             }
         }
 
         /// <summary>List of subcommands</summary>
-        public IList<Func<ICommand>> subcommands;
+        public readonly IList<Func<ICommand>> subcommands;
     }
 }