Merge branch 'after-command-factories' of https://github.com/oh-yes-0…

…-fps/allwpilib into after-command-factories

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

@@ -220,13 +220,13 @@ public ParallelRaceGroup onlyWhile(BooleanSupplier condition) {
 
   /**
    * Decorates this command to run once a condition becomes true.
-   * 
+   *
    * <p>Note: This decorator works by adding this command to a composition. The command the
    * decorator was called on cannot be scheduled independently or be added to a different
    * composition (namely, decorators), unless it is manually cleared from the list of composed
    * commands with {@link CommandScheduler#removeComposedCommand(Command)}. The command composition
    * returned from this method can be further decorated without issue.
-   * 
+   *
    * @param condition the condition to wait for
    * @return the decorated command
    */
@@ -238,13 +238,13 @@ public SequentialCommandGroup after(BooleanSupplier condition) {
 
   /**
    * Decorates this command to run after a time delay.
-   * 
+   *
    * <p>Note: This decorator works by adding this command to a composition. The command the
    * decorator was called on cannot be scheduled independently or be added to a different
    * composition (namely, decorators), unless it is manually cleared from the list of composed
    * commands with {@link CommandScheduler#removeComposedCommand(Command)}. The command composition
    * returned from this method can be further decorated without issue.
-   * 
+   *
    * @param seconds the seconds to wait
    * @return the decorated command
    */
@@ -254,13 +254,13 @@ public SequentialCommandGroup afterSeconds(double seconds) {
 
   /**
    * Decorates this command to run after a time delay.
-   * 
+   *
    * <p>Note: This decorator works by adding this command to a composition. The command the
    * decorator was called on cannot be scheduled independently or be added to a different
    * composition (namely, decorators), unless it is manually cleared from the list of composed
    * commands with {@link CommandScheduler#removeComposedCommand(Command)}. The command composition
    * returned from this method can be further decorated without issue.
-   * 
+   *
    * @param time the time to wait
    * @return the decorated command
    */

wpilibNewCommands/src/main/native/cpp/frc2/command/Command.cpp

@@ -84,11 +84,11 @@ CommandPtr Command::OnlyWhile(std::function<bool()> condition) && {
   return std::move(*this).ToPtr().OnlyWhile(std::move(condition));
 }
 
-CommandPtr After(std::function<bool()> condition) && {
+CommandPtr Command::After(std::function<bool()> condition) && {
   return std::move(*this).ToPtr().After(std::move(condition));
 }
 
-CommandPtr AfterTime(units::second_t duration) && {
+CommandPtr Command::AfterTime(units::second_t duration) && {
   return std::move(*this).ToPtr().AfterTime(duration);
 }