From 2fc60680f436c6f8d66b3c40e1160bcc499b7a12 Mon Sep 17 00:00:00 2001 From: Austin Shalit Date: Tue, 17 Oct 2017 21:47:55 -0700 Subject: [PATCH] Remove RedundantModifiers (#578) --- styleguide/checkstyle.xml | 1 + .../main/java/edu/wpi/first/wpilibj/ADXL345_I2C.java | 2 +- .../main/java/edu/wpi/first/wpilibj/ADXL345_SPI.java | 2 +- .../src/main/java/edu/wpi/first/wpilibj/ADXL362.java | 2 +- .../edu/wpi/first/wpilibj/AnalogTriggerOutput.java | 2 +- .../src/main/java/edu/wpi/first/wpilibj/Counter.java | 2 +- .../main/java/edu/wpi/first/wpilibj/CounterBase.java | 2 +- .../main/java/edu/wpi/first/wpilibj/DriverStation.java | 4 ++-- .../main/java/edu/wpi/first/wpilibj/GenericHID.java | 4 ++-- wpilibj/src/main/java/edu/wpi/first/wpilibj/I2C.java | 2 +- .../edu/wpi/first/wpilibj/InterruptableSensorBase.java | 2 +- .../src/main/java/edu/wpi/first/wpilibj/Joystick.java | 4 ++-- .../src/main/java/edu/wpi/first/wpilibj/Notifier.java | 2 +- .../main/java/edu/wpi/first/wpilibj/PIDController.java | 2 +- .../main/java/edu/wpi/first/wpilibj/RobotDrive.java | 2 +- wpilibj/src/main/java/edu/wpi/first/wpilibj/SPI.java | 2 +- .../main/java/edu/wpi/first/wpilibj/SerialPort.java | 10 +++++----- wpilibj/src/main/java/edu/wpi/first/wpilibj/Timer.java | 2 +- .../wpi/first/wpilibj/command/LinkedListElement.java | 3 --- .../edu/wpi/first/wpilibj/internal/HardwareTimer.java | 2 +- .../first/wpilibj/livewindow/LiveWindowComponent.java | 2 +- .../java/edu/wpi/first/wpilibj/PIDToleranceTest.java | 2 +- .../first/wpilibj/fixtures/MotorEncoderFixture.java | 2 +- .../first/wpilibj/mockhardware/FakeEncoderSource.java | 2 +- 24 files changed, 30 insertions(+), 32 deletions(-) diff --git a/styleguide/checkstyle.xml b/styleguide/checkstyle.xml index 9fd8de97ea..830c3a5462 100644 --- a/styleguide/checkstyle.xml +++ b/styleguide/checkstyle.xml @@ -93,6 +93,7 @@ + diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_I2C.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_I2C.java index b7fc15d91c..6a50bb0235 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_I2C.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_I2C.java @@ -52,7 +52,7 @@ public class ADXL345_I2C extends SensorBase implements Accelerometer, LiveWindow @SuppressWarnings("MemberName") public final byte value; - private Axes(byte value) { + Axes(byte value) { this.value = value; } } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_SPI.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_SPI.java index 99ecbcccd4..dc7964decb 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_SPI.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_SPI.java @@ -54,7 +54,7 @@ public class ADXL345_SPI extends SensorBase implements Accelerometer, LiveWindow @SuppressWarnings("MemberName") public final byte value; - private Axes(byte value) { + Axes(byte value) { this.value = value; } } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL362.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL362.java index 88bba13591..5c266703bf 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL362.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL362.java @@ -50,7 +50,7 @@ public class ADXL362 extends SensorBase implements Accelerometer, LiveWindowSend @SuppressWarnings("MemberName") public final byte value; - private Axes(byte value) { + Axes(byte value) { this.value = value; } } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogTriggerOutput.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogTriggerOutput.java index c94bd9dd1c..36bc8a78ec 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogTriggerOutput.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogTriggerOutput.java @@ -126,7 +126,7 @@ public class AnalogTriggerOutput extends DigitalSource { @SuppressWarnings("MemberName") private final int value; - private AnalogTriggerType(int value) { + AnalogTriggerType(int value) { this.value = value; } } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Counter.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Counter.java index 579b9209e8..3de8c55add 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Counter.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Counter.java @@ -56,7 +56,7 @@ public class Counter extends SensorBase implements CounterBase, LiveWindowSendab @SuppressWarnings("MemberName") public final int value; - private Mode(int value) { + Mode(int value) { this.value = value; } } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/CounterBase.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/CounterBase.java index 702e891d19..fd564cd63b 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/CounterBase.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/CounterBase.java @@ -37,7 +37,7 @@ public interface CounterBase { @SuppressWarnings("MemberName") public final int value; - private EncodingType(int value) { + EncodingType(int value) { this.value = value; } } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DriverStation.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DriverStation.java index 6d5ccaa92f..0b080664d6 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DriverStation.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DriverStation.java @@ -33,7 +33,7 @@ public class DriverStation implements RobotState.Interface { public float[] m_axes; public short m_count; - public HALJoystickAxes(int count) { + HALJoystickAxes(int count) { m_axes = new float[count]; } } @@ -42,7 +42,7 @@ public class DriverStation implements RobotState.Interface { public short[] m_povs; public short m_count; - public HALJoystickPOVs(int count) { + HALJoystickPOVs(int count) { m_povs = new short[count]; } } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/GenericHID.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/GenericHID.java index 6a716f05f4..31fb7e4b9e 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/GenericHID.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/GenericHID.java @@ -40,7 +40,7 @@ public abstract class GenericHID { @SuppressWarnings("MemberName") public final int value; - private HIDType(int value) { + HIDType(int value) { this.value = value; } } @@ -54,7 +54,7 @@ public abstract class GenericHID { @SuppressWarnings("MemberName") public final int value; - private Hand(int value) { + Hand(int value) { this.value = value; } } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/I2C.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/I2C.java index 168b4239c3..3307eba964 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/I2C.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/I2C.java @@ -29,7 +29,7 @@ public class I2C extends SensorBase { @SuppressWarnings("MemberName") public final int value; - private Port(int value) { + Port(int value) { this.value = value; } } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/InterruptableSensorBase.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/InterruptableSensorBase.java index e5c8ad818c..2663156ec9 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/InterruptableSensorBase.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/InterruptableSensorBase.java @@ -23,7 +23,7 @@ public abstract class InterruptableSensorBase extends SensorBase { @SuppressWarnings("MemberName") public final int value; - private WaitResult(int value) { + WaitResult(int value) { this.value = value; } } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Joystick.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Joystick.java index 2abb391201..3017fe34e2 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Joystick.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Joystick.java @@ -35,7 +35,7 @@ public class Joystick extends JoystickBase { @SuppressWarnings("MemberName") public final int value; - private AxisType(int value) { + AxisType(int value) { this.value = value; } } @@ -49,7 +49,7 @@ public class Joystick extends JoystickBase { @SuppressWarnings("MemberName") public final int value; - private ButtonType(int value) { + ButtonType(int value) { this.value = value; } } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Notifier.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Notifier.java index 900576ad3d..937e105cf4 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Notifier.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Notifier.java @@ -37,7 +37,7 @@ public class Notifier { // destructed. private final ReentrantLock m_handlerLock = new ReentrantLock(); - public Process(Runnable run) { + Process(Runnable run) { m_handler = run; m_notifier.set(NotifierJNI.initializeNotifier(this)); } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PIDController.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PIDController.java index ca78e48350..27d7536e1c 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PIDController.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PIDController.java @@ -118,7 +118,7 @@ public class PIDController implements PIDInterface, LiveWindowSendable, Controll private PIDController m_controller; - public PIDTask(PIDController controller) { + PIDTask(PIDController controller) { requireNonNull(controller, "Given PIDController was null"); m_controller = controller; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotDrive.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotDrive.java index e42184eef9..f9bf96f34b 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotDrive.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotDrive.java @@ -37,7 +37,7 @@ public class RobotDrive implements MotorSafety { @SuppressWarnings("MemberName") public final int value; - private MotorType(int value) { + MotorType(int value) { this.value = value; } } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SPI.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SPI.java index ec12f45dde..639ba9a67e 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SPI.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SPI.java @@ -25,7 +25,7 @@ public class SPI extends SensorBase { @SuppressWarnings("MemberName") public int value; - private Port(int value) { + Port(int value) { this.value = value; } } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SerialPort.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SerialPort.java index dcadaea5d4..41d4213769 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SerialPort.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SerialPort.java @@ -35,7 +35,7 @@ public class SerialPort { @SuppressWarnings("MemberName") public int value; - private Port(int value) { + Port(int value) { this.value = value; } } @@ -49,7 +49,7 @@ public class SerialPort { @SuppressWarnings("MemberName") public final int value; - private Parity(int value) { + Parity(int value) { this.value = value; } } @@ -63,7 +63,7 @@ public class SerialPort { @SuppressWarnings("MemberName") public final int value; - private StopBits(int value) { + StopBits(int value) { this.value = value; } } @@ -77,7 +77,7 @@ public class SerialPort { @SuppressWarnings("MemberName") public final int value; - private FlowControl(int value) { + FlowControl(int value) { this.value = value; } } @@ -91,7 +91,7 @@ public class SerialPort { @SuppressWarnings("MemberName") public final int value; - private WriteBufferMode(int value) { + WriteBufferMode(int value) { this.value = value; } } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Timer.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Timer.java index bd120b1168..192131670c 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Timer.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Timer.java @@ -71,7 +71,7 @@ public class Timer { double getMatchTime(); - void delay(final double seconds); + void delay(double seconds); @SuppressWarnings("JavadocMethod") Interface newTimer(); diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/LinkedListElement.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/LinkedListElement.java index 6760eb9434..13e68fba79 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/LinkedListElement.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/LinkedListElement.java @@ -15,9 +15,6 @@ class LinkedListElement { private LinkedListElement m_previous; private Command m_data; - public LinkedListElement() { - } - public void setData(Command newData) { m_data = newData; } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/internal/HardwareTimer.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/internal/HardwareTimer.java index e7676585b0..22188425a6 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/internal/HardwareTimer.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/internal/HardwareTimer.java @@ -65,7 +65,7 @@ public class HardwareTimer implements Timer.StaticInterface { * Create a new timer object. Create a new timer object and reset the time to zero. The timer is * initially not running and must be started. */ - public TimerImpl() { + TimerImpl() { reset(); } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/livewindow/LiveWindowComponent.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/livewindow/LiveWindowComponent.java index 609de88399..14c469bbfd 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/livewindow/LiveWindowComponent.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/livewindow/LiveWindowComponent.java @@ -21,7 +21,7 @@ class LiveWindowComponent { String m_name; boolean m_isSensor; - public LiveWindowComponent(String subsystem, String name, boolean isSensor) { + LiveWindowComponent(String subsystem, String name, boolean isSensor) { m_subsystem = subsystem; m_name = name; m_isSensor = isSensor; diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/PIDToleranceTest.java b/wpilibj/src/test/java/edu/wpi/first/wpilibj/PIDToleranceTest.java index a11332ef19..00c84f870f 100644 --- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/PIDToleranceTest.java +++ b/wpilibj/src/test/java/edu/wpi/first/wpilibj/PIDToleranceTest.java @@ -29,7 +29,7 @@ public class PIDToleranceTest { private class FakeInput implements PIDSource { public double m_val; - public FakeInput() { + FakeInput() { m_val = 0; } diff --git a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/fixtures/MotorEncoderFixture.java b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/fixtures/MotorEncoderFixture.java index 7db19b5073..90173d7bac 100644 --- a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/fixtures/MotorEncoderFixture.java +++ b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/fixtures/MotorEncoderFixture.java @@ -70,7 +70,7 @@ public abstract class MotorEncoderFixture implements */ protected abstract DigitalInput giveDigitalInputB(); - private final void initialize() { + private void initialize() { synchronized (this) { if (!m_initialized) { m_initialized = true; // This ensures it is only initialized once diff --git a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/mockhardware/FakeEncoderSource.java b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/mockhardware/FakeEncoderSource.java index 4b87bbfd12..13f7dbafda 100644 --- a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/mockhardware/FakeEncoderSource.java +++ b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/mockhardware/FakeEncoderSource.java @@ -107,7 +107,7 @@ public class FakeEncoderSource { /** * Common initialization code. */ - private final void initQuadEncoder() { + private void initQuadEncoder() { m_milliSec = 1; m_forward = true; m_task = new QuadEncoderThread(this);