From f611e4d653ce32e378eabb05fa55eb70a29a0d6a Mon Sep 17 00:00:00 2001 From: GoToLoop Date: Sat, 9 Jul 2016 15:44:03 -0300 Subject: [PATCH] Update ControllerList.java __*ControllerInterface< ? extends ControllerInterface< ? >*__ --- src/controlP5/ControllerList.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/controlP5/ControllerList.java b/src/controlP5/ControllerList.java index abbf413..6d1e510 100755 --- a/src/controlP5/ControllerList.java +++ b/src/controlP5/ControllerList.java @@ -32,10 +32,10 @@ import java.util.RandomAccess; * Stores objects of type ControllerInterface and CDrawable, mainly for internal use. */ public class ControllerList implements RandomAccess { - protected final List< ControllerInterface< ? > > controllers = new ArrayList< >( ); + protected final List< ControllerInterface< ? extends ControllerInterface< ? > > > controllers = new ArrayList< >( ); protected final List< CDrawable > drawables = new ArrayList< >( ); - public ControllerList add( final ControllerInterface< ? > theController ) { + public ControllerList add( final ControllerInterface< ? extends ControllerInterface< ? > > theController ) { if ( !contains( theController ) ) synchronized ( controllers ) { controllers.add( theController ); } @@ -49,7 +49,7 @@ public class ControllerList implements RandomAccess { return this; } - public ControllerList remove( final ControllerInterface< ? > theController ) { + public ControllerList remove( final ControllerInterface< ? extends ControllerInterface< ? > > theController ) { if ( !isEmpty( ) ) synchronized ( controllers ) { controllers.remove( theController ); } @@ -77,11 +77,11 @@ public class ControllerList implements RandomAccess { return this; } - public ControllerInterface< ? > get( final int theIndex ) { + public ControllerInterface< ? extends ControllerInterface< ? > > get( final int theIndex ) { return controllers.get( theIndex ); } - public List< ControllerInterface< ? >> get( ) { + public List< ControllerInterface< ? extends ControllerInterface< ? > > > get( ) { return controllers; } @@ -93,7 +93,7 @@ public class ControllerList implements RandomAccess { return drawables; } - public boolean contains( final ControllerInterface< ? > theController ) { + public boolean contains( final ControllerInterface< ? extends ControllerInterface< ? > > theController ) { return controllers.contains( theController ); }