From 18e95d99da1886809971a5de4b6e8381a7200f78 Mon Sep 17 00:00:00 2001
From: GoToLoop <GoToLoop@users.noreply.github.com>
Date: Sat, 9 Jul 2016 21:58:45 -0300
Subject: [PATCH] Update ControllerGroup.java

---
 src/controlP5/ControllerGroup.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/controlP5/ControllerGroup.java b/src/controlP5/ControllerGroup.java
index 6c16441..7559b2a 100755
--- a/src/controlP5/ControllerGroup.java
+++ b/src/controlP5/ControllerGroup.java
@@ -37,16 +37,15 @@ import processing.event.KeyEvent;
  * ControllerGroup is an abstract class and is extended by class ControlGroup, Tab, or the ListBox.
  * 
  */
-public abstract class ControllerGroup< T > implements ControllerInterface< T > , 
-						      ControlP5Constants , ControlListener {
+public abstract class ControllerGroup< T extends ControllerInterface< T > >
+		implements ControllerInterface< T > , ControlListener , ControlP5Constants {
 	protected final float[] position = new float[ 2 ];
 	protected final float[] positionBuffer = new float[ 2 ];
 	protected final float[] absolutePosition = new float[ 2 ];
 	protected final ControllerList controllers = new ControllerList( );
 	protected final List< ControlListener > _myControlListener = new ArrayList< >( );
-	// protected ControlWindow _myControlWindow;
 	protected ControlP5 cp5;
-	protected ControllerGroup< ? > _myParent;
+	protected ControllerGroup< ? extends ControllerInterface< ? > > _myParent;
 	protected String _myName;
 	protected int _myId = -1;
 	protected final CColor color = new CColor( );
@@ -105,11 +104,12 @@ public abstract class ControllerGroup< T > implements ControllerInterface< T > ,
 	@ControlP5.Invisible @Override public void init( ) {
 	}
 
-	@ControlP5.Invisible @Override public ControllerInterface< ? > getParent( ) {
+	@ControlP5.Invisible @Override
+	public ControllerInterface< ? extends ControllerInterface< ? > > getParent( ) {
 		return _myParent;
 	}
 
-	void setParent( final ControllerGroup< ? > theParent ) {
+	< U extends ControllerInterface< U > > T setParent( final ControllerGroup< U > theParent ) {
 		if ( _myParent != null && _myParent != this )  _myParent.remove( this );
 		if ( ( _myParent = theParent ) != this )  theParent.add( this );
 		final float x = x( position ) + x( theParent.absolutePosition );
@@ -117,6 +117,7 @@ public abstract class ControllerGroup< T > implements ControllerInterface< T > ,
 		set( absolutePosition , x , y );
 		set( positionBuffer , position );
 		if ( getWindow( ) != null )  setMouseOver( false );
+		return me;
 	}
 
 	public final T setGroup( ControllerGroup< ? > theGroup ) {