HAND FIXES: Fixup java and python compilation

wpilibj/src/main/java/org/wpilib/ExpansionHub.java

@@ -7,6 +7,7 @@ package org.wpilib;
 import org.wpilib.hardware.hal.HAL;
 import org.wpilib.networktables.BooleanSubscriber;
 import org.wpilib.networktables.NetworkTableInstance;
+import org.wpilib.system.SystemServer;
 
 /** This class controls a REV ExpansionHub plugged in over USB to Systemcore. */
 public class ExpansionHub implements AutoCloseable {

wpilibj/src/main/java/org/wpilib/ExpansionHubMotor.java

@@ -15,6 +15,7 @@ import org.wpilib.networktables.DoubleSubscriber;
 import org.wpilib.networktables.IntegerPublisher;
 import org.wpilib.networktables.NetworkTableInstance;
 import org.wpilib.networktables.PubSubOption;
+import org.wpilib.system.SystemServer;
 import org.wpilib.units.measure.Current;
 import org.wpilib.units.measure.Voltage;
 

wpilibj/src/main/java/org/wpilib/ExpansionHubPidConstants.java

@@ -8,6 +8,7 @@ import org.wpilib.networktables.BooleanPublisher;
 import org.wpilib.networktables.DoublePublisher;
 import org.wpilib.networktables.NetworkTableInstance;
 import org.wpilib.networktables.PubSubOption;
+import org.wpilib.system.SystemServer;
 
 /** This class contains PID constants for an ExpansionHub motor. */
 public class ExpansionHubPidConstants {

wpilibj/src/main/java/org/wpilib/ExpansionHubServo.java

@@ -12,6 +12,7 @@ import org.wpilib.networktables.BooleanPublisher;
 import org.wpilib.networktables.IntegerPublisher;
 import org.wpilib.networktables.NetworkTableInstance;
 import org.wpilib.networktables.PubSubOption;
+import org.wpilib.system.SystemServer;
 import org.wpilib.units.measure.Angle;
 import org.wpilib.units.measure.Time;
 

wpilibj/src/main/java/org/wpilib/driverstation/DSControlWord.java

@@ -4,6 +4,7 @@
 
 package org.wpilib.driverstation;
 
+import org.wpilib.driverstation.DriverStation;
 import org.wpilib.hardware.hal.ControlWord;
 
 /** A wrapper around Driver Station control word. */

wpilibj/src/main/java/org/wpilib/driverstation/DriverStation.java

@@ -21,6 +21,7 @@ import org.wpilib.networktables.NetworkTableInstance;
 import org.wpilib.networktables.StringPublisher;
 import org.wpilib.networktables.StringTopic;
 import org.wpilib.util.concurrent.EventVector;
+import org.wpilib.system.Timer;
 import org.wpilib.util.WPIUtilJNI;
 import java.util.Map;
 import java.util.Optional;

wpilibj/src/main/java/org/wpilib/hardware/accelerometer/ADXL345_I2C.java

@@ -4,6 +4,7 @@
 
 package org.wpilib.hardware.accelerometer;
 
+import org.wpilib.hardware.bus.I2C;
 import org.wpilib.hardware.hal.HAL;
 import org.wpilib.hardware.hal.SimDevice;
 import org.wpilib.hardware.hal.SimDouble;

wpilibj/src/main/java/org/wpilib/hardware/accelerometer/AnalogAccelerometer.java

@@ -6,6 +6,7 @@ package org.wpilib.hardware.accelerometer;
 
 import static org.wpilib.util.ErrorMessages.requireNonNullParam;
 
+import org.wpilib.hardware.discrete.AnalogInput;
 import org.wpilib.hardware.hal.HAL;
 import org.wpilib.util.sendable.Sendable;
 import org.wpilib.util.sendable.SendableBuilder;

wpilibj/src/main/java/org/wpilib/hardware/discrete/DigitalInput.java

@@ -4,6 +4,7 @@
 
 package org.wpilib.hardware.discrete;
 
+import org.wpilib.system.SensorUtil;
 import org.wpilib.hardware.hal.DIOJNI;
 import org.wpilib.hardware.hal.HAL;
 import org.wpilib.hardware.hal.SimDevice;

wpilibj/src/main/java/org/wpilib/hardware/discrete/DigitalOutput.java

@@ -4,6 +4,7 @@
 
 package org.wpilib.hardware.discrete;
 
+import org.wpilib.system.SensorUtil;
 import org.wpilib.hardware.hal.DIOJNI;
 import org.wpilib.hardware.hal.HAL;
 import org.wpilib.hardware.hal.SimDevice;

wpilibj/src/main/java/org/wpilib/hardware/discrete/PWM.java

@@ -4,6 +4,7 @@
 
 package org.wpilib.hardware.discrete;
 
+import org.wpilib.system.SensorUtil;
 import org.wpilib.hardware.hal.HAL;
 import org.wpilib.hardware.hal.PWMJNI;
 import org.wpilib.hardware.hal.SimDevice;

wpilibj/src/main/java/org/wpilib/hardware/led/LEDPattern.java

@@ -9,6 +9,8 @@ import static org.wpilib.units.Units.Microsecond;
 import static org.wpilib.units.Units.Microseconds;
 import static org.wpilib.units.Units.Value;
 
+import org.wpilib.driverstation.DriverStation;
+import org.wpilib.system.RobotController;
 import org.wpilib.units.collections.LongToObjectHashMap;
 import org.wpilib.units.measure.Dimensionless;
 import org.wpilib.units.measure.Distance;

wpilibj/src/main/java/org/wpilib/hardware/motor/MotorSafety.java

@@ -4,8 +4,11 @@
 
 package org.wpilib.hardware.motor;
 
+import org.wpilib.driverstation.DriverStation;
 import org.wpilib.hardware.hal.ControlWord;
 import org.wpilib.hardware.hal.DriverStationJNI;
+import org.wpilib.opmode.RobotState;
+import org.wpilib.system.Timer;
 import org.wpilib.util.WPIUtilJNI;
 import java.util.LinkedHashSet;
 import java.util.Set;

wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticHub.java

@@ -4,6 +4,7 @@
 
 package org.wpilib.hardware.pneumatic;
 
+import org.wpilib.system.SensorUtil;
 import org.wpilib.hardware.hal.HAL;
 import org.wpilib.hardware.hal.PortsJNI;
 import org.wpilib.hardware.hal.REVPHFaults;

wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsBase.java

@@ -4,6 +4,8 @@
 
 package org.wpilib.hardware.pneumatic;
 
+import org.wpilib.system.SensorUtil;
+
 /** Interface for pneumatics devices. */
 public interface PneumaticsBase extends AutoCloseable {
   /**

wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsControlModule.java

@@ -4,6 +4,7 @@
 
 package org.wpilib.hardware.pneumatic;
 
+import org.wpilib.system.SensorUtil;
 import org.wpilib.hardware.hal.CTREPCMJNI;
 import org.wpilib.hardware.hal.HAL;
 import org.wpilib.hardware.hal.PortsJNI;

wpilibj/src/main/java/org/wpilib/hardware/range/SharpIR.java

@@ -4,6 +4,7 @@
 
 package org.wpilib.hardware.range;
 
+import org.wpilib.hardware.discrete.AnalogInput;
 import org.wpilib.hardware.hal.HAL;
 import org.wpilib.hardware.hal.SimDevice;
 import org.wpilib.hardware.hal.SimDevice.Direction;

wpilibj/src/main/java/org/wpilib/hardware/rotation/AnalogEncoder.java

@@ -4,11 +4,13 @@
 
 package org.wpilib.hardware.rotation;
 
+import org.wpilib.hardware.discrete.AnalogInput;
 import org.wpilib.hardware.hal.HAL;
 import org.wpilib.hardware.hal.SimDevice;
 import org.wpilib.hardware.hal.SimDevice.Direction;
 import org.wpilib.hardware.hal.SimDouble;
 import org.wpilib.math.util.MathUtil;
+import org.wpilib.system.RobotController;
 import org.wpilib.util.sendable.Sendable;
 import org.wpilib.util.sendable.SendableBuilder;
 import org.wpilib.util.sendable.SendableRegistry;

wpilibj/src/main/java/org/wpilib/hardware/rotation/AnalogPotentiometer.java

@@ -4,6 +4,8 @@
 
 package org.wpilib.hardware.rotation;
 
+import org.wpilib.hardware.discrete.AnalogInput;
+import org.wpilib.system.RobotController;
 import org.wpilib.util.sendable.Sendable;
 import org.wpilib.util.sendable.SendableBuilder;
 import org.wpilib.util.sendable.SendableRegistry;

wpilibj/src/main/java/org/wpilib/hardware/rotation/Encoder.java

@@ -6,6 +6,7 @@ package org.wpilib.hardware.rotation;
 
 import static org.wpilib.util.ErrorMessages.requireNonNullParam;
 
+import org.wpilib.hardware.discrete.CounterBase;
 import org.wpilib.hardware.hal.EncoderJNI;
 import org.wpilib.hardware.hal.HAL;
 import org.wpilib.hardware.hal.SimDevice;

wpilibj/src/main/java/org/wpilib/opmode/IterativeRobotBase.java

@@ -4,10 +4,13 @@
 
 package org.wpilib.opmode;
 
+import org.wpilib.driverstation.DSControlWord;
+import org.wpilib.driverstation.DriverStation;
 import org.wpilib.hardware.hal.DriverStationJNI;
 import org.wpilib.hardware.hal.HAL;
 import org.wpilib.networktables.NetworkTableInstance;
 import org.wpilib.smartdashboard.SmartDashboard;
+import org.wpilib.system.Watchdog;
 
 /**
  * IterativeRobotBase implements a specific type of robot program framework, extending the RobotBase

wpilibj/src/main/java/org/wpilib/opmode/RobotBase.java

@@ -6,6 +6,9 @@ package org.wpilib.opmode;
 
 import org.wpilib.vision.stream.CameraServerShared;
 import org.wpilib.vision.stream.CameraServerSharedStore;
+import org.wpilib.system.Notifier;
+import org.wpilib.system.RuntimeType;
+import org.wpilib.driverstation.DriverStation;
 import org.wpilib.hardware.hal.HAL;
 import org.wpilib.hardware.hal.HALUtil;
 import org.wpilib.math.util.MathShared;
@@ -13,8 +16,9 @@ import org.wpilib.math.util.MathSharedStore;
 import org.wpilib.networktables.MultiSubscriber;
 import org.wpilib.networktables.NetworkTableEvent;
 import org.wpilib.networktables.NetworkTableInstance;
+import org.wpilib.system.Timer;
 import org.wpilib.util.WPIUtilJNI;
-import org.wpilib.util.WPILibVersion;
+import org.wpilib.system.WPILibVersion;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Supplier;
 

wpilibj/src/main/java/org/wpilib/opmode/RobotState.java

@@ -4,6 +4,8 @@
 
 package org.wpilib.opmode;
 
+import org.wpilib.driverstation.DriverStation;
+
 /** Robot state utility functions. */
 public final class RobotState {
   /**

wpilibj/src/main/java/org/wpilib/opmode/TimedRobot.java

@@ -9,6 +9,7 @@ import static org.wpilib.units.Units.Seconds;
 import org.wpilib.hardware.hal.DriverStationJNI;
 import org.wpilib.hardware.hal.HAL;
 import org.wpilib.hardware.hal.NotifierJNI;
+import org.wpilib.system.RobotController;
 import org.wpilib.units.measure.Frequency;
 import org.wpilib.units.measure.Time;
 import java.util.PriorityQueue;

wpilibj/src/main/java/org/wpilib/system/DataLogManager.java

@@ -9,8 +9,10 @@ import org.wpilib.datalog.DataLogBackgroundWriter;
 import org.wpilib.datalog.FileLogger;
 import org.wpilib.datalog.IntegerLogEntry;
 import org.wpilib.datalog.StringLogEntry;
+import org.wpilib.driverstation.DriverStation;
 import org.wpilib.hardware.hal.HAL;
 import org.wpilib.networktables.NetworkTableInstance;
+import org.wpilib.opmode.RobotBase;
 import org.wpilib.util.WPIUtilJNI;
 import org.wpilib.util.concurrent.Event;
 import java.io.File;

wpilibj/src/main/java/org/wpilib/system/Filesystem.java

@@ -5,6 +5,7 @@
 package org.wpilib.system;
 
 import java.io.File;
+import org.wpilib.opmode.RobotBase;
 
 /**
  * Class for interacting with the Filesystem, particularly, interacting with FRC-related paths on

wpilibj/src/main/java/org/wpilib/system/Notifier.java

@@ -7,9 +7,11 @@ package org.wpilib.system;
 import static org.wpilib.units.Units.Seconds;
 import static org.wpilib.util.ErrorMessages.requireNonNullParam;
 
+import org.wpilib.driverstation.DriverStation;
 import org.wpilib.hardware.hal.NotifierJNI;
 import org.wpilib.units.measure.Frequency;
 import org.wpilib.units.measure.Time;
+import org.wpilib.system.RobotController;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.ReentrantLock;
 

wpilibj/src/main/java/org/wpilib/system/Timer.java

@@ -7,6 +7,7 @@ package org.wpilib.system;
 import static org.wpilib.units.Units.Seconds;
 
 import org.wpilib.units.measure.Time;
+import org.wpilib.driverstation.DriverStation;
 
 /**
  * A timer class.

wpilibj/src/main/java/org/wpilib/system/Tracer.java

@@ -7,6 +7,7 @@ package org.wpilib.system;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Consumer;
+import org.wpilib.driverstation.DriverStation;
 
 /**
  * A class for keeping track of how much time it takes for different parts of code to execute. This

wpilibj/src/main/java/org/wpilib/system/Watchdog.java

@@ -6,6 +6,7 @@ package org.wpilib.system;
 
 import static org.wpilib.units.Units.Seconds;
 
+import org.wpilib.driverstation.DriverStation;
 import org.wpilib.hardware.hal.NotifierJNI;
 import org.wpilib.units.measure.Time;
 import java.io.Closeable;

wpilibj/src/main/java/org/wpilib/util/Alert.java

@@ -4,6 +4,7 @@
 
 package org.wpilib.util;
 
+import org.wpilib.system.RobotController;
 import org.wpilib.util.sendable.Sendable;
 import org.wpilib.util.sendable.SendableBuilder;
 import org.wpilib.smartdashboard.SmartDashboard;

wpilibj/src/test/java/org/wpilib/hardware/led/LEDPatternTest.java

@@ -27,6 +27,7 @@ import static org.wpilib.util.Color.kYellow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
+import org.wpilib.system.RobotController;
 import org.wpilib.util.Color;
 import org.wpilib.util.Color8Bit;
 import java.util.Map;

wpilibj/src/test/java/org/wpilib/hardware/rotation/AnalogPotentiometerTest.java

@@ -6,6 +6,7 @@ package org.wpilib.hardware.rotation;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.wpilib.hardware.discrete.AnalogInput;
 import org.wpilib.hardware.hal.HAL;
 import org.wpilib.simulation.AnalogInputSim;
 import org.wpilib.simulation.RoboRioSim;

wpilibj/src/test/java/org/wpilib/system/RobotControllerTest.java

@@ -4,6 +4,8 @@
 
 package org.wpilib.system;
 
+import org.wpilib.UtilityClassTest;
+
 @SuppressWarnings("PMD.TestClassWithoutTestCases")
 class RobotControllerTest extends UtilityClassTest<RobotController> {
   RobotControllerTest() {

wpimath/src/dev/java/org/wpilib/math/DevMain.java

@@ -4,6 +4,8 @@
 
 package org.wpilib.math;
 
+import org.wpilib.math.util.MathUtil;
+
 public final class DevMain {
   /** Main entry point. */
   public static void main(String[] args) {

wpimath/src/main/java/org/wpilib/math/interpolation/InterpolatingMatrixTreeMap.java

@@ -5,6 +5,8 @@
 package org.wpilib.math.interpolation;
 
 import java.util.TreeMap;
+import org.wpilib.math.linalg.Matrix;
+import org.wpilib.math.util.Num;
 
 /**
  * Interpolating Tree Maps are used to get values at points that are not defined by making a guess

wpimath/src/main/java/org/wpilib/math/linalg/DARE.java

@@ -6,6 +6,7 @@ package org.wpilib.math.linalg;
 
 import org.wpilib.math.jni.DAREJNI;
 import org.ejml.simple.SimpleMatrix;
+import org.wpilib.math.util.Num;
 
 /** DARE solver utility functions. */
 public final class DARE {

wpimath/src/main/java/org/wpilib/math/linalg/MatBuilder.java

@@ -6,6 +6,8 @@ package org.wpilib.math.linalg;
 
 import java.util.Objects;
 import org.ejml.simple.SimpleMatrix;
+import org.wpilib.math.util.Nat;
+import org.wpilib.math.util.Num;
 
 /** A class for constructing arbitrary RxC matrices. */
 public final class MatBuilder {

wpimath/src/main/java/org/wpilib/math/linalg/Matrix.java

@@ -8,6 +8,8 @@ import org.wpilib.math.jni.EigenJNI;
 import org.wpilib.math.numbers.N1;
 import org.wpilib.math.linalg.proto.MatrixProto;
 import org.wpilib.math.linalg.struct.MatrixStruct;
+import org.wpilib.math.util.Nat;
+import org.wpilib.math.util.Num;
 import org.wpilib.util.protobuf.Protobuf;
 import org.wpilib.util.protobuf.ProtobufSerializable;
 import org.wpilib.util.struct.Struct;

wpimath/src/main/java/org/wpilib/math/linalg/VecBuilder.java

@@ -14,6 +14,8 @@ import org.wpilib.math.numbers.N6;
 import org.wpilib.math.numbers.N7;
 import org.wpilib.math.numbers.N8;
 import org.wpilib.math.numbers.N9;
+import org.wpilib.math.util.Nat;
+import org.wpilib.math.util.Num;
 import java.util.Objects;
 import org.ejml.simple.SimpleMatrix;
 

wpimath/src/main/java/org/wpilib/math/linalg/Vector.java

@@ -8,6 +8,8 @@ import org.wpilib.math.numbers.N1;
 import org.wpilib.math.numbers.N3;
 import org.wpilib.math.linalg.proto.VectorProto;
 import org.wpilib.math.linalg.struct.VectorStruct;
+import org.wpilib.math.util.Nat;
+import org.wpilib.math.util.Num;
 import org.wpilib.util.protobuf.Protobuf;
 import org.wpilib.util.protobuf.ProtobufSerializable;
 import org.wpilib.util.struct.Struct;

wpimath/src/main/java/org/wpilib/math/util/MathUtil.java

@@ -6,6 +6,7 @@ package org.wpilib.math.util;
 
 import org.wpilib.math.geometry.Translation2d;
 import org.wpilib.math.geometry.Translation3d;
+import org.wpilib.math.linalg.Vector;
 
 /** Math utility functions. */
 public final class MathUtil {

wpimath/src/main/java/org/wpilib/math/util/StateSpaceUtil.java

@@ -6,6 +6,8 @@ package org.wpilib.math.util;
 
 import org.wpilib.math.geometry.Pose2d;
 import org.wpilib.math.jni.StateSpaceUtilJNI;
+import org.wpilib.math.linalg.Matrix;
+import org.wpilib.math.linalg.VecBuilder;
 import org.wpilib.math.numbers.N1;
 import org.wpilib.math.numbers.N3;
 import org.wpilib.math.numbers.N4;

wpimath/src/test/java/org/wpilib/math/linalg/DARETest.java

@@ -11,6 +11,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import org.wpilib.UtilityClassTest;
 import org.ejml.simple.SimpleMatrix;
 import org.junit.jupiter.api.Test;
+import org.wpilib.math.util.Nat;
+import org.wpilib.math.util.Num;
 
 class DARETest extends UtilityClassTest<DARE> {
   DARETest() {

wpimath/src/test/java/org/wpilib/math/linalg/MatrixTest.java

@@ -12,6 +12,7 @@ import org.wpilib.math.numbers.N1;
 import org.wpilib.math.numbers.N2;
 import org.wpilib.math.numbers.N3;
 import org.wpilib.math.numbers.N4;
+import org.wpilib.math.util.Nat;
 import org.ejml.data.SingularMatrixException;
 import org.junit.jupiter.api.Test;
 

wpimath/src/test/java/org/wpilib/math/util/MathUtilTest.java

@@ -12,6 +12,7 @@ import org.wpilib.math.geometry.Translation2d;
 import org.wpilib.math.geometry.Translation3d;
 import org.wpilib.UtilityClassTest;
 import org.junit.jupiter.api.Test;
+import org.wpilib.math.linalg.VecBuilder;
 
 class MathUtilTest extends UtilityClassTest<MathUtil> {
   MathUtilTest() {

wpimath/src/test/java/org/wpilib/math/util/StateSpaceUtilTest.java

@@ -10,6 +10,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.wpilib.math.geometry.Pose2d;
 import org.wpilib.math.geometry.Rotation2d;
+import org.wpilib.math.linalg.MatBuilder;
+import org.wpilib.math.linalg.Matrix;
+import org.wpilib.math.linalg.VecBuilder;
 import org.wpilib.math.numbers.N1;
 import org.wpilib.math.numbers.N2;
 import org.wpilib.UtilityClassTest;

wpiutil/src/dev/java/org/wpilib/util/DevMain.java

@@ -4,6 +4,8 @@
 
 package org.wpilib.util;
 
+import org.wpilib.util.runtime.CombinedRuntimeLoader;
+
 public final class DevMain {
   /** Main entry point. */
   public static void main(String[] args) {

wpiutil/src/main/java/org/wpilib/util/WPIUtilJNI.java

@@ -7,6 +7,7 @@ package org.wpilib.util;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.concurrent.atomic.AtomicBoolean;
+import org.wpilib.util.runtime.RuntimeLoader;
 
 /** WPIUtil JNI. */
 public class WPIUtilJNI {

wpiutil/src/main/java/org/wpilib/util/concurrent/EventVector.java

@@ -7,6 +7,7 @@ package org.wpilib.util.concurrent;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.locks.ReentrantLock;
+import org.wpilib.util.WPIUtilJNI;
 
 /** A thread-safe container for handling events. */
 public class EventVector {

wpiutil/src/main/native/cpp/jni/WPIUtilJNI.cpp

@@ -32,7 +32,7 @@ static const JExceptionInit exceptions[] = {
     {"java/lang/InterruptedException", &interruptedEx},
     {"java/io/IOException", &ioEx},
     {"java/lang/NullPointerException", &nullPointerEx},
-    {"org/wpilib/util/MsvcRuntimeException", &msvcRuntimeEx}};
+    {"org/wpilib/util/runtime/MsvcRuntimeException", &msvcRuntimeEx}};
 
 void wpi::ThrowIllegalArgumentException(JNIEnv* env, std::string_view msg) {
   illegalArgEx.Throw(env, msg);