Skip to content

Commit ee5c0c6

Browse files
committed
formatting fixes
1 parent b641858 commit ee5c0c6

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/Command.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,8 @@ public SequentialCommandGroup andThen(Command... next) {
288288
}
289289

290290
/**
291-
* Creates a new command that runs this command and the deadline in parallel, finishing
292-
* (and interrupting this command) when the deadline finishes.
291+
* Creates a new command that runs this command and the deadline in parallel, finishing (and
292+
* interrupting this command) when the deadline finishes.
293293
*
294294
* <p>Note: This decorator works by adding this command to a composition. The command the
295295
* decorator was called on cannot be scheduled independently or be added to a different

wpilibNewCommands/src/main/native/include/frc2/command/Command.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,9 +310,8 @@ class Command : public wpi::Sendable, public wpi::SendableHelper<Command> {
310310
CommandPtr OnlyIf(std::function<bool()> condition) &&;
311311

312312
/**
313-
* Creates a new command that runs this command
314-
* and the deadline in parallel, finishing
315-
* (and interrupting this command) when the deadline finishes.
313+
* Creates a new command that runs this command and the deadline in parallel,
314+
* finishing (and interrupting this command) when the deadline finishes.
316315
*
317316
* @param deadline the deadline of the command group
318317
* @return the decorated command

wpilibNewCommands/src/main/native/include/frc2/command/CommandPtr.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,12 @@ class CommandPtr final {
183183
CommandPtr OnlyIf(std::function<bool()> condition) &&;
184184

185185
/**
186-
* Creates a new command that runs this command
187-
* and the deadline in parallel, finishing when
188-
* the deadline finishes.
186+
* Creates a new command that runs this command and the deadline in parallel,
187+
* finishing (and interrupting this command) when the deadline finishes.
189188
*
190189
* @param deadline the deadline of the command group
191190
* @return the decorated command
191+
* @see DeadlineFor
192192
*/
193193
CommandPtr WithDeadline(CommandPtr&& deadline) &&;
194194

wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandDecoratorTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ void deadlineForOrderTest() {
275275
void withDeadlineTest() {
276276
try (CommandScheduler scheduler = new CommandScheduler()) {
277277
AtomicBoolean finish = new AtomicBoolean(false);
278-
278+
279279
Command endsBeforeGroup = Commands.none().withDeadline(Commands.waitUntil(finish::get));
280280
scheduler.schedule(endsBeforeGroup);
281281
scheduler.run();
@@ -284,7 +284,7 @@ void withDeadlineTest() {
284284
scheduler.run();
285285
assertFalse(scheduler.isScheduled(endsBeforeGroup));
286286
finish.set(false);
287-
287+
288288
Command endsAfterGroup = Commands.idle().withDeadline(Commands.waitUntil(finish::get));
289289
scheduler.schedule(endsAfterGroup);
290290
scheduler.run();

0 commit comments

Comments
 (0)