Make Mediator getter protected

Author: pcastornii

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

@@ -27,7 +27,7 @@ public AbstractChildViewModel() {
     }
 
     @Override
-    public ChildMediator getMediator() {
+    protected ChildMediator getMediator() {
         return (ChildMediator) super.getMediator();
     }
 }

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

@@ -33,8 +33,7 @@ public abstract class AbstractComponentViewModel implements ComponentViewModel {
 
     private ComponentMediator mediator;
 
-    @Override
-    public ComponentMediator getMediator() {
+    protected ComponentMediator getMediator() {
         return this.mediator;
     }
 

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

@@ -48,29 +48,6 @@ public Mediator() {
         public ObservableList<ChildViewModel> getChildren() {
             return children;
         }
-
-
-        @Override
-        public SubtreeIterator<ParentViewModel> depthFirstIterator() {
-            return new AbstractDepthFirstIterator<ParentViewModel>(getView().getViewModel()) {
-
-                @Override
-                List<ParentViewModel> getChildren(ParentViewModel parent) {
-                    return (List) parent.getMediator().getChildren();
-                }
-            };
-        }
-
-        @Override
-        public SubtreeIterator<ParentViewModel> breadthFirstIterator() {
-            return new AbstractBreadthFirstIterator<ParentViewModel>(getView().getViewModel()) {
-
-                @Override
-                List<ParentViewModel> getChildren(ParentViewModel parent) {
-                    return (List) parent.getMediator().getChildren();
-                }
-            };
-        }
     }
 
     private final ObservableList<ChildComponent<?>> modifiableChildren = FXCollections.observableArrayList();

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

@@ -16,6 +16,8 @@
 
 package com.techsenger.mvvm4fx.core;
 
+import java.util.List;
+
 /**
  *
  * @author Pavel Castornii
@@ -27,7 +29,29 @@ public AbstractParentViewModel() {
     }
 
     @Override
-    public ParentMediator getMediator() {
+    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
+    protected ParentMediator getMediator() {
         return (ParentMediator) super.getMediator();
     }
 }

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

@@ -22,6 +22,4 @@
  */
 public interface ChildViewModel extends ParentViewModel {
 
-    @Override
-    ChildMediator getMediator();
 }

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

@@ -22,5 +22,4 @@
  */
 public interface ComponentViewModel {
 
-    ComponentMediator getMediator();
 }

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

@@ -30,18 +30,4 @@ 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,6 +22,17 @@
  */
 public interface ParentViewModel extends ComponentViewModel {
 
-    @Override
-    ParentMediator getMediator();
+    /**
+     * 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();
 }