Fixes #132 - Cosmetic changes from ViewGroup -> ViewParent

ReactWindows/ReactNative/ReactNative.csproj

@@ -289,8 +289,8 @@
     <Compile Include="UIManager\UIManagerModule.Constants.cs" />
     <Compile Include="UIManager\UIViewOperationQueue.cs" />
     <Compile Include="UIManager\ViewAtIndex.cs" />
-    <Compile Include="UIManager\ViewGroupManager.cs" />
-    <Compile Include="UIManager\PanelViewGroupManager.cs" />
+    <Compile Include="UIManager\ViewParentManager.cs" />
+    <Compile Include="UIManager\PanelViewParentManager.cs" />
     <Compile Include="UIManager\ViewManager.cs" />
     <Compile Include="UIManager\ViewManager.Generic.cs" />
     <Compile Include="UIManager\ViewManagerRegistry.cs" />

ReactWindows/ReactNative/Touch/JavaScriptResponderHandler.cs

@@ -9,7 +9,7 @@ namespace ReactNative.Touch
     /// This class coordinates JSResponder commands for <see cref="ReactNative.UIManager.UIManagerModule"/>.
     /// It should be set as the <see cref="IOnInterceptTouchEventListener"/>
     /// for all newly created native views that implement
-    /// <see cref="IReactInterceptingViewGroup"/> and will dispatch touch
+    /// <see cref="IReactInterceptingViewParent"/> and will dispatch touch
     /// events to the JavaScript gesture recognizer when the JavaScript
     /// responder is set to be enabled.
     /// </summary>

ReactWindows/ReactNative/UIManager/Events/IOnInterceptTextInputEventListener.cs

@@ -5,7 +5,7 @@ namespace ReactNative.UIManager.Events
     public interface IOnInterceptTextInputEventListener
     {
         /// <summary>
-        /// Called when a onInterceptTouch is invoked on a view group
+        /// Called when a onInterceptTouch is invoked on a view parent
         /// </summary>
         /// <param name="event"> The motion event being dispatched down the hierarchy.</param>
         /// <returns>Return true to steal motion event from the children and have the dispatched to this view, or return false to allow motion event to be delivered to children view</returns>

ReactWindows/ReactNative/UIManager/NativeViewHierarchyManager.cs

@@ -125,18 +125,18 @@ public void UpdateLayout(int parentTag, int tag, int x, int y, int width, int he
                 var viewToUpdate = ResolveView(tag);
 
                 var parentViewManager = default(ViewManager);
-                var parentViewGroupManager = default(ViewGroupManager);
+                var parentViewParentManager = default(ViewParentManager);
                 if (!_tagsToViewManagers.TryGetValue(parentTag, out parentViewManager) || 
-                    (parentViewGroupManager = parentViewManager as ViewGroupManager) == null)
+                    (parentViewParentManager = parentViewManager as ViewParentManager) == null)
                 {
                     throw new InvalidOperationException(
                         string.Format(
                             CultureInfo.InvariantCulture,
-                            "Trying to use view with tag '{0}' as a parent, but its manager doesn't extend ViewGroupManager.",
+                            "Trying to use view with tag '{0}' as a parent, but its manager doesn't extend ViewParentManager.",
                             tag));
                 }
 
-                if (!parentViewGroupManager.NeedsCustomLayoutForChildren)
+                if (!parentViewParentManager.NeedsCustomLayoutForChildren)
                 {
                     UpdateLayout(viewToUpdate, x, y, width, height);
                 }
@@ -212,10 +212,10 @@ public void ManageChildren(int tag, int[] indicesToRemove, ViewAtIndex[] viewsTo
                         tag));
             }
 
-            var viewGroupManager = (ViewGroupManager)viewManager;
+            var viewParentManager = (ViewParentManager)viewManager;
             var viewToManage = _tagsToViews[tag];
 
-            var lastIndexToRemove = viewGroupManager.GetChildCount(viewToManage);
+            var lastIndexToRemove = viewParentManager.GetChildCount(viewToManage);
             if (indicesToRemove != null)
             {
                 for (var i = indicesToRemove.Length - 1; i >= 0; --i)
@@ -231,7 +231,7 @@ public void ManageChildren(int tag, int[] indicesToRemove, ViewAtIndex[] viewsTo
                                 tag));
                     }
 
-                    if (indexToRemove >= viewGroupManager.GetChildCount(viewToManage))
+                    if (indexToRemove >= viewParentManager.GetChildCount(viewToManage))
                     {
                         throw new InvalidOperationException(
                             string.Format(
@@ -252,7 +252,7 @@ public void ManageChildren(int tag, int[] indicesToRemove, ViewAtIndex[] viewsTo
                                 tag));
                     }
 
-                    viewGroupManager.RemoveChildAt(viewToManage, indexToRemove);
+                    viewParentManager.RemoveChildAt(viewToManage, indexToRemove);
                     lastIndexToRemove = indexToRemove;
                 }
             }
@@ -272,7 +272,7 @@ public void ManageChildren(int tag, int[] indicesToRemove, ViewAtIndex[] viewsTo
                                 viewAtIndex.Tag));
                     }
 
-                    viewGroupManager.AddView(viewToManage, viewToAdd, viewAtIndex.Index);
+                    viewParentManager.AddView(viewToManage, viewToAdd, viewAtIndex.Index);
                 }
             }
 
@@ -365,7 +365,7 @@ public void Measure(int tag, int[] outputBuffer)
         /// <param name="themedContext">The themed context.</param>
         public void AddRootView(int tag, SizeMonitoringCanvas view, ThemedReactContext themedContext)
         {
-            AddRootViewGroup(tag, view, themedContext);
+            AddRootViewParent(tag, view, themedContext);
         }
 
         /// <summary>
@@ -515,7 +515,7 @@ private ViewManager ResolveViewManager(int tag)
             return viewManager;
         }
 
-        private void AddRootViewGroup(int tag, FrameworkElement view, ThemedReactContext themedContext)
+        private void AddRootViewParent(int tag, FrameworkElement view, ThemedReactContext themedContext)
         {
             DispatcherHelpers.AssertOnDispatcher();
             _tagsToViews.Add(tag, view);
@@ -539,20 +539,20 @@ private void DropView(FrameworkElement view)
             var viewManager = default(ViewManager);
             if (_tagsToViewManagers.TryGetValue(tag, out viewManager))
             {
-                var viewGroupManager = viewManager as ViewGroupManager;
-                if (viewGroupManager != null)
+                var viewParentManager = viewManager as ViewParentManager;
+                if (viewParentManager != null)
                 {
-                    for (var i = viewGroupManager.GetChildCount(view) - 1; i >= 0; --i)
+                    for (var i = viewParentManager.GetChildCount(view) - 1; i >= 0; --i)
                     {
-                        var child = viewGroupManager.GetChildAt(view, i);
+                        var child = viewParentManager.GetChildAt(view, i);
                         var managedChild = default(FrameworkElement);
                         if (_tagsToViews.TryGetValue(child.GetTag(), out managedChild))
                         {
                             DropView(managedChild);
                         }
                     }
 
-                    viewGroupManager.RemoveAllChildren(view);
+                    viewParentManager.RemoveAllChildren(view);
                 }
             }
 

ReactWindows/ReactNative/UIManager/PanelViewGroupManager.cs → ReactWindows/ReactNative/UIManager/PanelViewParentManager.cs

@@ -9,7 +9,7 @@ namespace ReactNative.UIManager
     /// extending <see cref="Panel"/>.
     /// </summary>
     /// <typeparam name="TPanel">Type of panel.</typeparam>
-    public abstract class PanelViewGroupManager<TPanel> : ViewGroupManager
+    public abstract class PanelViewParentManager<TPanel> : ViewParentManager
         where TPanel : Panel
     {
         /// <summary>
@@ -54,9 +54,9 @@ public sealed override void UpdateExtraData(FrameworkElement root, object extraD
         }
 
         /// <summary>
-        /// Gets the number of children in the view group.
+        /// Gets the number of children for the view parent.
         /// </summary>
-        /// <param name="parent">The view group.</param>
+        /// <param name="parent">The view parent.</param>
         /// <returns>The number of children.</returns>
         public sealed override int GetChildCount(FrameworkElement parent)
         {
@@ -88,17 +88,17 @@ public sealed override void AddView(FrameworkElement parent, FrameworkElement ch
         /// <summary>
         /// Removes the child at the given index.
         /// </summary>
-        /// <param name="parent">The view group.</param>
+        /// <param name="parent">The view parent.</param>
         /// <param name="index">The index.</param>
         public override void RemoveChildAt(FrameworkElement parent, int index)
         {
             RemoveChildAt((TPanel)parent, index);
         }
 
         /// <summary>
-        /// Removes all children from the view group.
+        /// Removes all children from the view parent.
         /// </summary>
-        /// <param name="parent">The view group.</param>
+        /// <param name="parent">The view parent.</param>
         public override void RemoveAllChildren(FrameworkElement parent)
         {
             RemoveAllChildren((TPanel)parent);
@@ -225,9 +225,9 @@ protected virtual void UpdateExtraData(TPanel root, object extraData)
         }
 
         /// <summary>
-        /// Gets the number of children in the view group.
+        /// Gets the number of children in the view parent.
         /// </summary>
-        /// <param name="parent">The view group.</param>
+        /// <param name="parent">The view parent.</param>
         /// <returns>The number of children.</returns>
         protected virtual int GetChildCount(TPanel parent)
         {
@@ -259,17 +259,17 @@ protected virtual void AddView(TPanel parent, FrameworkElement child, int index)
         /// <summary>
         /// Removes the child at the given index.
         /// </summary>
-        /// <param name="parent">The view group.</param>
+        /// <param name="parent">The view parent.</param>
         /// <param name="index">The index.</param>
         protected virtual void RemoveChildAt(TPanel parent, int index)
         {
             parent.Children.RemoveAt(index);
         }
 
         /// <summary>
-        /// Removes all children from the view group.
+        /// Removes all children from the view parent.
         /// </summary>
-        /// <param name="parent">The view group.</param>
+        /// <param name="parent">The view parent.</param>
         protected virtual void RemoveAllChildren(TPanel parent)
         {
             parent.Children.Clear();

ReactWindows/ReactNative/UIManager/RootViewManager.cs

@@ -3,7 +3,7 @@
     /// <summary>
     /// View manager for react root view components.
     /// </summary>
-    public class RootViewManager : PanelViewGroupManager<SizeMonitoringCanvas>
+    public class RootViewManager : PanelViewParentManager<SizeMonitoringCanvas>
     {
         /// <summary>
         /// The name of the react root view.

ReactWindows/ReactNative/UIManager/UIImplementation.cs

@@ -735,17 +735,17 @@ private void AssertNodeDoesNotNeedCustomLayoutForChildren(ReactShadowNode node)
                         node.ViewClass));
             }
 
-            var viewGroupManager = viewManager as ViewGroupManager;
-            if (viewGroupManager == null)
+            var viewParentManager = viewManager as ViewParentManager;
+            if (viewParentManager == null)
             {
                 throw new InvalidOperationException(
                     string.Format(
                         CultureInfo.InvariantCulture,
-                        "Trying to use view '{0}' as a parent but its manager is not a ViewGroupManager.",
+                        "Trying to use view '{0}' as a parent but its manager is not a ViewParentManager.",
                         node.ViewClass));
             }
 
-            if (viewGroupManager.NeedsCustomLayoutForChildren)
+            if (viewParentManager.NeedsCustomLayoutForChildren)
             {
                 throw new InvalidOperationException(
                     string.Format(

ReactWindows/ReactNative/UIManager/ViewGroupManager.cs → ReactWindows/ReactNative/UIManager/ViewParentManager.cs

@@ -6,7 +6,7 @@ namespace ReactNative.UIManager
     /// <summary>
     /// Class providing child management API for view managers.
     /// </summary>
-    public abstract class ViewGroupManager : ViewManager
+    public abstract class ViewParentManager : ViewManager
     {
         /// <summary>
         /// The <see cref="Type"/> instance that represents the type of shadow
@@ -67,9 +67,9 @@ public override void UpdateExtraData(FrameworkElement root, object extraData)
         public abstract void AddView(FrameworkElement parent, FrameworkElement child, int index);
 
         /// <summary>
-        /// Gets the number of children in the view group.
+        /// Gets the number of children in the view parent.
         /// </summary>
-        /// <param name="parent">The view group.</param>
+        /// <param name="parent">The view parent.</param>
         /// <returns>The number of children.</returns>
         public abstract int GetChildCount(FrameworkElement parent);
 
@@ -84,14 +84,14 @@ public override void UpdateExtraData(FrameworkElement root, object extraData)
         /// <summary>
         /// Removes the child at the given index.
         /// </summary>
-        /// <param name="parent">The view group.</param>
+        /// <param name="parent">The view parent.</param>
         /// <param name="index">The index.</param>
         public abstract void RemoveChildAt(FrameworkElement parent, int index);
 
         /// <summary>
-        /// Removes all children from the view group.
+        /// Removes all children from the view parent.
         /// </summary>
-        /// <param name="parent">The view group.</param>
+        /// <param name="parent">The view parent.</param>
         public abstract void RemoveAllChildren(FrameworkElement parent);
     }
 }

ReactWindows/ReactNative/Views/Scroll/ReactScrollViewManager.cs

@@ -10,7 +10,7 @@ namespace ReactNative.Views.Scroll
     /// <remarks>
     /// TODO: implement this as a proper ScrollViewer instead of a ListView.
     /// </remarks>
-    public class ReactScrollViewManager : ViewGroupManager
+    public class ReactScrollViewManager : ViewParentManager
     {
         private const string ReactClass = "RCTScrollView";
 

ReactWindows/ReactNative/Views/View/ReactCanvas.cs

@@ -13,7 +13,7 @@ namespace ReactNative.Views.View
     /// aren't common, lazy initializes most of the storage needed for them. Also supports
     /// 3D transformations such as elevation depth.  
     /// </summary>
-    public class ReactCanvas : Canvas, IReactInterceptingViewGroup, IReactPointerEventsView
+    public class ReactCanvas : Canvas, IReactInterceptingViewParent, IReactPointerEventsView
     {
         /// <summary>
         /// Sets an elevation 3D transformation effect on the <see cref="ReactCanvas"/>.

ReactWindows/ReactNative/Views/View/ReactViewManager.cs

@@ -9,7 +9,7 @@
 
 namespace ReactNative.Views.View
 {
-    public class ReactViewManager : ViewGroupManager
+    public class ReactViewManager : ViewParentManager
     {
         private const string ReactClass = ViewProperties.ViewClassName;
         private const int CommandSetPressed = 1;