Eliminate SetRequestState

References #8
Lawo · Jan 6, 2016 · e45bf10 · e45bf10
1 parent 60859a4
commit e45bf10
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 20 deletions.
diff --git a/Lawo.EmberPlusSharp/Model/Element.cs b/Lawo.EmberPlusSharp/Model/Element.cs
@@ -143,6 +143,12 @@ internal bool HasChanges
             }
         }
 
+        internal virtual RequestState RequestState
+        {
+            get { return RequestState.Complete; }
+            set { } // Intentionally empty
+        }
+
         internal void SetContext(Context context)
         {
             this.parent = context.Parent;
@@ -193,11 +199,6 @@ internal void SetConsumerValue<T>(ref T field, T newValue, [CallerMemberName] st
             }
         }
 
-        internal virtual void SetRequestState(bool isEmpty, ref RequestState newRequestState)
-        {
-            newRequestState = RequestState.Complete;
-        }
-
         internal abstract RequestState ReadContents(EmberReader reader, ElementType actualType);
 
         /// <summary>Recursively reads the children of an element as they appear in the message payload and returns

diff --git a/Lawo.EmberPlusSharp/Model/ElementWithSchemas.cs b/Lawo.EmberPlusSharp/Model/ElementWithSchemas.cs
@@ -62,10 +62,10 @@ internal ElementWithSchemas(RequestState onlineRequestState)
         }
 
         /// <summary>Gets or sets the request state.</summary>
-        /// <remarks>This property (along with its backing fields) has nothing to do with schemas. However, it so
-        /// happens that all subclasses (parameters, nodes and matrices) need this member. If this fact ever changes, it
-        /// probably makes sense to move this member to its own base class (named e.g. RequestedElement).</remarks>
-        internal RequestState RequestState
+        /// <remarks>This implementation has nothing to do with schemas. However, it so happens that this member has the
+        /// same behavior for all subclasses (parameters, nodes and matrices). If this fact ever changes, it probably
+        /// makes sense to move this member to its own base class (named e.g. RequestedElement).</remarks>
+        internal override RequestState RequestState
         {
             get
             {
@@ -85,16 +85,6 @@ internal RequestState RequestState
             }
         }
 
-        internal sealed override void SetRequestState(bool isEmpty, ref RequestState newRequestState)
-        {
-            if (isEmpty)
-            {
-                base.SetRequestState(isEmpty, ref newRequestState);
-            }
-
-            this.RequestState = newRequestState;
-        }
-
         internal override RequestState UpdateRequestState(bool throwForMissingRequiredChildren)
         {
             if (!this.IsOnline || (this.RequestState.Equals(RequestState.Complete) &&

diff --git a/Lawo.EmberPlusSharp/Model/NodeBase.cs b/Lawo.EmberPlusSharp/Model/NodeBase.cs
@@ -299,7 +299,12 @@ private void ReadChild(EmberReader reader, ElementType actualType, int number)
 
             if (child != null)
             {
-                child.SetRequestState(isEmpty, ref childRequestState);
+                if (isEmpty)
+                {
+                    childRequestState = RequestState.Complete;
+                }
+
+                child.RequestState = childRequestState;
             }
 
             this.RequestState =