Move Shot back to camera package to fix #701

phrack · Apr 8, 2017 · 1cadf98 · 1cadf98
1 parent 2ecffa9
commit 1cadf98
Show file tree

Hide file tree

Showing 46 changed files with 39 additions and 43 deletions.
diff --git a/src/main/java/com/shootoff/camera/CameraManager.java b/src/main/java/com/shootoff/camera/CameraManager.java
@@ -46,7 +46,6 @@
 import com.shootoff.camera.processors.DeduplicationProcessor;
 import com.shootoff.camera.recorders.RollingRecorder;
 import com.shootoff.camera.recorders.ShotRecorder;
-import com.shootoff.camera.shot.Shot;
 import com.shootoff.camera.shot.ShotColor;
 import com.shootoff.camera.shotdetection.CameraStateListener;
 import com.shootoff.camera.shotdetection.FrameProcessingShotDetector;

diff --git a/...n/java/com/shootoff/camera/shot/Shot.java → src/main/java/com/shootoff/camera/Shot.java b/...n/java/com/shootoff/camera/shot/Shot.java → src/main/java/com/shootoff/camera/Shot.java
@@ -16,12 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.shootoff.camera.shot;
+package com.shootoff.camera;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
+import com.shootoff.camera.shot.ShotColor;
+
 import javafx.scene.paint.Color;
 
 /**

diff --git a/src/main/java/com/shootoff/camera/processors/DeduplicationProcessor.java b/src/main/java/com/shootoff/camera/processors/DeduplicationProcessor.java
@@ -24,7 +24,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.shootoff.camera.CameraManager;
-import com.shootoff.camera.shot.Shot;
+import com.shootoff.camera.Shot;
 
 public class DeduplicationProcessor implements ShotProcessor {
 	private final static Logger logger = LoggerFactory.getLogger(DeduplicationProcessor.class);

diff --git a/src/main/java/com/shootoff/camera/processors/MalfunctionsProcessor.java b/src/main/java/com/shootoff/camera/processors/MalfunctionsProcessor.java
@@ -21,7 +21,7 @@
 import java.io.File;
 import java.util.Random;
 
-import com.shootoff.camera.shot.Shot;
+import com.shootoff.camera.Shot;
 import com.shootoff.config.Configuration;
 import com.shootoff.plugins.TrainingExerciseBase;
 

diff --git a/src/main/java/com/shootoff/camera/processors/ShotProcessor.java b/src/main/java/com/shootoff/camera/processors/ShotProcessor.java
@@ -18,7 +18,7 @@
 
 package com.shootoff.camera.processors;
 
-import com.shootoff.camera.shot.Shot;
+import com.shootoff.camera.Shot;
 
 public interface ShotProcessor {
 	public boolean processShot(Shot shot);

diff --git a/src/main/java/com/shootoff/camera/processors/VirtualMagazineProcessor.java b/src/main/java/com/shootoff/camera/processors/VirtualMagazineProcessor.java
@@ -20,7 +20,7 @@
 
 import java.io.File;
 
-import com.shootoff.camera.shot.Shot;
+import com.shootoff.camera.Shot;
 import com.shootoff.config.Configuration;
 import com.shootoff.plugins.TrainingExerciseBase;
 

diff --git a/src/main/java/com/shootoff/camera/shot/BoundsShot.java b/src/main/java/com/shootoff/camera/shot/BoundsShot.java
@@ -2,6 +2,8 @@
 
 import java.util.Optional;
 
+import com.shootoff.camera.Shot;
+
 
 /**
  * This class encapsulates a Shot which can be adjusted for bounds

diff --git a/src/main/java/com/shootoff/camera/shot/DisplayShot.java b/src/main/java/com/shootoff/camera/shot/DisplayShot.java
@@ -4,6 +4,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.shootoff.camera.Shot;
+
 import javafx.scene.shape.Ellipse;
 
 

diff --git a/src/main/java/com/shootoff/camera/shotdetection/ShotDetector.java b/src/main/java/com/shootoff/camera/shotdetection/ShotDetector.java
@@ -5,9 +5,9 @@
 
 import com.shootoff.camera.CameraManager;
 import com.shootoff.camera.CameraView;
+import com.shootoff.camera.Shot;
 import com.shootoff.camera.shot.BoundsShot;
 import com.shootoff.camera.shot.DisplayShot;
-import com.shootoff.camera.shot.Shot;
 import com.shootoff.camera.shot.ShotColor;
 import com.shootoff.config.Configuration;
 import javafx.geometry.Bounds;

diff --git a/src/main/java/com/shootoff/gui/CanvasManager.java b/src/main/java/com/shootoff/gui/CanvasManager.java
@@ -42,13 +42,13 @@
 
 import com.shootoff.camera.CameraManager;
 import com.shootoff.camera.CameraView;
+import com.shootoff.camera.Shot;
 import com.shootoff.camera.processors.MalfunctionsProcessor;
 import com.shootoff.camera.processors.ShotProcessor;
 import com.shootoff.camera.processors.VirtualMagazineProcessor;
 import com.shootoff.camera.recorders.ShotRecorder;
 import com.shootoff.camera.shot.ArenaShot;
 import com.shootoff.camera.shot.DisplayShot;
-import com.shootoff.camera.shot.Shot;
 import com.shootoff.camera.shot.ShotColor;
 import com.shootoff.config.Configuration;
 import com.shootoff.gui.pane.ProjectorArenaPane;

diff --git a/src/main/java/com/shootoff/gui/ShotEntry.java b/src/main/java/com/shootoff/gui/ShotEntry.java
@@ -22,8 +22,8 @@
 import java.util.Map;
 import java.util.Optional;
 
+import com.shootoff.camera.Shot;
 import com.shootoff.camera.shot.DisplayShot;
-import com.shootoff.camera.shot.Shot;
 import com.shootoff.camera.shot.ShotColor;
 
 import javafx.scene.paint.Color;

diff --git a/src/main/java/com/shootoff/gui/pane/ExerciseSlide.java b/src/main/java/com/shootoff/gui/pane/ExerciseSlide.java
@@ -27,7 +27,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.shootoff.camera.CameraManager;
-import com.shootoff.camera.shot.Shot;
+import com.shootoff.camera.Shot;
 import com.shootoff.config.Configuration;
 import com.shootoff.gui.ExerciseListener;
 import com.shootoff.gui.controller.PluginManagerController;

diff --git a/src/main/java/com/shootoff/headless/HeadlessController.java b/src/main/java/com/shootoff/headless/HeadlessController.java
@@ -41,8 +41,8 @@
 import com.shootoff.camera.CameraManager;
 import com.shootoff.camera.CameraView;
 import com.shootoff.camera.CamerasSupervisor;
+import com.shootoff.camera.Shot;
 import com.shootoff.camera.cameratypes.Camera;
-import com.shootoff.camera.shot.Shot;
 import com.shootoff.config.Configuration;
 import com.shootoff.config.ConfigurationException;
 import com.shootoff.courses.Course;

diff --git a/src/main/java/com/shootoff/plugins/BouncingTargets.java b/src/main/java/com/shootoff/plugins/BouncingTargets.java
@@ -24,7 +24,7 @@
 import java.util.Optional;
 import java.util.Random;
 
-import com.shootoff.camera.shot.Shot;
+import com.shootoff.camera.Shot;
 import com.shootoff.targets.Hit;
 import com.shootoff.targets.Target;
 

diff --git a/src/main/java/com/shootoff/plugins/DuelingTree.java b/src/main/java/com/shootoff/plugins/DuelingTree.java
@@ -27,7 +27,7 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import com.shootoff.camera.shot.Shot;
+import com.shootoff.camera.Shot;
 import com.shootoff.targets.Hit;
 import com.shootoff.targets.Target;
 import com.shootoff.targets.TargetRegion;

diff --git a/src/main/java/com/shootoff/plugins/ISSFStandardPistol.java b/src/main/java/com/shootoff/plugins/ISSFStandardPistol.java
@@ -32,7 +32,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.shootoff.camera.shot.Shot;
+import com.shootoff.camera.Shot;
 import com.shootoff.gui.DelayedStartListener;
 import com.shootoff.targets.Hit;
 import com.shootoff.targets.Target;

diff --git a/src/main/java/com/shootoff/plugins/ParForScore.java b/src/main/java/com/shootoff/plugins/ParForScore.java
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import com.shootoff.camera.shot.Shot;
+import com.shootoff.camera.Shot;
 import com.shootoff.camera.shot.ShotColor;
 import com.shootoff.gui.ParListener;
 import com.shootoff.targets.Hit;

diff --git a/src/main/java/com/shootoff/plugins/ParRandomShot.java b/src/main/java/com/shootoff/plugins/ParRandomShot.java
@@ -24,7 +24,7 @@
 import java.util.Optional;
 import java.util.Random;
 
-import com.shootoff.camera.shot.Shot;
+import com.shootoff.camera.Shot;
 import com.shootoff.targets.Hit;
 import com.shootoff.targets.Target;
 import com.shootoff.targets.TargetRegion;

diff --git a/src/main/java/com/shootoff/plugins/RandomShoot.java b/src/main/java/com/shootoff/plugins/RandomShoot.java
@@ -28,7 +28,7 @@
 import java.util.Random;
 import java.util.Stack;
 
-import com.shootoff.camera.shot.Shot;
+import com.shootoff.camera.Shot;
 import com.shootoff.targets.Hit;
 import com.shootoff.targets.Target;
 import com.shootoff.targets.TargetRegion;

diff --git a/src/main/java/com/shootoff/plugins/ShootDontShoot.java b/src/main/java/com/shootoff/plugins/ShootDontShoot.java
@@ -29,7 +29,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import com.shootoff.camera.shot.Shot;
+import com.shootoff.camera.Shot;
 import com.shootoff.targets.Hit;
 import com.shootoff.targets.Target;
 import com.shootoff.targets.TargetRegion;

diff --git a/src/main/java/com/shootoff/plugins/ShootForScore.java b/src/main/java/com/shootoff/plugins/ShootForScore.java
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import com.shootoff.camera.shot.Shot;
+import com.shootoff.camera.Shot;
 import com.shootoff.camera.shot.ShotColor;
 import com.shootoff.targets.Hit;
 import com.shootoff.targets.Target;

diff --git a/src/main/java/com/shootoff/plugins/SteelChallenge.java b/src/main/java/com/shootoff/plugins/SteelChallenge.java
@@ -29,7 +29,7 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import com.shootoff.camera.shot.Shot;
+import com.shootoff.camera.Shot;
 import com.shootoff.courses.Course;
 import com.shootoff.targets.Hit;
 import com.shootoff.targets.Target;

diff --git a/src/main/java/com/shootoff/plugins/TimedHolsterDrill.java b/src/main/java/com/shootoff/plugins/TimedHolsterDrill.java
@@ -26,7 +26,7 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import com.shootoff.camera.shot.Shot;
+import com.shootoff.camera.Shot;
 import com.shootoff.gui.DelayedStartListener;
 import com.shootoff.targets.Hit;
 import com.shootoff.targets.Target;

diff --git a/src/main/java/com/shootoff/plugins/TrainingExercise.java b/src/main/java/com/shootoff/plugins/TrainingExercise.java
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import com.shootoff.camera.shot.Shot;
+import com.shootoff.camera.Shot;
 import com.shootoff.targets.Hit;
 import com.shootoff.targets.Target;
 

diff --git a/src/main/java/com/shootoff/targets/Hit.java b/src/main/java/com/shootoff/targets/Hit.java
@@ -18,7 +18,7 @@
 
 package com.shootoff.targets;
 
-import com.shootoff.camera.shot.Shot;
+import com.shootoff.camera.Shot;
 
 /**
  * This class encapsulates the information for a shot that hit a target.

diff --git a/src/test/java/com/shootoff/camera/ShotDetectionTestor.java b/src/test/java/com/shootoff/camera/ShotDetectionTestor.java
@@ -14,7 +14,6 @@
 import org.slf4j.LoggerFactory;
 
 import com.shootoff.camera.shot.DisplayShot;
-import com.shootoff.camera.shot.Shot;
 import com.shootoff.config.Configuration;
 import com.shootoff.gui.MockCanvasManager;
 import com.shootoff.plugins.TrainingExerciseBase;

diff --git a/src/test/java/com/shootoff/camera/TestCameraManagerBright.java b/src/test/java/com/shootoff/camera/TestCameraManagerBright.java
@@ -10,7 +10,6 @@
 import org.junit.rules.ErrorCollector;
 
 import com.shootoff.camera.shot.DisplayShot;
-import com.shootoff.camera.shot.Shot;
 import com.shootoff.camera.shot.ShotColor;
 import com.shootoff.camera.shotdetection.JavaShotDetector;
 import com.shootoff.config.Configuration;

diff --git a/src/test/java/com/shootoff/camera/TestCameraManagerDark.java b/src/test/java/com/shootoff/camera/TestCameraManagerDark.java
@@ -14,7 +14,6 @@
 import org.junit.rules.ErrorCollector;
 
 import com.shootoff.camera.shot.DisplayShot;
-import com.shootoff.camera.shot.Shot;
 import com.shootoff.camera.shot.ShotColor;
 import com.shootoff.camera.shotdetection.JavaShotDetector;
 import com.shootoff.config.Configuration;

diff --git a/src/test/java/com/shootoff/camera/TestCameraManagerHighRes.java b/src/test/java/com/shootoff/camera/TestCameraManagerHighRes.java
@@ -10,7 +10,6 @@
 import org.junit.rules.ErrorCollector;
 
 import com.shootoff.camera.shot.DisplayShot;
-import com.shootoff.camera.shot.Shot;
 import com.shootoff.camera.shot.ShotColor;
 import com.shootoff.camera.shotdetection.JavaShotDetector;
 import com.shootoff.config.Configuration;

diff --git a/src/test/java/com/shootoff/camera/TestCameraManagerLifecam.java b/src/test/java/com/shootoff/camera/TestCameraManagerLifecam.java
@@ -10,7 +10,6 @@
 import org.junit.rules.ErrorCollector;
 
 import com.shootoff.camera.shot.DisplayShot;
-import com.shootoff.camera.shot.Shot;
 import com.shootoff.camera.shot.ShotColor;
 import com.shootoff.camera.shotdetection.JavaShotDetector;
 import com.shootoff.config.Configuration;

diff --git a/src/test/java/com/shootoff/camera/TestCameraManagerLogitech.java b/src/test/java/com/shootoff/camera/TestCameraManagerLogitech.java
@@ -12,7 +12,6 @@
 import org.junit.rules.ErrorCollector;
 
 import com.shootoff.camera.shot.DisplayShot;
-import com.shootoff.camera.shot.Shot;
 import com.shootoff.camera.shot.ShotColor;
 import com.shootoff.camera.shotdetection.JavaShotDetector;
 import com.shootoff.config.Configuration;

diff --git a/src/test/java/com/shootoff/camera/TestCameraManagerUserProvided.java b/src/test/java/com/shootoff/camera/TestCameraManagerUserProvided.java
@@ -10,7 +10,6 @@
 import org.junit.rules.ErrorCollector;
 
 import com.shootoff.camera.shot.DisplayShot;
-import com.shootoff.camera.shot.Shot;
 import com.shootoff.camera.shot.ShotColor;
 import com.shootoff.camera.shotdetection.JavaShotDetector;
 import com.shootoff.config.Configuration;

diff --git a/src/test/java/com/shootoff/camera/TestCameraManagerVeryBright.java b/src/test/java/com/shootoff/camera/TestCameraManagerVeryBright.java
@@ -10,7 +10,6 @@
 import org.junit.rules.ErrorCollector;
 
 import com.shootoff.camera.shot.DisplayShot;
-import com.shootoff.camera.shot.Shot;
 import com.shootoff.camera.shot.ShotColor;
 import com.shootoff.camera.shotdetection.JavaShotDetector;
 import com.shootoff.config.Configuration;

diff --git a/src/test/java/com/shootoff/camera/TestDeduplicationProcessor.java b/src/test/java/com/shootoff/camera/TestDeduplicationProcessor.java
@@ -5,7 +5,6 @@
 import org.junit.Test;
 
 import com.shootoff.camera.processors.DeduplicationProcessor;
-import com.shootoff.camera.shot.Shot;
 import com.shootoff.camera.shot.ShotColor;
 import com.shootoff.config.ConfigurationException;
 

diff --git a/src/test/java/com/shootoff/camera/TestMalfunctionsProcessor.java b/src/test/java/com/shootoff/camera/TestMalfunctionsProcessor.java
@@ -6,7 +6,6 @@
 
 import com.shootoff.camera.processors.MalfunctionsProcessor;
 import com.shootoff.camera.processors.ShotProcessor;
-import com.shootoff.camera.shot.Shot;
 import com.shootoff.camera.shot.ShotColor;
 import com.shootoff.config.Configuration;
 import com.shootoff.config.ConfigurationException;

diff --git a/src/test/java/com/shootoff/camera/TestVirtualMagazineProcessor.java b/src/test/java/com/shootoff/camera/TestVirtualMagazineProcessor.java
@@ -6,7 +6,6 @@
 
 import com.shootoff.camera.processors.ShotProcessor;
 import com.shootoff.camera.processors.VirtualMagazineProcessor;
-import com.shootoff.camera.shot.Shot;
 import com.shootoff.camera.shot.ShotColor;
 import com.shootoff.config.Configuration;
 import com.shootoff.config.ConfigurationException;

diff --git a/src/test/java/com/shootoff/camera/shot/TestShot.java b/src/test/java/com/shootoff/camera/shot/TestShot.java
@@ -4,6 +4,8 @@
 
 import org.junit.Test;
 
+import com.shootoff.camera.Shot;
+
 public class TestShot {
 	@Test
 	public void testShot() {

diff --git a/src/test/java/com/shootoff/gui/TestCanvasManager.java b/src/test/java/com/shootoff/gui/TestCanvasManager.java
@@ -12,8 +12,8 @@
 import com.shootoff.camera.CameraManager;
 import com.shootoff.camera.CamerasSupervisor;
 import com.shootoff.camera.MockCamera;
+import com.shootoff.camera.Shot;
 import com.shootoff.camera.shot.DisplayShot;
-import com.shootoff.camera.shot.Shot;
 import com.shootoff.camera.shot.ShotColor;
 import com.shootoff.config.Configuration;
 import com.shootoff.config.ConfigurationException;

diff --git a/src/test/java/com/shootoff/gui/targets/TestTargetCommands.java b/src/test/java/com/shootoff/gui/targets/TestTargetCommands.java
@@ -13,10 +13,10 @@
 
 import com.shootoff.camera.CameraManager;
 import com.shootoff.camera.MockCameraManager;
+import com.shootoff.camera.Shot;
 import com.shootoff.camera.shot.ArenaShot;
 import com.shootoff.camera.shot.BoundsShot;
 import com.shootoff.camera.shot.DisplayShot;
-import com.shootoff.camera.shot.Shot;
 import com.shootoff.camera.shot.ShotColor;
 import com.shootoff.config.Configuration;
 import com.shootoff.config.ConfigurationException;

diff --git a/src/test/java/com/shootoff/plugins/TestBouncingTargets.java b/src/test/java/com/shootoff/plugins/TestBouncingTargets.java
@@ -17,7 +17,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.shootoff.camera.CamerasSupervisor;
-import com.shootoff.camera.shot.Shot;
+import com.shootoff.camera.Shot;
 import com.shootoff.camera.shot.ShotColor;
 import com.shootoff.config.Configuration;
 import com.shootoff.config.ConfigurationException;

diff --git a/src/test/java/com/shootoff/plugins/TestDuelingTree.java b/src/test/java/com/shootoff/plugins/TestDuelingTree.java
@@ -22,7 +22,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.shootoff.camera.CamerasSupervisor;
-import com.shootoff.camera.shot.Shot;
+import com.shootoff.camera.Shot;
 import com.shootoff.camera.shot.ShotColor;
 import com.shootoff.config.Configuration;
 import com.shootoff.config.ConfigurationException;

diff --git a/src/test/java/com/shootoff/plugins/TestISSFStandardPistol.java b/src/test/java/com/shootoff/plugins/TestISSFStandardPistol.java
@@ -17,8 +17,8 @@
 import org.slf4j.LoggerFactory;
 
 import com.shootoff.camera.CamerasSupervisor;
+import com.shootoff.camera.Shot;
 import com.shootoff.camera.shot.DisplayShot;
-import com.shootoff.camera.shot.Shot;
 import com.shootoff.camera.shot.ShotColor;
 import com.shootoff.config.Configuration;
 import com.shootoff.config.ConfigurationException;

diff --git a/src/test/java/com/shootoff/plugins/TestRandomShoot.java b/src/test/java/com/shootoff/plugins/TestRandomShoot.java
@@ -23,7 +23,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 
-import com.shootoff.camera.shot.Shot;
+import com.shootoff.camera.Shot;
 import com.shootoff.camera.shot.ShotColor;
 import com.shootoff.gui.JavaFXThreadingRule;
 import com.shootoff.gui.targets.TargetView;