From d2174850be314c3ddd6d3257fa5360a829bb69ca Mon Sep 17 00:00:00 2001 From: kappa1 Date: Tue, 10 Apr 2012 13:23:08 +0000 Subject: [PATCH] Update ControllerAdapter in util package to reflect new changes in the Controller interface class (should fix broken build) --- src/java/org/lwjgl/input/Controller.java | 4 ++-- src/java/org/lwjgl/input/JInputController.java | 6 +++--- src/java/org/lwjgl/util/input/ControllerAdapter.java | 11 +++++++++++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/java/org/lwjgl/input/Controller.java b/src/java/org/lwjgl/input/Controller.java index e7dbc163..0e62b40f 100644 --- a/src/java/org/lwjgl/input/Controller.java +++ b/src/java/org/lwjgl/input/Controller.java @@ -279,12 +279,12 @@ public interface Controller { * * @param index The rumbler index */ - String getRumblerName(final int index); + String getRumblerName(int index); /** Sets the vibration strength of the specified rumbler * * @param index The index of the rumbler * @param strength The strength to vibrate at */ - void setRumblerStrength(final int index, final float strength); + void setRumblerStrength(int index, float strength); } diff --git a/src/java/org/lwjgl/input/JInputController.java b/src/java/org/lwjgl/input/JInputController.java index dda8c550..f5a341c5 100644 --- a/src/java/org/lwjgl/input/JInputController.java +++ b/src/java/org/lwjgl/input/JInputController.java @@ -89,7 +89,7 @@ class JInputController implements Controller { * @param index The index this controller has been assigned to * @param target The target JInput controller this class is wrapping */ - JInputController(final int index, net.java.games.input.Controller target) { + JInputController(int index, net.java.games.input.Controller target) { this.target = target; this.index = index; @@ -515,11 +515,11 @@ class JInputController implements Controller { return rumblers.length; } - public String getRumblerName(final int index) { + public String getRumblerName(int index) { return rumblers[index].getAxisName(); } - public void setRumblerStrength(final int index, final float strength) { + public void setRumblerStrength(int index, float strength) { rumblers[index].rumble(strength); } diff --git a/src/java/org/lwjgl/util/input/ControllerAdapter.java b/src/java/org/lwjgl/util/input/ControllerAdapter.java index 541e506c..8c1226a6 100644 --- a/src/java/org/lwjgl/util/input/ControllerAdapter.java +++ b/src/java/org/lwjgl/util/input/ControllerAdapter.java @@ -326,4 +326,15 @@ public class ControllerAdapter implements Controller { */ public void setRZAxisDeadZone(float zone) { } + + public int getRumblerCount() { + return 0; + } + + public String getRumblerName(int index) { + return "rumber n/a"; + } + + public void setRumblerStrength(int index, float strength) { + } } \ No newline at end of file