java

Signed-off-by: Jade Turner <[email protected]>
wpilibsuite · Nov 7, 2024 · b130e4a · b130e4a
1 parent 98b2b51
commit b130e4a
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 17 deletions.
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/DriverStation.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/DriverStation.java
@@ -1152,7 +1152,7 @@ public static AllianceStationID getRawAllianceStation() {
    * @return true if connected, false if timeout
    */
   public static boolean waitForDsConnection(double timeoutSeconds) {
-    int event = WPIUtilJNI.createEvent(true, false);
+    int event = WPIUtilJNI.makeEvent(true, false);
     DriverStationJNI.provideNewDataEventHandle(event);
     boolean result;
     try {

diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/MotorSafety.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/MotorSafety.java
@@ -31,7 +31,7 @@ public abstract class MotorSafety {
 
   @SuppressWarnings("PMD.AssignmentInOperand")
   private static void threadMain() {
-    int event = WPIUtilJNI.createEvent(false, false);
+    int event = WPIUtilJNI.makeEvent(false, false);
     DriverStationJNI.provideNewDataEventHandle(event);
     ControlWord controlWord = new ControlWord();
 

diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/internal/DriverStationModeThread.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/internal/DriverStationModeThread.java
@@ -27,7 +27,7 @@ public DriverStationModeThread() {
   }
 
   private void run() {
-    int handle = WPIUtilJNI.createEvent(false, false);
+    int handle = WPIUtilJNI.makeEvent(false, false);
     DriverStationJNI.provideNewDataEventHandle(handle);
 
     while (m_keepAlive.get()) {

diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DriverStationSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DriverStationSim.java
@@ -285,7 +285,7 @@ public static void setMatchTime(double matchTime) {
 
   /** Updates DriverStation data so that new values are visible to the user program. */
   public static void notifyNewData() {
-    int handle = WPIUtilJNI.createEvent(false, false);
+    int handle = WPIUtilJNI.makeEvent(false, false);
     DriverStationJNI.provideNewDataEventHandle(handle);
     DriverStationDataJNI.notifyNewData();
     try {

diff --git a/...jExamples/src/main/java/edu/wpi/first/wpilibj/templates/educational/EducationalRobot.java b/...jExamples/src/main/java/edu/wpi/first/wpilibj/templates/educational/EducationalRobot.java
@@ -36,7 +36,7 @@ public void test() {
   public void startCompetition() {
     DriverStationModeThread modeThread = new DriverStationModeThread();
 
-    int event = WPIUtilJNI.createEvent(false, false);
+    int event = WPIUtilJNI.makeEvent(false, false);
 
     DriverStation.provideRefreshedDataEventHandle(event);
 

diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/robotbaseskeleton/Robot.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/robotbaseskeleton/Robot.java
@@ -31,7 +31,7 @@ public void test() {}
   public void startCompetition() {
     DriverStationModeThread modeThread = new DriverStationModeThread();
 
-    int event = WPIUtilJNI.createEvent(false, false);
+    int event = WPIUtilJNI.makeEvent(false, false);
 
     DriverStation.provideRefreshedDataEventHandle(event);
 

diff --git a/...mples/src/main/java/edu/wpi/first/wpilibj/templates/romieducational/EducationalRobot.java b/...mples/src/main/java/edu/wpi/first/wpilibj/templates/romieducational/EducationalRobot.java
@@ -36,7 +36,7 @@ public void test() {
   public void startCompetition() {
     DriverStationModeThread modeThread = new DriverStationModeThread();
 
-    int event = WPIUtilJNI.createEvent(false, false);
+    int event = WPIUtilJNI.makeEvent(false, false);
 
     DriverStation.provideRefreshedDataEventHandle(event);
 

diff --git a/...amples/src/main/java/edu/wpi/first/wpilibj/templates/xrpeducational/EducationalRobot.java b/...amples/src/main/java/edu/wpi/first/wpilibj/templates/xrpeducational/EducationalRobot.java
@@ -36,7 +36,7 @@ public void test() {
   public void startCompetition() {
     DriverStationModeThread modeThread = new DriverStationModeThread();
 
-    int event = WPIUtilJNI.createEvent(false, false);
+    int event = WPIUtilJNI.makeEvent(false, false);
 
     DriverStation.provideRefreshedDataEventHandle(event);
 

diff --git a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/DriverStationTest.java b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/DriverStationTest.java
@@ -26,7 +26,7 @@ protected Logger getClassLogger() {
   public void waitForDataTest() {
     long startTime = RobotController.getFPGATime();
 
-    int handle = WPIUtilJNI.createEvent(false, false);
+    int handle = WPIUtilJNI.makeEvent(false, false);
     DriverStationJNI.provideNewDataEventHandle(handle);
 
     // Wait for data 50 times

diff --git a/wpiutil/src/main/java/edu/wpi/first/util/WPIUtilJNI.java b/wpiutil/src/main/java/edu/wpi/first/util/WPIUtilJNI.java
@@ -108,7 +108,7 @@ public static synchronized void forceLoad() throws IOException {
    * @param initialState true to make the event initially in signaled state
    * @return Event handle
    */
-  public static native int createEvent(boolean manualReset, boolean initialState);
+  public static native int makeEvent(boolean manualReset, boolean initialState);
 
   /**
    * Destroys an event. Destruction wakes up any waiters.
@@ -141,7 +141,7 @@ public static synchronized void forceLoad() throws IOException {
    * @param maximumCount maximum value for the semaphore's internal counter
    * @return Semaphore handle
    */
-  public static native int createSemaphore(int initialCount, int maximumCount);
+  public static native int makeSemaphore(int initialCount, int maximumCount);
 
   /**
    * Destroys a semaphore. Destruction wakes up any waiters.

diff --git a/wpiutil/src/main/java/edu/wpi/first/util/concurrent/Event.java b/wpiutil/src/main/java/edu/wpi/first/util/concurrent/Event.java
@@ -22,7 +22,7 @@ public final class Event implements AutoCloseable {
    * @param initialState true to make the event initially in signaled state
    */
   public Event(boolean manualReset, boolean initialState) {
-    m_handle = WPIUtilJNI.createEvent(manualReset, initialState);
+    m_handle = WPIUtilJNI.makeEvent(manualReset, initialState);
   }
 
   /**

diff --git a/wpiutil/src/main/java/edu/wpi/first/util/concurrent/Semaphore.java b/wpiutil/src/main/java/edu/wpi/first/util/concurrent/Semaphore.java
@@ -21,7 +21,7 @@ public final class Semaphore implements AutoCloseable {
    * @param maximumCount maximum value for the semaphore's internal counter
    */
   public Semaphore(int initialCount, int maximumCount) {
-    m_handle = WPIUtilJNI.createSemaphore(initialCount, maximumCount);
+    m_handle = WPIUtilJNI.makeSemaphore(initialCount, maximumCount);
   }
 
   /**

diff --git a/wpiutil/src/main/native/cpp/jni/WPIUtilJNI.cpp b/wpiutil/src/main/native/cpp/jni/WPIUtilJNI.cpp
@@ -162,11 +162,11 @@ Java_edu_wpi_first_util_WPIUtilJNI_getSystemTime
 
 /*
  * Class:     edu_wpi_first_util_WPIUtilJNI
- * Method:    createEvent
+ * Method:    makeEvent
  * Signature: (ZZ)I
  */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_util_WPIUtilJNI_createEvent
+Java_edu_wpi_first_util_WPIUtilJNI_makeEvent
   (JNIEnv*, jclass, jboolean manualReset, jboolean initialState)
 {
   return wpi::MakeEvent(manualReset, initialState);
@@ -210,11 +210,11 @@ Java_edu_wpi_first_util_WPIUtilJNI_resetEvent
 
 /*
  * Class:     edu_wpi_first_util_WPIUtilJNI
- * Method:    createSemaphore
+ * Method:    makeSemaphore
  * Signature: (II)I
  */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_util_WPIUtilJNI_createSemaphore
+Java_edu_wpi_first_util_WPIUtilJNI_makeSemaphore
   (JNIEnv*, jclass, jint initialCount, jint maximumCount)
 {
   return wpi::MakeSemaphore(initialCount, maximumCount);