From c4b8a2505d5770cf84b4411e3a12d57c3318bf76 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Sat, 4 Jul 2020 00:44:37 -0700
Subject: [PATCH] [sim] Add Java wrapper for getProgramStarted (#2566)

Also move SimHooks to wpilibj (to match wpilibc).
---
 .../edu/wpi/first/hal/simulation/SimulatorJNI.java   |  1 +
 hal/src/main/native/sim/jni/SimulatorJNI.cpp         | 12 ++++++++++++
 .../edu/wpi/first/wpilibj}/simulation/SimHooks.java  |  8 +++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)
 rename {hal/src/main/java/edu/wpi/first/hal => wpilibj/src/main/java/edu/wpi/first/wpilibj}/simulation/SimHooks.java (86%)

diff --git a/hal/src/main/java/edu/wpi/first/hal/simulation/SimulatorJNI.java b/hal/src/main/java/edu/wpi/first/hal/simulation/SimulatorJNI.java
index a04d7dd756..0833750192 100644
--- a/hal/src/main/java/edu/wpi/first/hal/simulation/SimulatorJNI.java
+++ b/hal/src/main/java/edu/wpi/first/hal/simulation/SimulatorJNI.java
@@ -13,6 +13,7 @@ public class SimulatorJNI extends JNIWrapper {
   public static native void setRuntimeType(int type);
   public static native void waitForProgramStart();
   public static native void setProgramStarted();
+  public static native boolean getProgramStarted();
   public static native void restartTiming();
   public static native void pauseTiming();
   public static native void resumeTiming();
diff --git a/hal/src/main/native/sim/jni/SimulatorJNI.cpp b/hal/src/main/native/sim/jni/SimulatorJNI.cpp
index 8e2a232ff1..f8ad3ab2a8 100644
--- a/hal/src/main/native/sim/jni/SimulatorJNI.cpp
+++ b/hal/src/main/native/sim/jni/SimulatorJNI.cpp
@@ -146,6 +146,18 @@ Java_edu_wpi_first_hal_simulation_SimulatorJNI_setProgramStarted
   HALSIM_SetProgramStarted();
 }
 
+/*
+ * Class:     edu_wpi_first_hal_simulation_SimulatorJNI
+ * Method:    getProgramStarted
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_edu_wpi_first_hal_simulation_SimulatorJNI_getProgramStarted
+  (JNIEnv*, jclass)
+{
+  return HALSIM_GetProgramStarted();
+}
+
 /*
  * Class:     edu_wpi_first_hal_simulation_SimulatorJNI
  * Method:    restartTiming
diff --git a/hal/src/main/java/edu/wpi/first/hal/simulation/SimHooks.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SimHooks.java
similarity index 86%
rename from hal/src/main/java/edu/wpi/first/hal/simulation/SimHooks.java
rename to wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SimHooks.java
index 4ea18dc78d..6097b47ca8 100644
--- a/hal/src/main/java/edu/wpi/first/hal/simulation/SimHooks.java
+++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SimHooks.java
@@ -5,7 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-package edu.wpi.first.hal.simulation;
+package edu.wpi.first.wpilibj.simulation;
+
+import edu.wpi.first.hal.simulation.SimulatorJNI;
 
 public final class SimHooks {
   private SimHooks() {
@@ -23,6 +25,10 @@ public final class SimHooks {
     SimulatorJNI.setProgramStarted();
   }
 
+  public static boolean getProgramStarted() {
+    return SimulatorJNI.getProgramStarted();
+  }
+
   public static void restartTiming() {
     SimulatorJNI.restartTiming();
   }