Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ private static <T extends Record> T fromPreferences(
validatePreferenceName(preferenceName);

// TODO: Use Preferences.getNetworkTable() once there is a release of WPILib that includes it.
NetworkTableInstance ntInstance = NetworkTableInstance.getDefault();
NetworkTableInstance ntInstance = Preferences.getNetworkTable().getInstance();
verifyNotRegisteredToAnotherClass(ntInstance, preferenceName, recordClass);

try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

import edu.wpi.first.networktables.NetworkTable;
import edu.wpi.first.networktables.NetworkTableEntry;
import edu.wpi.first.networktables.NetworkTableInstance;
import edu.wpi.first.networktables.NetworkTableType;
import edu.wpi.first.networktables.Topic;
import edu.wpi.first.wpilibj.DataLogManager;
Expand Down Expand Up @@ -173,7 +172,10 @@ public void preferenceNameMapsToOnlyOneRecordType() {

// Assert: topic added under "/PersistedConfiguration", and is not persistent
NetworkTable table =
NetworkTableInstance.getDefault().getTable(REGISTERED_CLASSES_NETWORK_TABLE_KEY);
isolatedPreferences
.getPreferencesTable()
.getInstance()
.getTable(REGISTERED_CLASSES_NETWORK_TABLE_KEY);
NetworkTableEntry entry = table.getEntry(preferenceName);
assertThat(entry.exists()).isTrue();
assertThat(entry.isPersistent()).isFalse();
Expand Down
Loading