Skip to content

Commit b448d64

Browse files
authored
[wpilibj] Remove useless AutoCloseable implementations (#9344)
Left over from #7773.
1 parent e985b0f commit b448d64

10 files changed

Lines changed: 53 additions & 92 deletions

File tree

wpilibj/src/main/java/org/wpilib/drive/DifferentialDrive.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
* arcadeDrive, or curvatureDrive methods should be called periodically to avoid Motor Safety
5151
* timeouts.
5252
*/
53-
public class DifferentialDrive extends RobotDriveBase implements TelemetryLoggable, AutoCloseable {
53+
public class DifferentialDrive extends RobotDriveBase implements TelemetryLoggable {
5454
private final DoubleConsumer m_leftMotor;
5555
private final DoubleConsumer m_rightMotor;
5656

@@ -121,9 +121,6 @@ public DifferentialDrive(DoubleConsumer leftMotor, DoubleConsumer rightMotor) {
121121
m_rightMotor = rightMotor;
122122
}
123123

124-
@Override
125-
public void close() {}
126-
127124
/**
128125
* Arcade drive method for differential drive platform. The calculated values will be squared to
129126
* decrease sensitivity at low velocities.

wpilibj/src/main/java/org/wpilib/drive/MecanumDrive.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
* <p>{@link org.wpilib.hardware.motor.MotorSafety} is enabled by default. The driveCartesian or
4949
* drivePolar methods should be called periodically to avoid Motor Safety timeouts.
5050
*/
51-
public class MecanumDrive extends RobotDriveBase implements TelemetryLoggable, AutoCloseable {
51+
public class MecanumDrive extends RobotDriveBase implements TelemetryLoggable {
5252
private final DoubleConsumer m_frontLeftMotor;
5353
private final DoubleConsumer m_rearLeftMotor;
5454
private final DoubleConsumer m_frontRightMotor;
@@ -147,9 +147,6 @@ public MecanumDrive(
147147
m_rearRightMotor = rearRightMotor;
148148
}
149149

150-
@Override
151-
public void close() {}
152-
153150
/**
154151
* Drive method for Mecanum platform.
155152
*

wpilibj/src/main/java/org/wpilib/smartdashboard/Field2d.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ public Field2d() {
4242
@Override
4343
public synchronized void close() {
4444
TunableRegistry.remove(this);
45-
for (FieldObject2d obj : m_objects) {
46-
obj.close();
47-
}
4845
}
4946

5047
/**

wpilibj/src/main/java/org/wpilib/smartdashboard/FieldObject2d.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.wpilib.units.measure.Distance;
2020

2121
/** Game field object on a Field2d. */
22-
public class FieldObject2d implements AutoCloseable {
22+
public class FieldObject2d {
2323
private static final TunableConfig POSES_TUNABLE_CONFIG =
2424
TunableConfig.of(TunableOption.GET_ON_CHANGE);
2525

@@ -36,9 +36,6 @@ public class FieldObject2d implements AutoCloseable {
3636
setPoseArray(initialPoses);
3737
}
3838

39-
@Override
40-
public void close() {}
41-
4239
/**
4340
* Set the pose from a Pose object.
4441
*

wpilibj/src/main/java/org/wpilib/smartdashboard/Mechanism2d.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* @see MechanismLigament2d
2323
* @see MechanismRoot2d
2424
*/
25-
public final class Mechanism2d implements TelemetryLoggable, AutoCloseable {
25+
public final class Mechanism2d implements TelemetryLoggable {
2626
private final Map<String, MechanismRoot2d> m_roots;
2727
private final double[] m_dims = new double[2];
2828
private String m_color;
@@ -55,13 +55,6 @@ public Mechanism2d(double width, double height, Color8Bit backgroundColor) {
5555
setBackgroundColor(backgroundColor);
5656
}
5757

58-
@Override
59-
public synchronized void close() {
60-
for (MechanismRoot2d root : m_roots.values()) {
61-
root.close();
62-
}
63-
}
64-
6558
/**
6659
* Get or create a root in this Mechanism2d with the given name and position.
6760
*

wpilibj/src/main/java/org/wpilib/smartdashboard/MechanismObject2d.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*
1919
* @see Mechanism2d
2020
*/
21-
public abstract class MechanismObject2d implements TelemetryLoggable, AutoCloseable {
21+
public abstract class MechanismObject2d implements TelemetryLoggable {
2222
/** Relative to parent. */
2323
private final String m_name;
2424

@@ -33,13 +33,6 @@ protected MechanismObject2d(String name) {
3333
m_name = name;
3434
}
3535

36-
@Override
37-
public synchronized void close() {
38-
for (MechanismObject2d obj : m_objects.values()) {
39-
obj.close();
40-
}
41-
}
42-
4336
/**
4437
* Append a Mechanism object that is based on this one.
4538
*

wpilibj/src/test/java/org/wpilib/smartdashboard/Mechanism2dTest.java

Lines changed: 48 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -34,72 +34,64 @@ public void shutdown() {
3434

3535
@Test
3636
void testCanvas() {
37-
try (var mechanism = new Mechanism2d(5, 10)) {
38-
Telemetry.log("mechanism", mechanism);
39-
assertArrayEquals(
40-
new double[] {5, 10}, m_mock.getLastValue("/mechanism/dims", double[].class));
41-
assertEquals(
42-
"#000020",
43-
m_mock.getLastValue("/mechanism/backgroundColor", LogStringValue.class).value());
37+
var mechanism = new Mechanism2d(5, 10);
38+
Telemetry.log("mechanism", mechanism);
39+
assertArrayEquals(new double[] {5, 10}, m_mock.getLastValue("/mechanism/dims", double[].class));
40+
assertEquals(
41+
"#000020", m_mock.getLastValue("/mechanism/backgroundColor", LogStringValue.class).value());
4442

45-
mechanism.setBackgroundColor(new Color8Bit(255, 255, 255));
46-
Telemetry.log("mechanism", mechanism);
47-
assertEquals(
48-
"#FFFFFF",
49-
m_mock.getLastValue("/mechanism/backgroundColor", LogStringValue.class).value());
50-
}
43+
mechanism.setBackgroundColor(new Color8Bit(255, 255, 255));
44+
Telemetry.log("mechanism", mechanism);
45+
assertEquals(
46+
"#FFFFFF", m_mock.getLastValue("/mechanism/backgroundColor", LogStringValue.class).value());
5147
}
5248

5349
@Test
5450
void testRoot() {
55-
try (var mechanism = new Mechanism2d(5, 10)) {
56-
final var root = mechanism.getRoot("root", 1, 2);
57-
Telemetry.log("mechanism", mechanism);
58-
assertArrayEquals(
59-
new double[] {1, 2}, m_mock.getLastValue("/mechanism/root/position", double[].class));
51+
var mechanism = new Mechanism2d(5, 10);
52+
final var root = mechanism.getRoot("root", 1, 2);
53+
Telemetry.log("mechanism", mechanism);
54+
assertArrayEquals(
55+
new double[] {1, 2}, m_mock.getLastValue("/mechanism/root/position", double[].class));
6056

61-
root.setPosition(2, 4);
62-
Telemetry.log("mechanism", mechanism);
63-
assertArrayEquals(
64-
new double[] {2, 4}, m_mock.getLastValue("/mechanism/root/position", double[].class));
65-
}
57+
root.setPosition(2, 4);
58+
Telemetry.log("mechanism", mechanism);
59+
assertArrayEquals(
60+
new double[] {2, 4}, m_mock.getLastValue("/mechanism/root/position", double[].class));
6661
}
6762

6863
@Test
6964
void testLigament() {
70-
try (var mechanism = new Mechanism2d(5, 10)) {
71-
var root = mechanism.getRoot("root", 1, 2);
72-
var ligament =
73-
root.append(new MechanismLigament2d("ligament", 3, 90, 1, new Color8Bit(255, 255, 255)));
74-
Telemetry.log("mechanism", mechanism);
75-
assertEquals(
76-
ligament.getAngle(), m_mock.getLastValue("/mechanism/root/ligament/angle", Double.class));
77-
assertEquals(
78-
ligament.getColor().toHexString(),
79-
m_mock.getLastValue("/mechanism/root/ligament/color", LogStringValue.class).value());
80-
assertEquals(
81-
ligament.getLength(),
82-
m_mock.getLastValue("/mechanism/root/ligament/length", Double.class));
83-
assertEquals(
84-
ligament.getLineWeight(),
85-
m_mock.getLastValue("/mechanism/root/ligament/weight", Double.class));
65+
var mechanism = new Mechanism2d(5, 10);
66+
var root = mechanism.getRoot("root", 1, 2);
67+
var ligament =
68+
root.append(new MechanismLigament2d("ligament", 3, 90, 1, new Color8Bit(255, 255, 255)));
69+
Telemetry.log("mechanism", mechanism);
70+
assertEquals(
71+
ligament.getAngle(), m_mock.getLastValue("/mechanism/root/ligament/angle", Double.class));
72+
assertEquals(
73+
ligament.getColor().toHexString(),
74+
m_mock.getLastValue("/mechanism/root/ligament/color", LogStringValue.class).value());
75+
assertEquals(
76+
ligament.getLength(), m_mock.getLastValue("/mechanism/root/ligament/length", Double.class));
77+
assertEquals(
78+
ligament.getLineWeight(),
79+
m_mock.getLastValue("/mechanism/root/ligament/weight", Double.class));
8680

87-
ligament.setAngle(45);
88-
ligament.setColor(new Color8Bit(0, 0, 0));
89-
ligament.setLength(2);
90-
ligament.setLineWeight(4);
91-
Telemetry.log("mechanism", mechanism);
92-
assertEquals(
93-
ligament.getAngle(), m_mock.getLastValue("/mechanism/root/ligament/angle", Double.class));
94-
assertEquals(
95-
ligament.getColor().toHexString(),
96-
m_mock.getLastValue("/mechanism/root/ligament/color", LogStringValue.class).value());
97-
assertEquals(
98-
ligament.getLength(),
99-
m_mock.getLastValue("/mechanism/root/ligament/length", Double.class));
100-
assertEquals(
101-
ligament.getLineWeight(),
102-
m_mock.getLastValue("/mechanism/root/ligament/weight", Double.class));
103-
}
81+
ligament.setAngle(45);
82+
ligament.setColor(new Color8Bit(0, 0, 0));
83+
ligament.setLength(2);
84+
ligament.setLineWeight(4);
85+
Telemetry.log("mechanism", mechanism);
86+
assertEquals(
87+
ligament.getAngle(), m_mock.getLastValue("/mechanism/root/ligament/angle", Double.class));
88+
assertEquals(
89+
ligament.getColor().toHexString(),
90+
m_mock.getLastValue("/mechanism/root/ligament/color", LogStringValue.class).value());
91+
assertEquals(
92+
ligament.getLength(), m_mock.getLastValue("/mechanism/root/ligament/length", Double.class));
93+
assertEquals(
94+
ligament.getLineWeight(),
95+
m_mock.getLastValue("/mechanism/root/ligament/weight", Double.class));
10496
}
10597
}

wpilibjExamples/src/main/java/org/wpilib/examples/armsimulation/subsystems/Arm.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,5 @@ public void stop() {
127127
public void close() {
128128
motor.close();
129129
encoder.close();
130-
mech2d.close();
131-
armPivot.close();
132-
arm.close();
133130
}
134131
}

wpilibjExamples/src/main/java/org/wpilib/examples/elevatorexponentialsimulation/subsystems/Elevator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,5 @@ public void updateTelemetry() {
136136
public void close() {
137137
encoder.close();
138138
motor.close();
139-
mech2d.close();
140139
}
141140
}

wpilibjExamples/src/main/java/org/wpilib/examples/elevatorsimulation/subsystems/Elevator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,5 @@ public void updateTelemetry() {
120120
public void close() {
121121
encoder.close();
122122
motor.close();
123-
mech2d.close();
124123
}
125124
}

0 commit comments

Comments
 (0)