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

Java: Allow any Number type (not just Double) to be passed to putValue(). (#129)

Browse Source 
Also improve exception message.

Fixes #72.
This commit is contained in:
Peter Johnson
2016-10-21 19:17:50 -07:00
committed by GitHub
parent b8e5258cf3
commit 011ac1fa22
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/src/edu/wpi/first/wpilibj/networktables/NetworkTable.java
View File

@@ -164,10 +164,10 @@ public class NetworkTable implements ITable, IRemote {
return out;
}
public static double[] toNative(Double[] arr) {
public static double[] toNative(Number[] arr) {
double[] out = new double[arr.length];
for (int i = 0; i < arr.length; i++)
out[i] = arr[i];
out[i] = arr[i].doubleValue();
return out;
}
@@ -852,8 +852,8 @@ public class NetworkTable implements ITable, IRemote {
public boolean putValue(String key, Object value) throws IllegalArgumentException {
if (value instanceof Boolean)
return NetworkTablesJNI.putBoolean(pathWithSep + key, ((Boolean)value).booleanValue());
else if (value instanceof Double)
return NetworkTablesJNI.putDouble(pathWithSep + key, ((Double)value).doubleValue());
else if (value instanceof Number)
return NetworkTablesJNI.putDouble(pathWithSep + key, ((Number)value).doubleValue());
else if (value instanceof String)
return NetworkTablesJNI.putString(pathWithSep + key, (String)value);
else if (value instanceof byte[])
@@ -864,8 +864,8 @@ public class NetworkTable implements ITable, IRemote {
return NetworkTablesJNI.putDoubleArray(pathWithSep + key, (double[])value);
else if (value instanceof Boolean[])
return NetworkTablesJNI.putBooleanArray(pathWithSep + key, toNative((Boolean[])value));
else if (value instanceof Double[])
return NetworkTablesJNI.putDoubleArray(pathWithSep + key, toNative((Double[])value));
else if (value instanceof Number[])
return NetworkTablesJNI.putDoubleArray(pathWithSep + key, toNative((Number[])value));
else if (value instanceof String[])
return NetworkTablesJNI.putStringArray(pathWithSep + key, (String[])value);
else if (value instanceof BooleanArray)
@@ -875,7 +875,7 @@ public class NetworkTable implements ITable, IRemote {
else if (value instanceof StringArray)
return NetworkTablesJNI.putStringArray(pathWithSep + key, (String[])((ArrayData)value).getDataArray());
else
throw new IllegalArgumentException(key);
throw new IllegalArgumentException("Value of type " + value.getClass().getName() + " cannot be put into a table");
}
/**