Refactor visibility code

References #33
Lawo · Feb 9, 2017 · 704a320 · 704a320
1 parent 72cbc74
commit 704a320
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 36 deletions.
diff --git a/Lawo.EmberPlusSharp/Lawo.EmberPlusSharp.csproj b/Lawo.EmberPlusSharp/Lawo.EmberPlusSharp.csproj
@@ -182,6 +182,7 @@
     <Compile Include="Model\IParent.cs" />
     <Compile Include="Model\ValueWriter`1.cs" />
     <Compile Include="Model\ValueReader`1.cs" />
+    <Compile Include="Model\VisibilityHelper.cs" />
     <Compile Include="S101\EventInfo.cs" />
     <Compile Include="S101\LogNames.cs" />
     <Compile Include="Glow\GlowLogConverter.cs" />

diff --git a/Lawo.EmberPlusSharp/Model/CollectionNode`2.cs b/Lawo.EmberPlusSharp/Model/CollectionNode`2.cs
@@ -60,19 +60,7 @@ internal sealed override bool ChangeVisibility(IElement child)
         {
             if (!base.ChangeVisibility(child))
             {
-                if (child.IsOnline)
-                {
-                    var typedChild = (TElement)child;
-
-                    if (!this.children.Contains(typedChild))
-                    {
-                        this.children.Add(typedChild);
-                    }
-                }
-                else
-                {
-                    this.children.Remove((TElement)child);
-                }
+                VisibilityHelper.ChangeVisibility(this.children, (TElement)child);
             }
 
             return true;

diff --git a/Lawo.EmberPlusSharp/Model/DynamicNodeHelper.cs b/Lawo.EmberPlusSharp/Model/DynamicNodeHelper.cs
@@ -35,17 +35,7 @@ internal static bool ChangeVisibility(
         {
             if (!baseImpl(child))
             {
-                if (child.IsOnline)
-                {
-                    if (!dynamicChildren.Contains(child))
-                    {
-                        dynamicChildren.Add(child);
-                    }
-                }
-                else
-                {
-                    dynamicChildren.Remove(child);
-                }
+                VisibilityHelper.ChangeVisibility(dynamicChildren, child);
             }
 
             return true;

diff --git a/Lawo.EmberPlusSharp/Model/Node`1.cs b/Lawo.EmberPlusSharp/Model/Node`1.cs
@@ -60,18 +60,7 @@ internal Node()
         [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", Justification = "Method is not public, CA bug?")]
         internal override bool ChangeVisibility(IElement child)
         {
-            if (child.IsOnline)
-            {
-                if (!this.observableChildren.Contains(child))
-                {
-                    this.observableChildren.Add(child);
-                }
-            }
-            else
-            {
-                this.observableChildren.Remove(child);
-            }
-
+            VisibilityHelper.ChangeVisibility(this.observableChildren, child);
             return base.ChangeVisibility(child);
         }
 

diff --git a/Lawo.EmberPlusSharp/Model/VisibilityHelper.cs b/Lawo.EmberPlusSharp/Model/VisibilityHelper.cs
@@ -0,0 +1,29 @@
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// <copyright>Copyright 2012-2017 Lawo AG (http://www.lawo.com).</copyright>
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+namespace Lawo.EmberPlusSharp.Model
+{
+    using System.Collections.Generic;
+
+    internal static class VisibilityHelper
+    {
+        internal static void ChangeVisibility<T>(ICollection<T> children, T child)
+            where T : IElement
+        {
+            if (child.IsOnline)
+            {
+                if (!children.Contains(child))
+                {
+                    children.Add(child);
+                }
+            }
+            else
+            {
+                children.Remove(child);
+            }
+        }
+    }
+}