diff --git a/cameraserver/multiCameraServer/BUILD.bazel b/cameraserver/multiCameraServer/BUILD.bazel index 9716e1bb44..bcc2105da5 100644 --- a/cameraserver/multiCameraServer/BUILD.bazel +++ b/cameraserver/multiCameraServer/BUILD.bazel @@ -2,8 +2,8 @@ load("@rules_java//java:defs.bzl", "java_binary") java_binary( name = "multiCameraServer-java", - srcs = ["src/main/java/edu/wpi/Main.java"], - main_class = "edu.wpi.Main", + srcs = ["src/main/java/org/wpilib/Main.java"], + main_class = "org.wpilib.Main", deps = [ "//cameraserver:cameraserver-java", "//cscore:cscore-java", diff --git a/cameraserver/multiCameraServer/build.gradle b/cameraserver/multiCameraServer/build.gradle index 4173396371..3412f0e964 100644 --- a/cameraserver/multiCameraServer/build.gradle +++ b/cameraserver/multiCameraServer/build.gradle @@ -19,7 +19,7 @@ ext { apply from: "${rootDir}/shared/opencv.gradle" application { - mainClass = 'edu.wpi.Main' + mainClass = 'org.wpilib.Main' } apply plugin: 'com.gradleup.shadow' diff --git a/cameraserver/multiCameraServer/src/main/java/edu/wpi/Main.java b/cameraserver/multiCameraServer/src/main/java/org/wpilib/Main.java similarity index 99% rename from cameraserver/multiCameraServer/src/main/java/edu/wpi/Main.java rename to cameraserver/multiCameraServer/src/main/java/org/wpilib/Main.java index 7cad5b4611..0bb8293daf 100644 --- a/cameraserver/multiCameraServer/src/main/java/edu/wpi/Main.java +++ b/cameraserver/multiCameraServer/src/main/java/org/wpilib/Main.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; +package org.wpilib; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/epilogue-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/epilogue-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 517389600e..0a303b352b 100644 --- a/epilogue-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/epilogue-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1 +1 @@ -edu.wpi.first.epilogue.processor.AnnotationProcessor +org.wpilib.epilogue.processor.AnnotationProcessor diff --git a/ntcore/BUILD.bazel b/ntcore/BUILD.bazel index d279e644f5..d57ee8f658 100644 --- a/ntcore/BUILD.bazel +++ b/ntcore/BUILD.bazel @@ -211,8 +211,8 @@ cc_binary( java_binary( name = "DevMain-Java", - srcs = ["src/dev/java/edu/wpi/first/ntcore/DevMain.java"], - main_class = "edu.wpi.first.ntcore.DevMain", + srcs = ["src/dev/java/org/wpilib/networktables/DevMain.java"], + main_class = "org.wpilib.networktables.DevMain", deps = [ "ntcore-java", "//wpiutil:wpiutil-java", diff --git a/ntcore/build.gradle b/ntcore/build.gradle index d4ec0ab3e4..49a1d4a57a 100644 --- a/ntcore/build.gradle +++ b/ntcore/build.gradle @@ -10,7 +10,7 @@ ext { } nativeName = 'ntcore' - devMain = 'edu.wpi.first.ntcore.DevMain' + devMain = 'org.wpilib.networktables.DevMain' generatedSources = "$projectDir/src/generated/main/native/cpp" generatedHeaders = "$projectDir/src/generated/main/native/include" jniSplitSetup = { diff --git a/ntcore/src/dev/java/edu/wpi/first/ntcore/DevMain.java b/ntcore/src/dev/java/org/wpilib/networktables/DevMain.java similarity index 87% rename from ntcore/src/dev/java/edu/wpi/first/ntcore/DevMain.java rename to ntcore/src/dev/java/org/wpilib/networktables/DevMain.java index 8d998e9b1d..c7b834c8ba 100644 --- a/ntcore/src/dev/java/edu/wpi/first/ntcore/DevMain.java +++ b/ntcore/src/dev/java/org/wpilib/networktables/DevMain.java @@ -2,9 +2,8 @@ // 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.ntcore; +package org.wpilib.networktables; -import org.wpilib.networktables.NetworkTablesJNI; import org.wpilib.util.runtime.CombinedRuntimeLoader; public final class DevMain { diff --git a/wpilibj/src/main/java/org/wpilib/opmode/TimesliceRobot.java b/wpilibj/src/main/java/org/wpilib/opmode/TimesliceRobot.java index d9c79d24ac..06d27319a9 100644 --- a/wpilibj/src/main/java/org/wpilib/opmode/TimesliceRobot.java +++ b/wpilibj/src/main/java/org/wpilib/opmode/TimesliceRobot.java @@ -63,8 +63,9 @@ package org.wpilib.opmode; * *

If the robot periodic functions and the controller periodic functions have a lot of scheduling * jitter that cause them to occasionally overlap with later timeslices, consider giving the main - * robot thread a real-time priority using {@link Threads#setCurrentThreadPriority(boolean,int)}. An - * RT priority of 15 is a reasonable choice. + * robot thread a real-time priority using {@link + * org.wpilib.system.Threads#setCurrentThreadPriority(boolean,int)}. An RT priority of 15 is a + * reasonable choice. * *

If you do enable RT though, make sure your periodic functions do not block. If they do, * the operating system will lock up, and you'll have to boot the roboRIO into safe mode and delete diff --git a/wpilibj/src/test/java/edu/wpi/first/math/util/ColorTest.java b/wpilibj/src/test/java/edu/wpi/first/math/util/ColorTest.java deleted file mode 100644 index 2e215fa708..0000000000 --- a/wpilibj/src/test/java/edu/wpi/first/math/util/ColorTest.java +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (c) FIRST and other WPILib contributors. -// 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 org.wpilib.math.util; - -import static org.junit.jupiter.api.Assertions.assertAll; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.params.provider.Arguments.arguments; - -import java.util.stream.Stream; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; -import org.wpilib.util.Color; - -class ColorTest { - private static final double kEpsilon = 1e-3; - - void assertColorMatches(double red, double green, double blue, Color color) { - assertAll( - () -> assertEquals(red, color.red, kEpsilon), - () -> assertEquals(green, color.green, kEpsilon), - () -> assertEquals(blue, color.blue, kEpsilon)); - } - - @ParameterizedTest - @MethodSource("staticColorProvider") - void staticColorTest(double red, double green, double blue, Color color) { - assertColorMatches(red, green, blue, color); - } - - @ParameterizedTest - @MethodSource("staticColorProvider") - void colorEqualsTest(double red, double green, double blue, Color color) { - assertEquals(color, new Color(red, green, blue)); - } - - static Stream staticColorProvider() { - return Stream.of( - arguments(0.0823529412, 0.376470589, 0.7411764706, Color.kDenim), - arguments(0.0, 0.4, 0.7019607844, Color.kFirstBlue), - arguments(0.9294117648, 0.1098039216, 0.1411764706, Color.kFirstRed)); - } -}