Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changes remote_name to remote_ip (#87)

Browse Source 
Was confusing, as remote_name seemed like a name but wasn't.
Also changes remote_ip in the C api to use an NT_String
This commit is contained in:
Thad House
2016-08-07 14:38:20 -07:00
committed by Peter Johnson
parent 0f9f7309e3
commit bc99d341fb
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/lib/NetworkTablesJNI.cpp
View File

@@ -428,9 +428,9 @@ static jobject ToJavaObject(JNIEnv *env, const nt::ConnectionInfo &info) {
env->GetMethodID(connectionInfoCls, "<init>",
"(Ljava/lang/String;Ljava/lang/String;IJI)V");
JavaLocal<jstring> remote_id(env, ToJavaString(env, info.remote_id));
JavaLocal<jstring> remote_name(env, ToJavaString(env, info.remote_name));
JavaLocal<jstring> remote_ip(env, ToJavaString(env, info.remote_ip));
return env->NewObject(connectionInfoCls, constructor, remote_id.obj(),
remote_name.obj(), (jint)info.remote_port,
remote_ip.obj(), (jint)info.remote_port,
(jlong)info.last_update, (jint)info.protocol_version);
}

6
java/src/edu/wpi/first/wpilibj/networktables/ConnectionInfo.java
View File

@@ -2,14 +2,14 @@ package edu.wpi.first.wpilibj.networktables;
public class ConnectionInfo {
public final String remote_id;
public final String remote_name;
public final String remote_ip;
public final int remote_port;
public final long last_update;
public final int protocol_version;
ConnectionInfo(String remote_id, String remote_name, int remote_port, long last_update, int protocol_version) {
ConnectionInfo(String remote_id, String remote_ip, int remote_port, long last_update, int protocol_version) {
this.remote_id = remote_id;
this.remote_name = remote_name;
this.remote_ip = remote_ip;
this.remote_port = remote_port;
this.last_update = last_update;
this.protocol_version = protocol_version;