diff --git a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DriverStationDataJNI.java b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DriverStationDataJNI.java index b9334a8737..ee5487b12c 100644 --- a/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DriverStationDataJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/sim/mockdata/DriverStationDataJNI.java @@ -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); diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/CallbackStore.java b/hal/src/main/java/edu/wpi/first/wpilibj/sim/CallbackStore.java index 57939d834c..2697fc13f4 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/CallbackStore.java +++ b/hal/src/main/java/edu/wpi/first/wpilibj/sim/CallbackStore.java @@ -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(); } } } diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/NotifyCallback.java b/hal/src/main/java/edu/wpi/first/wpilibj/sim/NotifyCallback.java index 1742df1803..860bee7a0b 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/NotifyCallback.java +++ b/hal/src/main/java/edu/wpi/first/wpilibj/sim/NotifyCallback.java @@ -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)); diff --git a/hal/src/main/java/edu/wpi/first/wpilibj/sim/SimValue.java b/hal/src/main/java/edu/wpi/first/wpilibj/sim/SimValue.java index 3d8976324a..4b30c9ff53 100644 --- a/hal/src/main/java/edu/wpi/first/wpilibj/sim/SimValue.java +++ b/hal/src/main/java/edu/wpi/first/wpilibj/sim/SimValue.java @@ -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) { diff --git a/hal/src/test/java/edu/wpi/first/hal/sim/AccelerometerSimTest.java b/hal/src/test/java/edu/wpi/first/hal/sim/AccelerometerSimTest.java index 67e7169cbf..98236dd859 100644 --- a/hal/src/test/java/edu/wpi/first/hal/sim/AccelerometerSimTest.java +++ b/hal/src/test/java/edu/wpi/first/hal/sim/AccelerometerSimTest.java @@ -19,8 +19,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; class AccelerometerSimTest { static class TriggeredStore { - public boolean wasTriggered; - public boolean setValue = true; + public boolean m_wasTriggered; + public boolean m_setValue = true; } @Test @@ -32,13 +32,13 @@ class AccelerometerSimTest { TriggeredStore store = new TriggeredStore(); try (CallbackStore cb = sim.registerActiveCallback((s, v) -> { - store.wasTriggered = true; - store.setValue = v.getBoolean(); + store.m_wasTriggered = true; + store.m_setValue = v.getBoolean(); }, false)) { - assertFalse(store.wasTriggered); + assertFalse(store.m_wasTriggered); AccelerometerJNI.setAccelerometerActive(true); - assertTrue(store.wasTriggered); - assertTrue(store.setValue); + assertTrue(store.m_wasTriggered); + assertTrue(store.m_setValue); } } } diff --git a/styleguide/suppressions.xml b/styleguide/suppressions.xml index c2cd3479d0..0c1d9f0c07 100644 --- a/styleguide/suppressions.xml +++ b/styleguide/suppressions.xml @@ -4,7 +4,7 @@ suppressions PUBLIC "-//Puppy Crawl//DTD Suppressions 1.1//EN" "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd"> + checks="(LineLength|EmptyLineSeparator|ParameterName|ImportOrder|AbbreviationAsWordInName|JavadocMethod|NoFinalizer)" />