From c11d34b26c192906923b1455de9603a76777f277 Mon Sep 17 00:00:00 2001 From: Prateek Machiraju Date: Tue, 1 Dec 2020 23:52:45 -0500 Subject: [PATCH] [command] Use addCommands in command group templates (#2900) This makes the Java templates consistent with the C++ templates as well as the documentation Co-authored-by: Tyler Veness --- .../ReplaceMeParallelCommandGroup.java | 5 +++-- .../ReplaceMeParallelDeadlineGroup.java | 8 ++++---- .../parallelracegroup/ReplaceMeParallelRaceGroup.java | 6 +++--- .../ReplaceMeSequentialCommandGroup.java | 6 +++--- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/parallelcommandgroup/ReplaceMeParallelCommandGroup.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/parallelcommandgroup/ReplaceMeParallelCommandGroup.java index 92958b3cec..ff4f6e3860 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/parallelcommandgroup/ReplaceMeParallelCommandGroup.java +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/parallelcommandgroup/ReplaceMeParallelCommandGroup.java @@ -17,7 +17,8 @@ public class ReplaceMeParallelCommandGroup extends ParallelCommandGroup { * Creates a new ReplaceMeParallelCommandGroup. */ public ReplaceMeParallelCommandGroup() { - // Add your commands in the super() call, e.g. - // super(new FooCommand(), new BarCommand());super(); + // Add your commands in the addCommands() call, e.g. + // addCommands(new FooCommand(), new BarCommand()); + addCommands(); } } diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/paralleldeadlinegroup/ReplaceMeParallelDeadlineGroup.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/paralleldeadlinegroup/ReplaceMeParallelDeadlineGroup.java index 82c000e824..f2a46b98e1 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/paralleldeadlinegroup/ReplaceMeParallelDeadlineGroup.java +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/paralleldeadlinegroup/ReplaceMeParallelDeadlineGroup.java @@ -18,9 +18,9 @@ public class ReplaceMeParallelDeadlineGroup extends ParallelDeadlineGroup { * Creates a new ReplaceMeParallelDeadlineGroup. */ public ReplaceMeParallelDeadlineGroup() { - // Add your commands in the super() call. Add the deadline first. - super( - new InstantCommand() - ); + // Add the deadline command in the super() call. Add other commands using + // addCommands(). + super(new InstantCommand()); + // addCommands(new FooCommand(), new BarCommand()); } } diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/parallelracegroup/ReplaceMeParallelRaceGroup.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/parallelracegroup/ReplaceMeParallelRaceGroup.java index f710ee4470..aa435084f9 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/parallelracegroup/ReplaceMeParallelRaceGroup.java +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/parallelracegroup/ReplaceMeParallelRaceGroup.java @@ -17,8 +17,8 @@ public class ReplaceMeParallelRaceGroup extends ParallelRaceGroup { * Creates a new ReplaceMeParallelRaceGroup. */ public ReplaceMeParallelRaceGroup() { - // Add your commands in the super() call, e.g. - // super(new FooCommand(), new BarCommand()); - super(); + // Add your commands in the addCommands() call, e.g. + // addCommands(new FooCommand(), new BarCommand()); + addCommands(); } } diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/sequentialcommandgroup/ReplaceMeSequentialCommandGroup.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/sequentialcommandgroup/ReplaceMeSequentialCommandGroup.java index 1038b04fa0..f8c50c115f 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/sequentialcommandgroup/ReplaceMeSequentialCommandGroup.java +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/commands/sequentialcommandgroup/ReplaceMeSequentialCommandGroup.java @@ -17,8 +17,8 @@ public class ReplaceMeSequentialCommandGroup extends SequentialCommandGroup { * Creates a new ReplaceMeSequentialCommandGroup. */ public ReplaceMeSequentialCommandGroup() { - // Add your commands in the super() call, e.g. - // super(new FooCommand(), new BarCommand()); - super(); + // Add your commands in the addCommands() call, e.g. + // addCommands(new FooCommand(), new BarCommand()); + addCommands(); } }