Add missing generic parameter to view models

Author: pcastornii

patternfx-core/src/main/java/com/techsenger/patternfx/core/AbstractChildComponent.java

@@ -28,7 +28,7 @@ public abstract class AbstractChildComponent<T extends AbstractChildView<?, ?>>
 
     protected class Mediator extends AbstractParentComponent.Mediator implements ChildMediator {
 
-        private final ReadOnlyObjectWrapper<ParentViewModel> parent = new ReadOnlyObjectWrapper<>();
+        private final ReadOnlyObjectWrapper<ParentViewModel<?>> parent = new ReadOnlyObjectWrapper<>();
 
         private final AbstractChildComponent<?> component = AbstractChildComponent.this;
 
@@ -45,12 +45,12 @@ public Mediator() {
         }
 
         @Override
-        public ReadOnlyObjectProperty<ParentViewModel> parentProperty() {
+        public ReadOnlyObjectProperty<ParentViewModel<?>> parentProperty() {
             return this.parent.getReadOnlyProperty();
         }
 
         @Override
-        public ParentViewModel getParent() {
+        public ParentViewModel<?> getParent() {
             return this.parent.get();
         }
     }

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

@@ -33,9 +33,9 @@ protected class Mediator extends AbstractComponent.Mediator implements ParentMed
 
         private final ListBinder childrenBinder;
 
-        private final ObservableList<ChildViewModel> modifiableChildren = FXCollections.observableArrayList();
+        private final ObservableList<ChildViewModel<?>> modifiableChildren = FXCollections.observableArrayList();
 
-        private final ObservableList<ChildViewModel> children =
+        private final ObservableList<ChildViewModel<?>> children =
                 FXCollections.unmodifiableObservableList(modifiableChildren);
 
         private final AbstractParentComponent<?> component = AbstractParentComponent.this;
@@ -46,29 +46,29 @@ public Mediator() {
         }
 
         @Override
-        public SubtreeIterator<ParentViewModel> depthFirstIterator() {
-            return new AbstractDepthFirstIterator<ParentViewModel>(getView().getViewModel()) {
+        public SubtreeIterator<ParentViewModel<?>> depthFirstIterator() {
+            return new AbstractDepthFirstIterator<ParentViewModel<?>>(getView().getViewModel()) {
 
                 @Override
-                List<ParentViewModel> getChildren(ParentViewModel parent) {
-                    return (List) children;
+                List<ParentViewModel<?>> getChildren(ParentViewModel<?> parent) {
+                    return (List) parent.getMediator().getChildren();
                 }
             };
         }
 
         @Override
-        public SubtreeIterator<ParentViewModel> breadthFirstIterator() {
-            return new AbstractBreadthFirstIterator<ParentViewModel>(getView().getViewModel()) {
+        public SubtreeIterator<ParentViewModel<?>> breadthFirstIterator() {
+            return new AbstractBreadthFirstIterator<ParentViewModel<?>>(getView().getViewModel()) {
 
                 @Override
-                List<ParentViewModel> getChildren(ParentViewModel parent) {
-                    return (List) children;
+                List<ParentViewModel<?>> getChildren(ParentViewModel<?> parent) {
+                    return (List) parent.getMediator().getChildren();
                 }
             };
         }
 
         @Override
-        public ObservableList<ChildViewModel> getChildren() {
+        public ObservableList<ChildViewModel<?>> getChildren() {
             return children;
         }
     }

patternfx-core/src/main/java/com/techsenger/patternfx/core/ChildMediator.java

@@ -30,12 +30,12 @@ public interface ChildMediator extends ParentMediator {
      *
      * @return the property containing the parent component
      */
-    ReadOnlyObjectProperty<ParentViewModel> parentProperty();
+    ReadOnlyObjectProperty<ParentViewModel<?>> parentProperty();
 
     /**
      * Returns the value of {@link #parentProperty()}.
      *
      * @return the parent component, or {@code null} if this component has no parent
      */
-    ParentViewModel getParent();
+    ParentViewModel<?> getParent();
 }

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

@@ -29,19 +29,19 @@ public interface ParentMediator extends ComponentMediator {
      *
      * @return a non-null, unmodifiable observable list of child ViewModels
      */
-    ObservableList<ChildViewModel> getChildren();
+    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();
+    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();
+    SubtreeIterator<ParentViewModel<?>> breadthFirstIterator();
 }