Relocate factory

rzblue · Sep 15, 2023 · dac965d · dac965d
1 parent 86f83f7
commit dac965d
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 32 deletions.
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/Commands.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/Commands.java
@@ -100,18 +100,6 @@ public static Command print(String message) {
     return new PrintCommand(message);
   }
 
-  /**
-   * Constructs a command that schedules the supplied command when initialized, and ends when it is
-   * no longer scheduled.
-   *
-   * @param supplier the command supplier
-   * @return the command
-   * @see ProxyCommand
-   */
-  public static Command deferredProxy(Supplier<Command> supplier) {
-    return new ProxyCommand(supplier);
-  }
-
   // Idling Commands
 
   /**
@@ -163,6 +151,20 @@ public static Command select(Map<Object, Command> commands, Supplier<Object> sel
     return new SelectCommand(commands, selector);
   }
 
+  /**
+   * Constructs a command that schedules the supplied command when initialized, and ends when it is
+   * no longer scheduled.
+   *
+   * @param supplier the command supplier
+   * @return the command
+   * @see ProxyCommand
+   */
+  public static Command deferredProxy(Supplier<Command> supplier) {
+    return new ProxyCommand(supplier);
+  }
+
+  // Command Groups
+
   /**
    * Runs a group of commands in series, one after the other.
    *
@@ -174,8 +176,6 @@ public static Command sequence(Command... commands) {
     return new SequentialCommandGroup(commands);
   }
 
-  // Command Groups
-
   /**
    * Runs a group of commands in series, one after the other. Once the last command ends, the group
    * is restarted.

diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/Commands.h b/wpilibNewCommands/src/main/native/include/frc2/command/Commands.h
@@ -137,24 +137,6 @@ CommandPtr RunEnd(std::function<void()> run, std::function<void()> end,
 [[nodiscard]]
 CommandPtr Print(std::string_view msg);
 
-/**
- * Constructs a command that schedules the supplied command when initialized,
- * and ends when it is no longer scheduled
- *
- * @param supplier the command supplier
- */
-[[nodiscard]]
-CommandPtr DeferredProxy(wpi::unique_function<Command*()> supplier);
-
-/**
- * Constructs a command that schedules the supplied command when initialized,
- * and ends when it is no longer scheduled
- *
- * @param supplier the command supplier
- */
-[[nodiscard]]
-CommandPtr DeferredProxy(wpi::unique_function<CommandPtr()> supplier);
-
 // Idling Commands
 
 /**
@@ -205,6 +187,24 @@ CommandPtr Select(std::function<Key()> selector,
   return SelectCommand(std::move(selector), std::move(vec)).ToPtr();
 }
 
+/**
+ * Constructs a command that schedules the supplied command when initialized,
+ * and ends when it is no longer scheduled
+ *
+ * @param supplier the command supplier
+ */
+[[nodiscard]]
+CommandPtr DeferredProxy(wpi::unique_function<Command*()> supplier);
+
+/**
+ * Constructs a command that schedules the supplied command when initialized,
+ * and ends when it is no longer scheduled
+ *
+ * @param supplier the command supplier
+ */
+[[nodiscard]]
+CommandPtr DeferredProxy(wpi::unique_function<CommandPtr()> supplier);
+
 // Command Groups
 
 namespace impl {