From adb6098353b2e4a7f8d2cb8e78d6587b138f8646 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Tue, 15 May 2018 23:57:24 -0700 Subject: [PATCH] Removed extra newlines after open curly braces (#935) Generated by wpilibsuite/styleguide#115. --- .../java/edu/wpi/first/wpilibj/vision/VisionPipeline.java | 1 - .../main/java/edu/wpi/first/wpilibj/vision/VisionRunner.java | 1 - wpilibj/src/main/java/edu/wpi/first/wpilibj/CounterBase.java | 1 - .../src/main/java/edu/wpi/first/wpilibj/NamedSendable.java | 1 - .../src/main/java/edu/wpi/first/wpilibj/PIDInterface.java | 1 - wpilibj/src/main/java/edu/wpi/first/wpilibj/PIDOutput.java | 1 - wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotDrive.java | 1 - .../src/main/java/edu/wpi/first/wpilibj/buttons/Trigger.java | 5 ----- .../java/edu/wpi/first/wpilibj/command/CommandGroup.java | 1 - .../main/java/edu/wpi/first/wpilibj/command/Scheduler.java | 2 -- .../main/java/edu/wpi/first/wpilibj/util/SortedVector.java | 1 - .../src/test/java/edu/wpi/first/wpilibj/UnitTestUtility.java | 1 - .../edu/wpi/first/wpilibj/templates/commandbased/Robot.java | 1 - .../src/main/java/edu/wpi/first/wpilibj/MockDS.java | 1 - .../src/main/java/edu/wpi/first/wpilibj/PDPTest.java | 1 - .../java/edu/wpi/first/wpilibj/fixtures/ITestFixture.java | 1 - .../wpi/first/wpilibj/mockhardware/FakeEncoderSource.java | 1 - .../src/main/java/edu/wpi/first/wpilibj/test/QuickTest.java | 1 - .../src/main/java/edu/wpi/first/wpilibj/test/TestBench.java | 3 --- 19 files changed, 26 deletions(-) diff --git a/cameraserver/src/main/java/edu/wpi/first/wpilibj/vision/VisionPipeline.java b/cameraserver/src/main/java/edu/wpi/first/wpilibj/vision/VisionPipeline.java index 2dda3f9135..67315a556e 100644 --- a/cameraserver/src/main/java/edu/wpi/first/wpilibj/vision/VisionPipeline.java +++ b/cameraserver/src/main/java/edu/wpi/first/wpilibj/vision/VisionPipeline.java @@ -17,7 +17,6 @@ import org.opencv.core.Mat; * @see VisionThread */ public interface VisionPipeline { - /** * Processes the image input and sets the result objects. * Implementations should make these objects accessible. diff --git a/cameraserver/src/main/java/edu/wpi/first/wpilibj/vision/VisionRunner.java b/cameraserver/src/main/java/edu/wpi/first/wpilibj/vision/VisionRunner.java index 1b6e5f4ab3..bd79573e7e 100644 --- a/cameraserver/src/main/java/edu/wpi/first/wpilibj/vision/VisionRunner.java +++ b/cameraserver/src/main/java/edu/wpi/first/wpilibj/vision/VisionRunner.java @@ -38,7 +38,6 @@ public class VisionRunner

{ */ @FunctionalInterface public interface Listener

{ - /** * Called when the pipeline has run. This shouldn't take much time to run because it will delay * later calls to the pipeline's {@link VisionPipeline#process process} method. Copying the 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 2663fab9b1..9d1d6b72fb 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/CounterBase.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/CounterBase.java @@ -16,7 +16,6 @@ package edu.wpi.first.wpilibj; * before use. */ public interface CounterBase { - /** * The number of edges for the counterbase to increment or decrement on. */ diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/NamedSendable.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/NamedSendable.java index 0d88114c74..ff75e5ef2e 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/NamedSendable.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/NamedSendable.java @@ -16,7 +16,6 @@ import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder; */ @Deprecated public interface NamedSendable extends Sendable { - /** * The name of the subtable. * diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PIDInterface.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PIDInterface.java index b3c3a32257..8b3ee8aa36 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PIDInterface.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PIDInterface.java @@ -9,7 +9,6 @@ package edu.wpi.first.wpilibj; @SuppressWarnings("SummaryJavadoc") public interface PIDInterface extends Controller { - @SuppressWarnings("ParameterName") void setPID(double p, double i, double d); diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PIDOutput.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PIDOutput.java index dd6afbe5aa..0ef9403bda 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PIDOutput.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PIDOutput.java @@ -12,7 +12,6 @@ package edu.wpi.first.wpilibj; */ @FunctionalInterface public interface PIDOutput { - /** * Set the output to the value calculated by PIDController. * 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 9092758e11..b47e3e157e 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotDrive.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotDrive.java @@ -273,7 +273,6 @@ public class RobotDrive implements MotorSafety { * @param squaredInputs Setting this parameter to true decreases the sensitivity at lower speeds */ public void tankDrive(double leftValue, double rightValue, boolean squaredInputs) { - if (!kTank_Reported) { HAL.report(tResourceType.kResourceType_RobotDrive, getNumMotors(), tInstances.kRobotDrive_Tank); diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/Trigger.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/Trigger.java index 6541562a17..ae213b4f64 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/Trigger.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/Trigger.java @@ -52,7 +52,6 @@ public abstract class Trigger extends SendableBase { */ public void whenActive(final Command command) { new ButtonScheduler() { - private boolean m_pressedLast = grab(); @Override @@ -79,7 +78,6 @@ public abstract class Trigger extends SendableBase { */ public void whileActive(final Command command) { new ButtonScheduler() { - private boolean m_pressedLast = grab(); @Override @@ -104,7 +102,6 @@ public abstract class Trigger extends SendableBase { */ public void whenInactive(final Command command) { new ButtonScheduler() { - private boolean m_pressedLast = grab(); @Override @@ -128,7 +125,6 @@ public abstract class Trigger extends SendableBase { */ public void toggleWhenActive(final Command command) { new ButtonScheduler() { - private boolean m_pressedLast = grab(); @Override @@ -156,7 +152,6 @@ public abstract class Trigger extends SendableBase { */ public void cancelWhenActive(final Command command) { new ButtonScheduler() { - private boolean m_pressedLast = grab(); @Override diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/CommandGroup.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/CommandGroup.java index 4cc2ac49da..4e251bc316 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/CommandGroup.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/CommandGroup.java @@ -222,7 +222,6 @@ public class CommandGroup extends Command { } while (m_currentCommandIndex < m_commands.size()) { - if (cmd != null) { if (entry.isTimedOut()) { cmd._cancel(); diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/Scheduler.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/Scheduler.java index 411d74aa7d..f1ee2e4ef6 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/Scheduler.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/Scheduler.java @@ -144,7 +144,6 @@ public class Scheduler extends SendableBase implements Sendable { // Only add if not already in if (!m_commandTable.containsKey(command)) { - // Check that the requirements can be had Enumeration requirements = command.getRequirements(); while (requirements.hasMoreElements()) { @@ -192,7 +191,6 @@ public class Scheduler extends SendableBase implements Sendable { * SmartDashboard

  • Add Commands
  • Add Defaults
    • */ public void run() { - m_runningCommandsChanged = false; if (m_disabled) { diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/util/SortedVector.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/util/SortedVector.java index 999dd4f772..904087d3e6 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/util/SortedVector.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/util/SortedVector.java @@ -17,7 +17,6 @@ public class SortedVector extends Vector { * Interface used to determine the order to place sorted objects. */ public interface Comparator { - /** * Compare the given two objects. * diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/UnitTestUtility.java b/wpilibj/src/test/java/edu/wpi/first/wpilibj/UnitTestUtility.java index b4bdfcb6a6..a7c6f8e668 100644 --- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/UnitTestUtility.java +++ b/wpilibj/src/test/java/edu/wpi/first/wpilibj/UnitTestUtility.java @@ -36,7 +36,6 @@ public final class UnitTestUtility { HLUsageReporting.SetImplementation(new HLUsageReporting.Null()); RobotState.SetImplementation(new MockRobotStateInterface()); Timer.SetImplementation(new Timer.StaticInterface() { - @Override public double getFPGATimestamp() { return System.currentTimeMillis() / 1000.0; diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbased/Robot.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbased/Robot.java index 3474f526f1..01e8f4c6b5 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbased/Robot.java +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/commandbased/Robot.java @@ -48,7 +48,6 @@ public class Robot extends TimedRobot { */ @Override public void disabledInit() { - } @Override diff --git a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/MockDS.java b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/MockDS.java index 155b5d7b3b..0998ee9ed0 100644 --- a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/MockDS.java +++ b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/MockDS.java @@ -27,7 +27,6 @@ public class MockDS { @SuppressWarnings("JavadocMethod") public void start() { - m_thread = new Thread(() -> { DatagramSocket socket; try { diff --git a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/PDPTest.java b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/PDPTest.java index d7acb94503..22e42efcb0 100644 --- a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/PDPTest.java +++ b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/PDPTest.java @@ -96,7 +96,6 @@ public class PDPTest extends AbstractComsSetup { */ @Test public void checkRunningCurrentForSpeedController() throws CANMessageNotFoundException { - /* Set the motor to full forward */ me.getMotor().set(1.0); Timer.delay(2); diff --git a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/fixtures/ITestFixture.java b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/fixtures/ITestFixture.java index ea2b91f357..df797f15bd 100644 --- a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/fixtures/ITestFixture.java +++ b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/fixtures/ITestFixture.java @@ -18,7 +18,6 @@ import edu.wpi.first.wpilibj.test.TestBench; * of a test, and ensuring that future tests will not be affected by the results of a test. */ public interface ITestFixture { - /** * Performs any required setup for this fixture, ensuring that all fixture elements are ready for * testing. 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 742bdac757..934d19d82f 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 @@ -33,7 +33,6 @@ public class FakeEncoderSource { } public void run() { - final DigitalOutput lead; final DigitalOutput lag; diff --git a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/QuickTest.java b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/QuickTest.java index 05953bea95..2f24c64097 100644 --- a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/QuickTest.java +++ b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/QuickTest.java @@ -33,6 +33,5 @@ public class QuickTest extends AbstractComsSetup { @Test public void test() { - } } diff --git a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/TestBench.java b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/TestBench.java index 0f63b0cfb8..39585daf2d 100644 --- a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/TestBench.java +++ b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/TestBench.java @@ -95,7 +95,6 @@ public final class TestBench { * @return a freshly allocated Talon, Encoder pair */ public MotorEncoderFixture getTalonPair() { - MotorEncoderFixture talonPair = new MotorEncoderFixture() { @Override protected Talon giveSpeedController() { @@ -127,7 +126,6 @@ public final class TestBench { * @return a freshly allocated Victor, Encoder pair */ public MotorEncoderFixture getVictorPair() { - MotorEncoderFixture vicPair = new MotorEncoderFixture() { @Override protected Victor giveSpeedController() { @@ -262,7 +260,6 @@ public final class TestBench { @SuppressWarnings("JavadocMethod") public static RelayCrossConnectFixture getRelayCrossConnectFixture() { RelayCrossConnectFixture relay = new RelayCrossConnectFixture() { - @Override protected Relay giveRelay() { return new Relay(0);