Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-28 02:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor instanceof

Browse Source
This commit is contained in:
Gold856
2025-03-31 18:03:33 -04:00
committed by Matt Morley
parent 7f7d80bc3b
commit 3ed8d3a4f3
3 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
photon-core/src/main/java/org/photonvision/vision/camera/PVCameraInfo.java
View File

@@ -123,10 +123,7 @@ public sealed interface PVCameraInfo {
public boolean equals(Object obj) {
if (this == obj) return true;
if (obj == null) return false;
if (obj instanceof PVCameraInfo info) {
return equals(info);
}
return false;
return obj instanceof PVCameraInfo info && equals(info);
}
@Override
@@ -192,10 +189,7 @@ public sealed interface PVCameraInfo {
public boolean equals(Object obj) {
if (this == obj) return true;
if (obj == null) return false;
if (obj instanceof PVCameraInfo info) {
return equals(info);
}
return false;
return obj instanceof PVCameraInfo info && equals(info);
}
@Override
@@ -252,10 +246,7 @@ public sealed interface PVCameraInfo {
public boolean equals(Object obj) {
if (this == obj) return true;
if (obj == null) return false;
if (obj instanceof PVFileCameraInfo info) {
return equals(info);
}
return false;
return obj instanceof PVFileCameraInfo info && equals(info);
}
@Override

8
photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/USBCameraSource.java
View File

@@ -71,12 +71,12 @@ public class USBCameraSource extends VisionSource {
// yes to me...
if (getCameraConfiguration().cameraQuirks == null) {
int vid =
(config.matchedCameraInfo instanceof PVUsbCameraInfo)
? ((PVUsbCameraInfo) config.matchedCameraInfo).vendorId
(config.matchedCameraInfo instanceof PVUsbCameraInfo cameraInfo)
? cameraInfo.vendorId
: -1;
int pid =
(config.matchedCameraInfo instanceof PVUsbCameraInfo)
? ((PVUsbCameraInfo) config.matchedCameraInfo).productId
(config.matchedCameraInfo instanceof PVUsbCameraInfo cameraInfo)
? cameraInfo.productId
: -1;
getCameraConfiguration().cameraQuirks =

5
photon-core/src/main/java/org/photonvision/vision/pipeline/OutputStreamPipeline.java
View File

@@ -107,11 +107,10 @@ public class OutputStreamPipeline {
resizeImagePipe.setParams(
new ResizeImagePipe.ResizeImageParams(settings.streamingFrameDivisor));
if (settings instanceof Calibration3dPipelineSettings) {
if (settings instanceof Calibration3dPipelineSettings pipelineSettings) {
drawCalibrationPipe.setParams(
new DrawCalibrationPipe.DrawCalibrationPipeParams(
settings.streamingFrameDivisor,
((Calibration3dPipelineSettings) settings).drawAllSnapshots));
pipelineSettings.streamingFrameDivisor, pipelineSettings.drawAllSnapshots));
}
}