move filelogger from wpiutil to datalog (java)

wpilibsuite · Jan 26, 2025 · 80b1ce8 · 80b1ce8
1 parent 5ff89bf
commit 80b1ce8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 23 deletions.
diff --git a/libdatalog/src/main/java/edu/wpi/first/datalog/DataLogJNI.java b/libdatalog/src/main/java/edu/wpi/first/datalog/DataLogJNI.java
@@ -4,13 +4,12 @@
 
 package edu.wpi.first.datalog;
 
+import edu.wpi.first.util.RuntimeLoader;
+import edu.wpi.first.util.WPIUtilJNI;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import edu.wpi.first.util.RuntimeLoader;
-import edu.wpi.first.util.WPIUtilJNI;
-
 /**
  * DataLog wpiutil JNI Functions.
  *
@@ -354,6 +353,24 @@ private static native void appendRawBuffer(
    */
   static native void appendStringArray(long impl, int entry, String[] value, long timestamp);
 
+  /**
+   * Create a native FileLogger. When the specified file is modified, appended data will be appended
+   * to the specified data log.
+   *
+   * @param file path to the file
+   * @param log data log implementation handle
+   * @param key log key to append data to
+   * @return The FileLogger handle.
+   */
+  public static native long createFileLogger(String file, long log, String key);
+
+  /**
+   * Free a native FileLogger. This causes the FileLogger to stop appending data to the log.
+   *
+   * @param fileTail The FileLogger handle.
+   */
+  public static native void freeFileLogger(long fileTail);
+
   /** Utility class. */
   private DataLogJNI() {}
 }
diff --git a/ntcore/src/generate/main/java/NetworkTableInstance.java.jinja b/ntcore/src/generate/main/java/NetworkTableInstance.java.jinja
@@ -6,8 +6,8 @@
 
 package edu.wpi.first.networktables;
 
-import edu.wpi.first.util.WPIUtilJNI;
 import edu.wpi.first.datalog.DataLog;
+import edu.wpi.first.util.WPIUtilJNI;
 import edu.wpi.first.util.concurrent.Event;
 import edu.wpi.first.util.protobuf.Protobuf;
 import edu.wpi.first.util.struct.Struct;

diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/NetworkTableInstance.java b/ntcore/src/generated/main/java/edu/wpi/first/networktables/NetworkTableInstance.java
diff --git a/wpiutil/src/main/java/edu/wpi/first/util/WPIUtilJNI.java b/wpiutil/src/main/java/edu/wpi/first/util/WPIUtilJNI.java
@@ -220,24 +220,6 @@ public static native boolean waitForObjectTimeout(int handle, double timeout)
   public static native int[] waitForObjectsTimeout(int[] handles, double timeout)
       throws InterruptedException;
 
-  /**
-   * Create a native FileLogger. When the specified file is modified, appended data will be appended
-   * to the specified data log.
-   *
-   * @param file path to the file
-   * @param log data log implementation handle
-   * @param key log key to append data to
-   * @return The FileLogger handle.
-   */
-  public static native long createFileLogger(String file, long log, String key);
-
-  /**
-   * Free a native FileLogger. This causes the FileLogger to stop appending data to the log.
-   *
-   * @param fileTail The FileLogger handle.
-   */
-  public static native void freeFileLogger(long fileTail);
-
   /** Utility class. */
   protected WPIUtilJNI() {}
 }