Move component node iterators to Mediator

Author: pcastornii

mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractParentComponent.java

@@ -43,6 +43,28 @@ public Mediator() {
                     (v) -> v.getView().getViewModel());
         }
 
+        @Override
+        public SubtreeIterator<ParentViewModel> depthFirstIterator() {
+            return new AbstractDepthFirstIterator<ParentViewModel>(getView().getViewModel()) {
+
+                @Override
+                List<ParentViewModel> getChildren(ParentViewModel parent) {
+                    return (List) children;
+                }
+            };
+        }
+
+        @Override
+        public SubtreeIterator<ParentViewModel> breadthFirstIterator() {
+            return new AbstractBreadthFirstIterator<ParentViewModel>(getView().getViewModel()) {
+
+                @Override
+                List<ParentViewModel> getChildren(ParentViewModel parent) {
+                    return (List) children;
+                }
+            };
+        }
+
         @Override
         public ObservableList<ChildViewModel> getChildren() {
             return children;

mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractParentViewModel.java

@@ -16,8 +16,6 @@
 
 package com.techsenger.mvvm4fx.core;
 
-import java.util.List;
-
 /**
  *
  * @author Pavel Castornii
@@ -28,27 +26,6 @@ public AbstractParentViewModel() {
         super();
     }
 
-    @Override
-    public SubtreeIterator<ParentViewModel> depthFirstIterator() {
-        return new AbstractDepthFirstIterator<ParentViewModel>(this) {
-
-            @Override
-            List<ParentViewModel> getChildren(ParentViewModel parent) {
-                return (List) getMediator().getChildren();
-            }
-        };
-    }
-
-    @Override
-    public SubtreeIterator<ParentViewModel> breadthFirstIterator() {
-        return new AbstractBreadthFirstIterator<ParentViewModel>(this) {
-
-            @Override
-            List<ParentViewModel> getChildren(ParentViewModel parent) {
-                return (List) getMediator().getChildren();
-            }
-        };
-    }
 
     @Override
     public ParentMediator getMediator() {

mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/ParentMediator.java

@@ -30,4 +30,18 @@ public interface ParentMediator extends ComponentMediator {
      * @return a non-null, unmodifiable observable list of child ViewModels
      */
     ObservableList<ChildViewModel> getChildren();
+
+    /**
+     * Returns an iterator that traverses the component subtree starting from this component in depth-first order.
+     *
+     * @return an {@link Iterator} that iterates over this component and all of its descendants
+     */
+    SubtreeIterator<ParentViewModel> depthFirstIterator();
+
+    /**
+     * Returns an iterator that traverses the component subtree starting from this component in breadth-first order.
+     *
+     * @return an {@link Iterator} that iterates over this component and all of its descendants
+     */
+    SubtreeIterator<ParentViewModel> breadthFirstIterator();
 }

mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/ParentViewModel.java

@@ -22,20 +22,6 @@
  */
 public interface ParentViewModel extends ComponentViewModel {
 
-    /**
-     * Returns an iterator that traverses the component subtree starting from this component in depth-first order.
-     *
-     * @return an {@link Iterator} that iterates over this component and all of its descendants
-     */
-    SubtreeIterator<ParentViewModel> depthFirstIterator();
-
-    /**
-     * Returns an iterator that traverses the component subtree starting from this component in breadth-first order.
-     *
-     * @return an {@link Iterator} that iterates over this component and all of its descendants
-     */
-    SubtreeIterator<ParentViewModel> breadthFirstIterator();
-
     @Override
     ParentMediator getMediator();
 }