PMD fix

wpilibsuite · Feb 17, 2024 · 50245fa · 50245fa
1 parent 49cb64c
commit 50245fa
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/...in/java/edu/wpi/first/shuffleboard/plugin/cameraserver/source/CameraServerSourceType.java b/...in/java/edu/wpi/first/shuffleboard/plugin/cameraserver/source/CameraServerSourceType.java
@@ -26,7 +26,7 @@
 import javafx.collections.ObservableMap;
 
 @UiHints(showConnectionIndicator = false) // same host as NetworkTables plugin, so no need to duplicate that information
-public final class CameraServerSourceType extends SourceType {
+public final class CameraServerSourceType extends SourceType implements AutoCloseable {
 
   public static final CameraServerSourceType INSTANCE = new CameraServerSourceType();
 
@@ -35,12 +35,13 @@ public final class CameraServerSourceType extends SourceType {
   private final ObservableMap<String, Object> availableSources = FXCollections.observableHashMap();
 
   private final MultiSubscriber subscriber;
+  private final int listener;
 
   private CameraServerSourceType() {
     super("CameraServer", true, "camera_server://", CameraServerSourceType::forName);
     NetworkTableInstance inst = NetworkTableInstance.getDefault();
     subscriber = new MultiSubscriber(inst, new String[] {"/CameraPublisher"}, PubSubOption.hidden(true));
-    inst.addListener(
+    listener = inst.addListener(
         subscriber,
         EnumSet.of(
           NetworkTableEvent.Kind.kUnpublish,
@@ -66,6 +67,12 @@ private CameraServerSourceType() {
           }));
   }
 
+  @Override
+  public void close() {
+    subscriber.close();
+    NetworkTableInstance.getDefault().removeListener(listener);
+  }
+
   public static CameraServerSource forName(String name) {
     return INSTANCE.sources.computeIfAbsent(name, CameraServerSource::new);
   }