From f0adb9e37aacc6571c039311846e34d9f0479a4c Mon Sep 17 00:00:00 2001 From: GoToLoop Date: Sat, 9 Jul 2016 22:40:48 -0300 Subject: [PATCH 1/6] extends ControllerInterface< T > Mini-tweaks... --- src/controlP5/ControllerInterface.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/controlP5/ControllerInterface.java b/src/controlP5/ControllerInterface.java index 6a4a355..033aee8 100755 --- a/src/controlP5/ControllerInterface.java +++ b/src/controlP5/ControllerInterface.java @@ -1,5 +1,3 @@ -package controlP5; - /** * controlP5 is a processing gui library. * @@ -25,6 +23,8 @@ package controlP5; * */ +package controlP5; + import processing.core.PApplet; import processing.core.PFont; import processing.core.PGraphics; @@ -35,7 +35,7 @@ import processing.event.KeyEvent; * The ControllerInterface is inherited by all ControllerGroup and Controller classes. * */ -public interface ControllerInterface< T > { +public interface ControllerInterface< T extends ControllerInterface< T > > { @ControlP5.Invisible public void init( ); From 423f3f0dff21ff2be01d05a327f0524d92fc19ee Mon Sep 17 00:00:00 2001 From: GoToLoop Date: Mon, 11 Jul 2016 04:51:10 -0300 Subject: [PATCH 2/6] Update CallbackListener.java @FunctionalInterface --- src/controlP5/CallbackListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controlP5/CallbackListener.java b/src/controlP5/CallbackListener.java index f1399ef..e2eb645 100755 --- a/src/controlP5/CallbackListener.java +++ b/src/controlP5/CallbackListener.java @@ -34,7 +34,7 @@ package controlP5; * @example use/ControlP5callback * @see controlP5.ControlP5#addCallback(CallbackListener) */ -public interface CallbackListener { +@FunctionalInterface public interface CallbackListener { public void controlEvent( CallbackEvent theEvent ); From c61291e963ce0a8107f48e0e21700c50b7bea3a9 Mon Sep 17 00:00:00 2001 From: GoToLoop Date: Mon, 11 Jul 2016 04:53:49 -0300 Subject: [PATCH 3/6] Update CDrawable.java @FunctionalInterface --- src/controlP5/CDrawable.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/controlP5/CDrawable.java b/src/controlP5/CDrawable.java index 9fbe46a..ef52aeb 100755 --- a/src/controlP5/CDrawable.java +++ b/src/controlP5/CDrawable.java @@ -1,5 +1,3 @@ -package controlP5; - /** * controlP5 is a processing gui library. * @@ -25,12 +23,14 @@ package controlP5; * */ +package controlP5; + import processing.core.PGraphics; /** * The CDrawable interface is used to draw controllers, primarily for internal use. */ -public interface CDrawable { +@FunctionalInterface public interface CDrawable { public void draw( PGraphics theGraphics ); From 5956a93812bb0777f2f51f1fbe1eb2e015cad49a Mon Sep 17 00:00:00 2001 From: GoToLoop Date: Mon, 11 Jul 2016 04:55:24 -0300 Subject: [PATCH 4/6] Update ControlKey.java @FunctionalInterface --- src/controlP5/ControlKey.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/controlP5/ControlKey.java b/src/controlP5/ControlKey.java index 81f930e..409b459 100755 --- a/src/controlP5/ControlKey.java +++ b/src/controlP5/ControlKey.java @@ -25,7 +25,8 @@ package controlP5; * */ -public interface ControlKey { +@FunctionalInterface public interface ControlKey { public void keyEvent(); + } From f3dd78f9c9d8996ac04860d0e525f4f4d6567184 Mon Sep 17 00:00:00 2001 From: GoToLoop Date: Mon, 11 Jul 2016 05:14:53 -0300 Subject: [PATCH 5/6] Update ControllerView.java @FunctionalInterface ControllerView< T extends ControllerView< T > > --- src/controlP5/ControllerView.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/controlP5/ControllerView.java b/src/controlP5/ControllerView.java index ca0f9d7..09e40f9 100755 --- a/src/controlP5/ControllerView.java +++ b/src/controlP5/ControllerView.java @@ -1,5 +1,3 @@ -package controlP5; - /** * controlP5 is a processing gui library. * @@ -25,6 +23,8 @@ package controlP5; * */ +package controlP5; + import processing.core.PGraphics; /** @@ -35,7 +35,7 @@ import processing.core.PGraphics; * * @example use/ControlP5customDisplay */ -public interface ControllerView< T > { +@FunctionalInterface public interface ControllerView< T extends ControllerView< T > > { /** * draws your custom controllers. display() will be called by a controller's draw() function and From 333c0f7f2541755be8016ac8d4e6d2aab0b6e4d1 Mon Sep 17 00:00:00 2001 From: GoToLoop Date: Mon, 11 Jul 2016 05:18:03 -0300 Subject: [PATCH 6/6] Update ControlListener.java @FunctionalInterface --- src/controlP5/ControlListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controlP5/ControlListener.java b/src/controlP5/ControlListener.java index ffc622e..df12ef1 100755 --- a/src/controlP5/ControlListener.java +++ b/src/controlP5/ControlListener.java @@ -34,7 +34,7 @@ package controlP5; * * @example use/ControlP5listenerForSingleController */ -public interface ControlListener { +@FunctionalInterface public interface ControlListener { /** * controlEvent is called by controlP5's ControlBroadcaster to inform available listeners about