From 2a13dba8ace878c55bdd1cc6e0c712c2896b3ae6 Mon Sep 17 00:00:00 2001 From: Ryan Blue Date: Mon, 10 Oct 2022 11:56:40 -0400 Subject: [PATCH] [wpilib] TrajectoryUtil: Fix ambiguous documentation (NFC) (#4461) --- .../java/edu/wpi/first/math/trajectory/TrajectoryUtil.java | 4 ++-- .../src/main/native/include/frc/trajectory/TrajectoryUtil.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wpimath/src/main/java/edu/wpi/first/math/trajectory/TrajectoryUtil.java b/wpimath/src/main/java/edu/wpi/first/math/trajectory/TrajectoryUtil.java index 5fb2c349ef..2cbba90861 100644 --- a/wpimath/src/main/java/edu/wpi/first/math/trajectory/TrajectoryUtil.java +++ b/wpimath/src/main/java/edu/wpi/first/math/trajectory/TrajectoryUtil.java @@ -68,7 +68,7 @@ public final class TrajectoryUtil { } /** - * Imports a Trajectory from a PathWeaver-style JSON file. + * Imports a Trajectory from a JSON file exported from PathWeaver. * * @param path The path of the json file to import from * @return The trajectory represented by the file. @@ -90,7 +90,7 @@ public final class TrajectoryUtil { } /** - * Deserializes a Trajectory from PathWeaver-style JSON. + * Deserializes a Trajectory from JSON exported from PathWeaver. * * @param json The string containing the serialized JSON * @return the trajectory represented by the JSON diff --git a/wpimath/src/main/native/include/frc/trajectory/TrajectoryUtil.h b/wpimath/src/main/native/include/frc/trajectory/TrajectoryUtil.h index 6e52a09318..3ba882f1ac 100644 --- a/wpimath/src/main/native/include/frc/trajectory/TrajectoryUtil.h +++ b/wpimath/src/main/native/include/frc/trajectory/TrajectoryUtil.h @@ -25,7 +25,7 @@ class WPILIB_DLLEXPORT TrajectoryUtil { static void ToPathweaverJson(const Trajectory& trajectory, std::string_view path); /** - * Imports a Trajectory from a PathWeaver-style JSON file. + * Imports a Trajectory from a JSON file exported from PathWeaver. * * @param path The path of the json file to import from. * @@ -34,7 +34,7 @@ class WPILIB_DLLEXPORT TrajectoryUtil { static Trajectory FromPathweaverJson(std::string_view path); /** - * Deserializes a Trajectory from PathWeaver-style JSON. + * Deserializes a Trajectory from JSON exported from PathWeaver. * * @param trajectory the trajectory to export *