SCRIPT namespace replacements

This commit is contained in:
PJ Reiniger
2025-11-07 20:00:05 -05:00
committed by Peter Johnson
parent ae6c043632
commit 9aca8e0fd6
2622 changed files with 22275 additions and 22275 deletions

View File

@@ -17,7 +17,7 @@
#include "wpi/net/WebServer.hpp"
#include "wpi/util/jni_util.hpp"
using namespace wpi::java;
using namespace wpi::util::java;
static JClass serviceDataCls;
static JGlobal<jobjectArray> serviceDataEmptyArray;
@@ -63,7 +63,7 @@ JNIEXPORT void JNICALL
Java_org_wpilib_net_WPINetJNI_addPortForwarder
(JNIEnv* env, jclass, jint port, jstring remoteHost, jint remotePort)
{
wpi::PortForwarder::GetInstance().Add(static_cast<unsigned int>(port),
wpi::net::PortForwarder::GetInstance().Add(static_cast<unsigned int>(port),
JStringRef{env, remoteHost}.str(),
static_cast<unsigned int>(remotePort));
}
@@ -77,7 +77,7 @@ JNIEXPORT void JNICALL
Java_org_wpilib_net_WPINetJNI_removePortForwarder
(JNIEnv* env, jclass, jint port)
{
wpi::PortForwarder::GetInstance().Remove(port);
wpi::net::PortForwarder::GetInstance().Remove(port);
}
/*
@@ -89,7 +89,7 @@ JNIEXPORT void JNICALL
Java_org_wpilib_net_WPINetJNI_startWebServer
(JNIEnv* env, jclass, jint port, jstring path)
{
wpi::WebServer::GetInstance().Start(static_cast<unsigned int>(port),
wpi::net::WebServer::GetInstance().Start(static_cast<unsigned int>(port),
JStringRef{env, path}.str());
}
@@ -102,7 +102,7 @@ JNIEXPORT void JNICALL
Java_org_wpilib_net_WPINetJNI_stopWebServer
(JNIEnv* env, jclass, jint port)
{
wpi::WebServer::GetInstance().Stop(port);
wpi::net::WebServer::GetInstance().Stop(port);
}
/*
@@ -115,13 +115,13 @@ Java_org_wpilib_net_WPINetJNI_createMulticastServiceAnnouncer
(JNIEnv* env, jclass, jstring serviceName, jstring serviceType, jint port,
jobjectArray keys, jobjectArray values)
{
auto& manager = wpi::GetMulticastManager();
auto& manager = wpi::net::GetMulticastManager();
std::scoped_lock lock{manager.mutex};
JStringRef serviceNameRef{env, serviceName};
JStringRef serviceTypeRef{env, serviceType};
wpi::SmallVector<std::pair<std::string, std::string>, 8> txtVec;
wpi::util::SmallVector<std::pair<std::string, std::string>, 8> txtVec;
if (keys != nullptr && values != nullptr) {
size_t keysLen = env->GetArrayLength(keys);
@@ -138,7 +138,7 @@ Java_org_wpilib_net_WPINetJNI_createMulticastServiceAnnouncer
}
}
auto announcer = std::make_unique<wpi::MulticastServiceAnnouncer>(
auto announcer = std::make_unique<wpi::net::MulticastServiceAnnouncer>(
serviceNameRef.str(), serviceTypeRef.str(), port, txtVec);
size_t index = manager.handleIds.emplace_back(1);
@@ -157,7 +157,7 @@ JNIEXPORT void JNICALL
Java_org_wpilib_net_WPINetJNI_freeMulticastServiceAnnouncer
(JNIEnv* env, jclass, jint handle)
{
auto& manager = wpi::GetMulticastManager();
auto& manager = wpi::net::GetMulticastManager();
std::scoped_lock lock{manager.mutex};
manager.announcers[handle] = nullptr;
manager.handleIds.erase(handle);
@@ -172,7 +172,7 @@ JNIEXPORT void JNICALL
Java_org_wpilib_net_WPINetJNI_startMulticastServiceAnnouncer
(JNIEnv* env, jclass, jint handle)
{
auto& manager = wpi::GetMulticastManager();
auto& manager = wpi::net::GetMulticastManager();
std::scoped_lock lock{manager.mutex};
auto& announcer = manager.announcers[handle];
announcer->Start();
@@ -187,7 +187,7 @@ JNIEXPORT void JNICALL
Java_org_wpilib_net_WPINetJNI_stopMulticastServiceAnnouncer
(JNIEnv* env, jclass, jint handle)
{
auto& manager = wpi::GetMulticastManager();
auto& manager = wpi::net::GetMulticastManager();
std::scoped_lock lock{manager.mutex};
auto& announcer = manager.announcers[handle];
announcer->Stop();
@@ -202,7 +202,7 @@ JNIEXPORT jboolean JNICALL
Java_org_wpilib_net_WPINetJNI_getMulticastServiceAnnouncerHasImplementation
(JNIEnv* env, jclass, jint handle)
{
auto& manager = wpi::GetMulticastManager();
auto& manager = wpi::net::GetMulticastManager();
std::scoped_lock lock{manager.mutex};
auto& announcer = manager.announcers[handle];
return announcer->HasImplementation();
@@ -217,12 +217,12 @@ JNIEXPORT jint JNICALL
Java_org_wpilib_net_WPINetJNI_createMulticastServiceResolver
(JNIEnv* env, jclass, jstring serviceType)
{
auto& manager = wpi::GetMulticastManager();
auto& manager = wpi::net::GetMulticastManager();
std::scoped_lock lock{manager.mutex};
JStringRef serviceTypeRef{env, serviceType};
auto resolver =
std::make_unique<wpi::MulticastServiceResolver>(serviceTypeRef.str());
std::make_unique<wpi::net::MulticastServiceResolver>(serviceTypeRef.str());
size_t index = manager.handleIds.emplace_back(2);
@@ -240,7 +240,7 @@ JNIEXPORT void JNICALL
Java_org_wpilib_net_WPINetJNI_freeMulticastServiceResolver
(JNIEnv* env, jclass, jint handle)
{
auto& manager = wpi::GetMulticastManager();
auto& manager = wpi::net::GetMulticastManager();
std::scoped_lock lock{manager.mutex};
manager.resolvers[handle] = nullptr;
manager.handleIds.erase(handle);
@@ -255,7 +255,7 @@ JNIEXPORT void JNICALL
Java_org_wpilib_net_WPINetJNI_startMulticastServiceResolver
(JNIEnv* env, jclass, jint handle)
{
auto& manager = wpi::GetMulticastManager();
auto& manager = wpi::net::GetMulticastManager();
std::scoped_lock lock{manager.mutex};
auto& resolver = manager.resolvers[handle];
resolver->Start();
@@ -270,7 +270,7 @@ JNIEXPORT void JNICALL
Java_org_wpilib_net_WPINetJNI_stopMulticastServiceResolver
(JNIEnv* env, jclass, jint handle)
{
auto& manager = wpi::GetMulticastManager();
auto& manager = wpi::net::GetMulticastManager();
std::scoped_lock lock{manager.mutex};
auto& resolver = manager.resolvers[handle];
resolver->Stop();
@@ -285,7 +285,7 @@ JNIEXPORT jboolean JNICALL
Java_org_wpilib_net_WPINetJNI_getMulticastServiceResolverHasImplementation
(JNIEnv* env, jclass, jint handle)
{
auto& manager = wpi::GetMulticastManager();
auto& manager = wpi::net::GetMulticastManager();
std::scoped_lock lock{manager.mutex};
auto& resolver = manager.resolvers[handle];
return resolver->HasImplementation();
@@ -300,7 +300,7 @@ JNIEXPORT jint JNICALL
Java_org_wpilib_net_WPINetJNI_getMulticastServiceResolverEventHandle
(JNIEnv* env, jclass, jint handle)
{
auto& manager = wpi::GetMulticastManager();
auto& manager = wpi::net::GetMulticastManager();
std::scoped_lock lock{manager.mutex};
auto& resolver = manager.resolvers[handle];
return resolver->GetEventHandle();
@@ -319,8 +319,8 @@ Java_org_wpilib_net_WPINetJNI_getMulticastServiceResolverData
env->GetMethodID(serviceDataCls, "<init>",
"(JILjava/lang/String;Ljava/lang/String;[Ljava/lang/"
"String;[Ljava/lang/String;)V");
auto& manager = wpi::GetMulticastManager();
std::vector<wpi::MulticastServiceResolver::ServiceData> allData;
auto& manager = wpi::net::GetMulticastManager();
std::vector<wpi::net::MulticastServiceResolver::ServiceData> allData;
{
std::scoped_lock lock{manager.mutex};
auto& resolver = manager.resolvers[handle];
@@ -337,8 +337,8 @@ Java_org_wpilib_net_WPINetJNI_getMulticastServiceResolverData
JLocal<jstring> serviceName{env, MakeJString(env, data.serviceName)};
JLocal<jstring> hostName{env, MakeJString(env, data.hostName)};
wpi::SmallVector<std::string_view, 8> keysRef;
wpi::SmallVector<std::string_view, 8> valuesRef;
wpi::util::SmallVector<std::string_view, 8> keysRef;
wpi::util::SmallVector<std::string_view, 8> valuesRef;
size_t index = 0;
for (auto&& txt : data.txt) {