From d04096f2c868a555f049b13e508010d899383c5e Mon Sep 17 00:00:00 2001 From: Banks Troutman Date: Sun, 15 Sep 2019 15:22:52 -0400 Subject: [PATCH] Package change fix Moved Main.java, added missing import --- Main/Main.iml | 2 - Main/chameleon-vision.iml | 52 ------------------- .../java/{ => com/chameleonvision}/Main.java | 4 +- .../java/com/chameleonvision/web/Server.java | 1 + 4 files changed, 3 insertions(+), 56 deletions(-) delete mode 100644 Main/Main.iml delete mode 100644 Main/chameleon-vision.iml rename Main/src/main/java/{ => com/chameleonvision}/Main.java (95%) diff --git a/Main/Main.iml b/Main/Main.iml deleted file mode 100644 index 78b2cc53b..000000000 --- a/Main/Main.iml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/Main/chameleon-vision.iml b/Main/chameleon-vision.iml deleted file mode 100644 index 0373954c4..000000000 --- a/Main/chameleon-vision.iml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Main/src/main/java/Main.java b/Main/src/main/java/com/chameleonvision/Main.java similarity index 95% rename from Main/src/main/java/Main.java rename to Main/src/main/java/com/chameleonvision/Main.java index fc584e472..65d22321a 100644 --- a/Main/src/main/java/Main.java +++ b/Main/src/main/java/com/chameleonvision/Main.java @@ -1,3 +1,5 @@ +package com.chameleonvision; + import com.chameleonvision.settings.SettingsManager; import com.chameleonvision.vision.process.CameraProcess; import com.chameleonvision.web.Server; @@ -15,5 +17,3 @@ public class Main { Server.main(8888); } } - - diff --git a/Main/src/main/java/com/chameleonvision/web/Server.java b/Main/src/main/java/com/chameleonvision/web/Server.java index f7228819e..e9accf11f 100644 --- a/Main/src/main/java/com/chameleonvision/web/Server.java +++ b/Main/src/main/java/com/chameleonvision/web/Server.java @@ -1,6 +1,7 @@ package com.chameleonvision.web; import com.chameleonvision.settings.SettingsManager; +import com.chameleonvision.vision.Pipeline; import io.javalin.Javalin; import io.javalin.websocket.WsContext;