Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-24 01:31:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fixed access issues and 'overridableParamatar' misspelling."

Browse Source
This commit is contained in:
Brad Miller (WPI)
2015-06-03 05:45:38 -07:00
committed by Gerrit Code Review
parent 1e4e0bacde 569f02de89
commit 0853dc8e5d
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/InterruptHandlerFunction.java
View File

@@ -18,7 +18,7 @@ import edu.wpi.first.wpilibj.hal.InterruptJNI.InterruptJNIHandlerFunction;
* @param <T> The type of the parameter that should be returned to the the
* method {@link #interruptFired(int, Object)}
*/
public abstract class InterruptHandlerFunction<T>{
public abstract class InterruptHandlerFunction<T> {
/**
* The entry point for the interrupt. When the interrupt fires the
* {@link #apply(int, Object)} method is called.
@@ -26,7 +26,7 @@ public abstract class InterruptHandlerFunction<T>{
* pass a generic object to the interrupt fired method.
* @author Jonathan Leitschuh
*/
private class Function implements InterruptJNIHandlerFunction{
private class Function implements InterruptJNIHandlerFunction {
@SuppressWarnings("unchecked")
@Override
public void apply(int interruptAssertedMask, Object param) {
@@ -38,10 +38,10 @@ public abstract class InterruptHandlerFunction<T>{
/**
* This method is run every time an interrupt is fired.
* @param interruptAssertedMask
* @param param The parameter provided by overriding the {@link #overridableParamater()}
* @param param The parameter provided by overriding the {@link #overridableParameter()}
* method.
*/
abstract void interruptFired(int interruptAssertedMask, T param);
public abstract void interruptFired(int interruptAssertedMask, T param);
/**
@@ -51,7 +51,7 @@ public abstract class InterruptHandlerFunction<T>{
* is run.
* @return The object that should be passed to the interrupt when it runs
*/
public T overridableParamater(){
public T overridableParameter() {
return null;
}
}

2
wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/InterruptableSensorBase.java
View File

@@ -100,7 +100,7 @@ public abstract class InterruptableSensorBase extends SensorBase {
(byte) (getAnalogTriggerForRouting() ? 1 : 0), status.asIntBuffer());
HALUtil.checkStatus(status.asIntBuffer());
setUpSourceEdge(true, false);
InterruptJNI.attachInterruptHandler(m_interrupt, handler.function, handler.overridableParamater(), status.asIntBuffer());
InterruptJNI.attachInterruptHandler(m_interrupt, handler.function, handler.overridableParameter(), status.asIntBuffer());
HALUtil.checkStatus(status.asIntBuffer());
}