Add more checkstyle checks to simulator code (#1289)

This commit is contained in:
PJ Reiniger
2018-08-24 02:15:29 -04:00
committed by Peter Johnson
parent de212a9dd0
commit 488ba79379
6 changed files with 56 additions and 54 deletions

View File

@@ -7,9 +7,8 @@
package edu.wpi.first.hal.sim.mockdata;
import edu.wpi.first.wpilibj.sim.NotifyCallback;
import edu.wpi.first.wpilibj.hal.JNIWrapper;
import edu.wpi.first.wpilibj.hal.MatchInfoData;
import edu.wpi.first.wpilibj.sim.NotifyCallback;
public class DriverStationDataJNI extends JNIWrapper {
public static native int registerEnabledCallback(NotifyCallback callback, boolean initialNotify);

View File

@@ -21,61 +21,64 @@ public class CallbackStore implements AutoCloseable {
}
public CallbackStore(int index, int uid, CancelCallbackFunc ccf) {
this.cancelType = normalCancel;
this.index = index;
this.uid = uid;
this.cancelCallback = ccf;
this.m_cancelType = kNormalCancel;
this.m_index = index;
this.m_uid = uid;
this.m_cancelCallback = ccf;
}
public CallbackStore(int index, int channel, int uid, CancelCallbackChannelFunc ccf) {
this.cancelType = channelCancel;
this.index = index;
this.uid = uid;
this.channel = channel;
this.cancelCallbackChannel = ccf;
this.m_cancelType = kChannelCancel;
this.m_index = index;
this.m_uid = uid;
this.m_channel = channel;
this.m_cancelCallbackChannel = ccf;
}
public CallbackStore(int uid, CancelCallbackNoIndexFunc ccf) {
this.cancelType = noIndexCancel;
this.uid = uid;
this.cancelCallbackNoIndex = ccf;
this.m_cancelType = kNoIndexCancel;
this.m_uid = uid;
this.m_cancelCallbackNoIndex = ccf;
}
private int index;
private int channel;
private final int uid;
private CancelCallbackFunc cancelCallback;
private CancelCallbackChannelFunc cancelCallbackChannel;
private CancelCallbackNoIndexFunc cancelCallbackNoIndex;
private static final int normalCancel = 0;
private static final int channelCancel = 1;
private static final int noIndexCancel = 2;
private int cancelType;
private int m_index;
private int m_channel;
private final int m_uid;
private CancelCallbackFunc m_cancelCallback;
private CancelCallbackChannelFunc m_cancelCallbackChannel;
private CancelCallbackNoIndexFunc m_cancelCallbackNoIndex;
private static final int kNormalCancel = 0;
private static final int kChannelCancel = 1;
private static final int kNoIndexCancel = 2;
private int m_cancelType;
@Override
public void close() {
switch (cancelType) {
case normalCancel:
cancelCallback.cancel(index, uid);
switch (m_cancelType) {
case kNormalCancel:
m_cancelCallback.cancel(m_index, m_uid);
break;
case channelCancel:
cancelCallbackChannel.cancel(index, channel, uid);
case kChannelCancel:
m_cancelCallbackChannel.cancel(m_index, m_channel, m_uid);
break;
case noIndexCancel:
cancelCallbackNoIndex.cancel(uid);
case kNoIndexCancel:
m_cancelCallbackNoIndex.cancel(m_uid);
break;
default:
assert false;
break;
}
cancelType = -1;
m_cancelType = -1;
}
@Override
protected void finalize() throws Throwable {
try {
if (cancelType >= 0) {
if (m_cancelType >= 0) {
close(); // close open files
}
} finally {
super.finalize();
super.finalize();
}
}
}

View File

@@ -11,7 +11,7 @@ public interface NotifyCallback {
void callback(String name, SimValue value);
default void callbackNative(String name, int type, long value1, double value2) {
switch(type) {
switch (type) {
case 0x01:
callback(name, SimValue.makeBoolean(value1 != 0));
break;
@@ -19,10 +19,10 @@ public interface NotifyCallback {
callback(name, SimValue.makeDouble(value2));
break;
case 0x16:
callback(name, SimValue.makeEnum((int)value1));
callback(name, SimValue.makeEnum((int) value1));
break;
case 0x32:
callback(name, SimValue.makeInt((int)value1));
callback(name, SimValue.makeInt((int) value1));
break;
case 0x64:
callback(name, SimValue.makeLong(value1));

View File

@@ -8,20 +8,20 @@
package edu.wpi.first.wpilibj.sim;
public final class SimValue {
private boolean v_boolean;
private long v_long;
private double v_double;
private boolean m_boolean;
private long m_long;
private double m_double;
private SimValue(boolean b) {
v_boolean = b;
m_boolean = b;
}
private SimValue(double v) {
v_double = v;
m_double = v;
}
private SimValue(long v) {
v_long = v;
m_long = v;
}
private SimValue() {
@@ -29,15 +29,15 @@ public final class SimValue {
}
public boolean getBoolean() {
return v_boolean;
return m_boolean;
}
public long getLong() {
return v_long;
return m_long;
}
public double getDouble() {
return v_double;
return m_double;
}
public static SimValue makeBoolean(boolean value) {