removed all unnecessary imports

2026-06-22 01:11:40 +00:00 · 2020-01-28 20:02:03 +02:00
parent 5e0a5c7e03
commit 9b7318d9e6
18 changed files with 20 additions and 48 deletions
--- a/chameleon-server/src/main/java/com/chameleonvision/config/JsonMat.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/config/JsonMat.java
@@ -4,11 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import org.opencv.core.CvType;
 import org.opencv.core.Mat;

-import java.lang.reflect.Array;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;


 public class JsonMat {
--- a/chameleon-server/src/main/java/com/chameleonvision/scripting/ScriptEvent.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/scripting/ScriptEvent.java
@@ -4,10 +4,6 @@ import com.chameleonvision.Debug;
 import com.chameleonvision.util.ShellExec;

 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;

 public class ScriptEvent {
    private static final ShellExec executor = new ShellExec(true, true);
--- a/chameleon-server/src/main/java/com/chameleonvision/util/Helpers.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/util/Helpers.java
@@ -1,7 +1,6 @@
 package com.chameleonvision.util;

 import edu.wpi.cscore.VideoMode;
-import io.javalin.http.UploadedFile;
 import org.opencv.core.Scalar;

 import java.awt.*;
@@ -9,9 +8,7 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Writer;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.HashMap;
-import java.util.Map;

 public class Helpers {
    private static final String kServicePath = "/etc/systemd/system/chameleonVision.service";
--- a/chameleon-server/src/main/java/com/chameleonvision/util/JacksonHelper.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/util/JacksonHelper.java
@@ -1,7 +1,5 @@
 package com.chameleonvision.util;

-import com.chameleonvision.config.serializers.StandardCVPipelineSettingsDeserializer;
-import com.chameleonvision.vision.pipeline.impl.StandardCVPipelineSettings;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 import com.fasterxml.jackson.databind.json.JsonMapper;
--- a/chameleon-server/src/main/java/com/chameleonvision/util/MathHandler.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/util/MathHandler.java
@@ -1,8 +1,5 @@
 package com.chameleonvision.util;

-import java.lang.Math;
-
-import edu.wpi.first.wpiutil.math.Num;
 import org.apache.commons.math3.util.FastMath;

 public class MathHandler {
--- a/chameleon-server/src/main/java/com/chameleonvision/vision/VisionProcess.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/vision/VisionProcess.java
@@ -4,17 +4,18 @@ import com.chameleonvision.Debug;
 import com.chameleonvision.config.CameraCalibrationConfig;
 import com.chameleonvision.config.CameraConfig;
 import com.chameleonvision.config.ConfigManager;
+import com.chameleonvision.config.FullCameraConfiguration;
 import com.chameleonvision.networktables.NetworkTablesManager;
 import com.chameleonvision.scripting.ScriptEventType;
 import com.chameleonvision.scripting.ScriptManager;
-import com.chameleonvision.config.FullCameraConfiguration;
-import com.chameleonvision.util.LoopingRunnable;
 import com.chameleonvision.util.MathHandler;
 import com.chameleonvision.vision.camera.CameraStreamer;
 import com.chameleonvision.vision.camera.USBCameraCapture;
-import com.chameleonvision.vision.pipeline.*;
-import com.chameleonvision.vision.pipeline.impl.StandardCVPipeline;
+import com.chameleonvision.vision.pipeline.CVPipelineResult;
+import com.chameleonvision.vision.pipeline.CVPipelineSettings;
+import com.chameleonvision.vision.pipeline.PipelineManager;
 import com.chameleonvision.vision.pipeline.impl.DriverVisionPipeline;
+import com.chameleonvision.vision.pipeline.impl.StandardCVPipeline;
 import com.chameleonvision.vision.pipeline.impl.StandardCVPipelineSettings;
 import com.chameleonvision.web.SocketHandler;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -25,11 +26,10 @@ import edu.wpi.first.wpilibj.geometry.Pose2d;
 import edu.wpi.first.wpiutil.CircularBuffer;
 import org.apache.commons.lang3.tuple.Pair;
 import org.opencv.core.Mat;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingDeque;
 import java.util.stream.Collectors;


--- a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/PipelineManager.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/PipelineManager.java
@@ -5,7 +5,10 @@ import com.chameleonvision.config.CameraConfig;
 import com.chameleonvision.config.ConfigManager;
 import com.chameleonvision.vision.VisionManager;
 import com.chameleonvision.vision.VisionProcess;
-import com.chameleonvision.vision.pipeline.impl.*;
+import com.chameleonvision.vision.pipeline.impl.Calibrate3dPipeline;
+import com.chameleonvision.vision.pipeline.impl.DriverVisionPipeline;
+import com.chameleonvision.vision.pipeline.impl.StandardCVPipeline;
+import com.chameleonvision.vision.pipeline.impl.StandardCVPipelineSettings;
 import com.chameleonvision.web.SocketHandler;
 import edu.wpi.cscore.VideoMode;
 import edu.wpi.first.networktables.NetworkTableEntry;
--- a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/impl/DriverVisionPipeline.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/impl/DriverVisionPipeline.java
@@ -10,7 +10,6 @@ import com.chameleonvision.vision.pipeline.pipes.Draw2dCrosshairPipe;
 import com.chameleonvision.vision.pipeline.pipes.RotateFlipPipe;
 import org.apache.commons.lang3.tuple.Pair;
 import org.opencv.core.Mat;
-import org.opencv.core.RotatedRect;

 import java.util.List;

--- a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/impl/StandardCVPipeline.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/impl/StandardCVPipeline.java
@@ -9,13 +9,13 @@ import com.chameleonvision.vision.pipeline.CVPipelineResult;
 import com.chameleonvision.vision.pipeline.pipes.*;
 import edu.wpi.first.wpilibj.geometry.Pose2d;
 import org.apache.commons.lang3.tuple.Pair;
-import org.opencv.core.*;
 import org.opencv.core.Point;
+import org.opencv.core.*;

 import java.awt.*;
 import java.util.List;

-import static com.chameleonvision.vision.pipeline.impl.StandardCVPipeline.*;
+import static com.chameleonvision.vision.pipeline.impl.StandardCVPipeline.StandardCVPipelineResult;

@SuppressWarnings("WeakerAccess")
 public class StandardCVPipeline extends CVPipeline<StandardCVPipelineResult, StandardCVPipelineSettings> {
--- a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/Collect2dTargetsPipe.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/Collect2dTargetsPipe.java
@@ -1,16 +1,17 @@
 package com.chameleonvision.vision.pipeline.pipes;

 import com.chameleonvision.vision.camera.CaptureStaticProperties;
+import com.chameleonvision.vision.enums.CalibrationMode;
 import com.chameleonvision.vision.enums.TargetOrientation;
 import com.chameleonvision.vision.enums.TargetRegion;
 import com.chameleonvision.vision.pipeline.Pipe;
 import com.chameleonvision.vision.pipeline.impl.StandardCVPipeline;
-import com.chameleonvision.vision.enums.CalibrationMode;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.math3.util.FastMath;
 import org.opencv.core.Point;

-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;

 public class Collect2dTargetsPipe implements Pipe<Pair<List<StandardCVPipeline.TrackedTarget>, CaptureStaticProperties>, List<StandardCVPipeline.TrackedTarget>> {

--- a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/Draw2dContoursPipe.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/Draw2dContoursPipe.java
@@ -1,7 +1,7 @@
 package com.chameleonvision.vision.pipeline.pipes;

-import com.chameleonvision.vision.camera.CaptureStaticProperties;
 import com.chameleonvision.util.Helpers;
+import com.chameleonvision.vision.camera.CaptureStaticProperties;
 import com.chameleonvision.vision.pipeline.Pipe;
 import com.chameleonvision.vision.pipeline.impl.StandardCVPipeline;
 import org.apache.commons.lang3.tuple.Pair;
--- a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/DrawSolvePNPPipe.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/DrawSolvePNPPipe.java
@@ -19,7 +19,6 @@ import java.util.stream.Collectors;
 public class DrawSolvePNPPipe implements Pipe<Pair<Mat, List<StandardCVPipeline.TrackedTarget>>, Mat> {

    private MatOfPoint3f boxCornerMat = new MatOfPoint3f();
-    private MatOfPoint tempMatOfPoints = new MatOfPoint();

    public Scalar green = Helpers.colorToScalar(Color.GREEN);
    public Scalar blue = Helpers.colorToScalar(Color.BLUE);
--- a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/FilterContoursPipe.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/FilterContoursPipe.java
@@ -1,7 +1,7 @@
 package com.chameleonvision.vision.pipeline.pipes;

-import com.chameleonvision.vision.camera.CaptureStaticProperties;
 import com.chameleonvision.util.MathHandler;
+import com.chameleonvision.vision.camera.CaptureStaticProperties;
 import com.chameleonvision.vision.pipeline.Pipe;
 import org.apache.commons.lang3.tuple.Pair;
 import org.opencv.core.MatOfPoint;
--- a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/GroupContoursPipe.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/GroupContoursPipe.java
@@ -7,7 +7,6 @@ import com.chameleonvision.vision.pipeline.Pipe;
 import com.chameleonvision.vision.pipeline.impl.StandardCVPipeline;
 import org.apache.commons.lang3.tuple.Pair;
 import org.opencv.core.*;
-import org.opencv.core.Point;
 import org.opencv.imgproc.Imgproc;
 import org.opencv.imgproc.Moments;

--- a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/SortContoursPipe.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/SortContoursPipe.java
@@ -6,7 +6,6 @@ import com.chameleonvision.vision.pipeline.Pipe;
 import com.chameleonvision.vision.pipeline.impl.StandardCVPipeline;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.math3.util.FastMath;
-import org.opencv.core.*;

 import java.util.ArrayList;
 import java.util.Comparator;
--- a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/SpeckleRejectPipe.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/SpeckleRejectPipe.java
@@ -2,9 +2,7 @@ package com.chameleonvision.vision.pipeline.pipes;

 import com.chameleonvision.vision.pipeline.Pipe;
 import org.apache.commons.lang3.tuple.Pair;
-import org.opencv.core.Mat;
 import org.opencv.core.MatOfPoint;
-import org.opencv.core.MatOfPoint2f;
 import org.opencv.imgproc.Imgproc;

 import java.util.ArrayList;
--- a/chameleon-server/src/main/java/com/chameleonvision/web/RequestHandler.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/web/RequestHandler.java
@@ -11,27 +11,19 @@ import com.chameleonvision.util.ProgramDirectoryUtilities;
 import com.chameleonvision.vision.VisionManager;
 import com.chameleonvision.vision.VisionProcess;
 import com.chameleonvision.vision.camera.USBCameraCapture;
-import com.chameleonvision.vision.pipeline.CVPipelineSettings;
 import com.chameleonvision.vision.pipeline.PipelineManager;
 import com.chameleonvision.vision.pipeline.impl.Calibrate3dPipeline;
-import com.chameleonvision.vision.pipeline.impl.StandardCVPipeline;
 import com.chameleonvision.vision.pipeline.impl.StandardCVPipelineSettings;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import edu.wpi.cscore.VideoMode;
 import edu.wpi.first.wpilibj.geometry.Rotation2d;
-import io.javalin.core.util.FileUtil;
 import io.javalin.http.Context;
-import io.javalin.http.Handler;
 import io.javalin.http.UploadedFile;
-import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.math3.ml.neuralnet.Network;
-import org.opencv.core.Point;
 import org.opencv.core.Point3;

-import java.io.*;
-import java.net.URISyntaxException;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
--- a/chameleon-server/src/main/java/com/chameleonvision/web/SocketHandler.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/web/SocketHandler.java
@@ -11,7 +11,6 @@ import com.chameleonvision.vision.enums.ImageRotationMode;
 import com.chameleonvision.vision.enums.StreamDivisor;
 import com.chameleonvision.vision.pipeline.CVPipeline;
 import com.chameleonvision.vision.pipeline.impl.StandardCVPipeline;
-import com.chameleonvision.vision.pipeline.CVPipelineSettings;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -26,7 +25,6 @@ import org.msgpack.jackson.dataformat.MessagePackFactory;
 import java.lang.reflect.Field;
 import java.nio.ByteBuffer;
 import java.util.*;
-import java.util.List;
 import java.util.stream.Collectors;