update java datalog package

wpilibsuite · Jan 9, 2025 · 50ee0b4 · 50ee0b4
1 parent 8669810
commit 50ee0b4
Show file tree

Hide file tree

Showing 30 changed files with 53 additions and 53 deletions.
diff --git a/epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/FileBackend.java b/epilogue-runtime/src/main/java/edu/wpi/first/epilogue/logging/FileBackend.java
@@ -6,21 +6,21 @@
 
 import static edu.wpi.first.util.ErrorMessages.requireNonNullParam;
 
-import edu.wpi.first.util.datalog.BooleanArrayLogEntry;
-import edu.wpi.first.util.datalog.BooleanLogEntry;
-import edu.wpi.first.util.datalog.DataLog;
-import edu.wpi.first.util.datalog.DataLogEntry;
-import edu.wpi.first.util.datalog.DoubleArrayLogEntry;
-import edu.wpi.first.util.datalog.DoubleLogEntry;
-import edu.wpi.first.util.datalog.FloatArrayLogEntry;
-import edu.wpi.first.util.datalog.FloatLogEntry;
-import edu.wpi.first.util.datalog.IntegerArrayLogEntry;
-import edu.wpi.first.util.datalog.IntegerLogEntry;
-import edu.wpi.first.util.datalog.RawLogEntry;
-import edu.wpi.first.util.datalog.StringArrayLogEntry;
-import edu.wpi.first.util.datalog.StringLogEntry;
-import edu.wpi.first.util.datalog.StructArrayLogEntry;
-import edu.wpi.first.util.datalog.StructLogEntry;
+import edu.wpi.first.datalog.BooleanArrayLogEntry;
+import edu.wpi.first.datalog.BooleanLogEntry;
+import edu.wpi.first.datalog.DataLog;
+import edu.wpi.first.datalog.DataLogEntry;
+import edu.wpi.first.datalog.DoubleArrayLogEntry;
+import edu.wpi.first.datalog.DoubleLogEntry;
+import edu.wpi.first.datalog.FloatArrayLogEntry;
+import edu.wpi.first.datalog.FloatLogEntry;
+import edu.wpi.first.datalog.IntegerArrayLogEntry;
+import edu.wpi.first.datalog.IntegerLogEntry;
+import edu.wpi.first.datalog.RawLogEntry;
+import edu.wpi.first.datalog.StringArrayLogEntry;
+import edu.wpi.first.datalog.StringLogEntry;
+import edu.wpi.first.datalog.StructArrayLogEntry;
+import edu.wpi.first.datalog.StructLogEntry;
 import edu.wpi.first.util.struct.Struct;
 import java.util.HashMap;
 import java.util.Map;

diff --git a/libdatalog/src/main/java/edu/wpi/first/datalog/BooleanArrayLogEntry.java b/libdatalog/src/main/java/edu/wpi/first/datalog/BooleanArrayLogEntry.java
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-package edu.wpi.first.util.datalog;
+package edu.wpi.first.datalog;
 
 import java.util.Arrays;
 

diff --git a/libdatalog/src/main/java/edu/wpi/first/datalog/BooleanLogEntry.java b/libdatalog/src/main/java/edu/wpi/first/datalog/BooleanLogEntry.java
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-package edu.wpi.first.util.datalog;
+package edu.wpi.first.datalog;
 
 /** Log boolean values. */
 public class BooleanLogEntry extends DataLogEntry {

diff --git a/libdatalog/src/main/java/edu/wpi/first/datalog/DataLogBackgroundWriter.java b/libdatalog/src/main/java/edu/wpi/first/datalog/DataLogBackgroundWriter.java
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-package edu.wpi.first.util.datalog;
+package edu.wpi.first.datalog;
 
 /**
  * A data log background writer that periodically flushes the data log on a background thread. The

diff --git a/libdatalog/src/main/java/edu/wpi/first/datalog/DataLogEntry.java b/libdatalog/src/main/java/edu/wpi/first/datalog/DataLogEntry.java
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-package edu.wpi.first.util.datalog;
+package edu.wpi.first.datalog;
 
 /** Log entry base class. */
 public class DataLogEntry {

diff --git a/libdatalog/src/main/java/edu/wpi/first/datalog/DataLogIterator.java b/libdatalog/src/main/java/edu/wpi/first/datalog/DataLogIterator.java
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-package edu.wpi.first.util.datalog;
+package edu.wpi.first.datalog;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;

diff --git a/libdatalog/src/main/java/edu/wpi/first/datalog/DataLogJNI.java b/libdatalog/src/main/java/edu/wpi/first/datalog/DataLogJNI.java
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-package edu.wpi.first.util.datalog;
+package edu.wpi.first.datalog;
 
 import edu.wpi.first.util.WPIUtilJNI;
 import java.io.IOException;

diff --git a/libdatalog/src/main/java/edu/wpi/first/datalog/DataLogReader.java b/libdatalog/src/main/java/edu/wpi/first/datalog/DataLogReader.java
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-package edu.wpi.first.util.datalog;
+package edu.wpi.first.datalog;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;

diff --git a/libdatalog/src/main/java/edu/wpi/first/datalog/DataLogRecord.java b/libdatalog/src/main/java/edu/wpi/first/datalog/DataLogRecord.java
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-package edu.wpi.first.util.datalog;
+package edu.wpi.first.datalog;
 
 import java.nio.BufferUnderflowException;
 import java.nio.ByteBuffer;

diff --git a/libdatalog/src/main/java/edu/wpi/first/datalog/DataLogWriter.java b/libdatalog/src/main/java/edu/wpi/first/datalog/DataLogWriter.java
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-package edu.wpi.first.util.datalog;
+package edu.wpi.first.datalog;
 
 import java.io.IOException;
 import java.io.OutputStream;

diff --git a/libdatalog/src/main/java/edu/wpi/first/datalog/DoubleArrayLogEntry.java b/libdatalog/src/main/java/edu/wpi/first/datalog/DoubleArrayLogEntry.java
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-package edu.wpi.first.util.datalog;
+package edu.wpi.first.datalog;
 
 import java.util.Arrays;
 

diff --git a/libdatalog/src/main/java/edu/wpi/first/datalog/DoubleLogEntry.java b/libdatalog/src/main/java/edu/wpi/first/datalog/DoubleLogEntry.java
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-package edu.wpi.first.util.datalog;
+package edu.wpi.first.datalog;
 
 /** Log double values. */
 public class DoubleLogEntry extends DataLogEntry {

diff --git a/libdatalog/src/main/java/edu/wpi/first/datalog/FloatArrayLogEntry.java b/libdatalog/src/main/java/edu/wpi/first/datalog/FloatArrayLogEntry.java
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-package edu.wpi.first.util.datalog;
+package edu.wpi.first.datalog;
 
 import java.util.Arrays;
 

diff --git a/libdatalog/src/main/java/edu/wpi/first/datalog/FloatLogEntry.java b/libdatalog/src/main/java/edu/wpi/first/datalog/FloatLogEntry.java
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-package edu.wpi.first.util.datalog;
+package edu.wpi.first.datalog;
 
 /** Log float values. */
 public class FloatLogEntry extends DataLogEntry {

diff --git a/libdatalog/src/main/java/edu/wpi/first/datalog/IntegerArrayLogEntry.java b/libdatalog/src/main/java/edu/wpi/first/datalog/IntegerArrayLogEntry.java
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-package edu.wpi.first.util.datalog;
+package edu.wpi.first.datalog;
 
 import java.util.Arrays;
 

diff --git a/libdatalog/src/main/java/edu/wpi/first/datalog/IntegerLogEntry.java b/libdatalog/src/main/java/edu/wpi/first/datalog/IntegerLogEntry.java
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-package edu.wpi.first.util.datalog;
+package edu.wpi.first.datalog;
 
 /** Log integer values. */
 public class IntegerLogEntry extends DataLogEntry {

diff --git a/libdatalog/src/main/java/edu/wpi/first/datalog/ProtobufLogEntry.java b/libdatalog/src/main/java/edu/wpi/first/datalog/ProtobufLogEntry.java
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-package edu.wpi.first.util.datalog;
+package edu.wpi.first.datalog;
 
 import edu.wpi.first.util.protobuf.Protobuf;
 import edu.wpi.first.util.protobuf.ProtobufBuffer;

diff --git a/libdatalog/src/main/java/edu/wpi/first/datalog/RawLogEntry.java b/libdatalog/src/main/java/edu/wpi/first/datalog/RawLogEntry.java
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-package edu.wpi.first.util.datalog;
+package edu.wpi.first.datalog;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;

diff --git a/libdatalog/src/main/java/edu/wpi/first/datalog/StringArrayLogEntry.java b/libdatalog/src/main/java/edu/wpi/first/datalog/StringArrayLogEntry.java
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-package edu.wpi.first.util.datalog;
+package edu.wpi.first.datalog;
 
 import java.util.Arrays;
 

diff --git a/libdatalog/src/main/java/edu/wpi/first/datalog/StringLogEntry.java b/libdatalog/src/main/java/edu/wpi/first/datalog/StringLogEntry.java
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-package edu.wpi.first.util.datalog;
+package edu.wpi.first.datalog;
 
 /** Log string values. */
 public class StringLogEntry extends DataLogEntry {

diff --git a/libdatalog/src/main/java/edu/wpi/first/datalog/StructArrayLogEntry.java b/libdatalog/src/main/java/edu/wpi/first/datalog/StructArrayLogEntry.java
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-package edu.wpi.first.util.datalog;
+package edu.wpi.first.datalog;
 
 import edu.wpi.first.util.struct.Struct;
 import edu.wpi.first.util.struct.StructBuffer;

diff --git a/libdatalog/src/main/java/edu/wpi/first/datalog/StructLogEntry.java b/libdatalog/src/main/java/edu/wpi/first/datalog/StructLogEntry.java
@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-package edu.wpi.first.util.datalog;
+package edu.wpi.first.datalog;
 
 import edu.wpi.first.util.struct.Struct;
 import edu.wpi.first.util.struct.StructBuffer;

diff --git a/libdatalog/src/printlog/java/printlog/PrintLog.java b/libdatalog/src/printlog/java/printlog/PrintLog.java
@@ -4,8 +4,8 @@
 
 package printlog;
 
-import edu.wpi.first.util.datalog.DataLogReader;
-import edu.wpi.first.util.datalog.DataLogRecord;
+import edu.wpi.first.datalog.DataLogReader;
+import edu.wpi.first.datalog.DataLogRecord;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;

diff --git a/ntcore/src/generate/main/java/NetworkTableInstance.java.jinja b/ntcore/src/generate/main/java/NetworkTableInstance.java.jinja
@@ -8,7 +8,7 @@ package edu.wpi.first.networktables;
 
 import edu.wpi.first.util.WPIUtilJNI;
 import edu.wpi.first.util.concurrent.Event;
-import edu.wpi.first.util.datalog.DataLog;
+import edu.wpi.first.datalog.DataLog;
 import edu.wpi.first.util.protobuf.Protobuf;
 import edu.wpi.first.util.struct.Struct;
 import java.nio.charset.StandardCharsets;

diff --git a/ntcore/src/generate/main/java/NetworkTablesJNI.java.jinja b/ntcore/src/generate/main/java/NetworkTablesJNI.java.jinja
@@ -7,7 +7,7 @@
 package edu.wpi.first.networktables;
 
 import edu.wpi.first.util.RuntimeLoader;
-import edu.wpi.first.util.datalog.DataLog;
+import edu.wpi.first.datalog.DataLog;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.EnumSet;

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/ntcore/src/generated/main/java/edu/wpi/first/networktables/NetworkTablesJNI.java b/ntcore/src/generated/main/java/edu/wpi/first/networktables/NetworkTablesJNI.java
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DataLogManager.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DataLogManager.java
@@ -11,10 +11,10 @@
 import edu.wpi.first.util.FileLogger;
 import edu.wpi.first.util.WPIUtilJNI;
 import edu.wpi.first.util.concurrent.Event;
-import edu.wpi.first.util.datalog.DataLog;
-import edu.wpi.first.util.datalog.DataLogBackgroundWriter;
-import edu.wpi.first.util.datalog.IntegerLogEntry;
-import edu.wpi.first.util.datalog.StringLogEntry;
+import edu.wpi.first.datalog.DataLog;
+import edu.wpi.first.datalog.DataLogBackgroundWriter;
+import edu.wpi.first.datalog.IntegerLogEntry;
+import edu.wpi.first.datalog.StringLogEntry;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;

diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DriverStation.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DriverStation.java
@@ -16,11 +16,11 @@
 import edu.wpi.first.networktables.StringTopic;
 import edu.wpi.first.util.EventVector;
 import edu.wpi.first.util.WPIUtilJNI;
-import edu.wpi.first.util.datalog.BooleanArrayLogEntry;
-import edu.wpi.first.util.datalog.BooleanLogEntry;
-import edu.wpi.first.util.datalog.DataLog;
-import edu.wpi.first.util.datalog.FloatArrayLogEntry;
-import edu.wpi.first.util.datalog.IntegerArrayLogEntry;
+import edu.wpi.first.datalog.BooleanArrayLogEntry;
+import edu.wpi.first.datalog.BooleanLogEntry;
+import edu.wpi.first.datalog.DataLog;
+import edu.wpi.first.datalog.FloatArrayLogEntry;
+import edu.wpi.first.datalog.IntegerArrayLogEntry;
 import java.nio.ByteBuffer;
 import java.util.Map;
 import java.util.Optional;

diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/sysid/SysIdRoutineLog.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/sysid/SysIdRoutineLog.java
@@ -20,8 +20,8 @@
 import edu.wpi.first.units.measure.LinearAcceleration;
 import edu.wpi.first.units.measure.LinearVelocity;
 import edu.wpi.first.units.measure.Voltage;
-import edu.wpi.first.util.datalog.DoubleLogEntry;
-import edu.wpi.first.util.datalog.StringLogEntry;
+import edu.wpi.first.datalog.DoubleLogEntry;
+import edu.wpi.first.datalog.StringLogEntry;
 import edu.wpi.first.wpilibj.DataLogManager;
 import java.util.HashMap;
 import java.util.Map;