Move all modes to package kaka.cakelight.mode

diff --git a/src/kaka/cakelight/CakeLight.java b/src/kaka/cakelight/CakeLight.java
index c2f896d1d5d207af4cb8da720553ddaa100a190e..4b37bd7dc80af51f92b9616ad9bb9655012f3fe7 100644 (file)
--- a/src/kaka/cakelight/CakeLight.java
+++ b/src/kaka/cakelight/CakeLight.java
@@ -1,5 +1,6 @@
 package kaka.cakelight;
 
+import kaka.cakelight.mode.Mode;
 import org.jnativehook.GlobalScreen;
 import org.jnativehook.NativeHookException;
 import org.jnativehook.keyboard.NativeKeyAdapter;

diff --git a/src/kaka/cakelight/Console.java b/src/kaka/cakelight/Console.java
index 84ca61e7ee4e0cf2923672c86a18cd27a46a398a..caf8195780bbe62ebf1cc958a881ad908fb6b234 100644 (file)
--- a/src/kaka/cakelight/Console.java
+++ b/src/kaka/cakelight/Console.java
@@ -1,5 +1,9 @@
 package kaka.cakelight;
 
+import kaka.cakelight.mode.AmbientMode;
+import kaka.cakelight.mode.SingleColorMode;
+import kaka.cakelight.mode.VideoMode;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;

diff --git a/src/kaka/cakelight/GuiTest.java b/src/kaka/cakelight/GuiTest.java
index 0d199c238a1c624760c9da6fba4c06fd4e731dbd..8c1516c43c03cafb50f372f0fd342a1ad2dc819c 100644 (file)
--- a/src/kaka/cakelight/GuiTest.java
+++ b/src/kaka/cakelight/GuiTest.java
@@ -9,6 +9,7 @@ import javafx.scene.layout.Pane;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.stage.Stage;
+import kaka.cakelight.mode.AmbientMode;
 import org.opencv.core.Core;
 import org.opencv.core.Mat;
 

diff --git a/src/kaka/cakelight/Main.java b/src/kaka/cakelight/Main.java
index dd3c1f73759ecc1adc7c259fc99b7b858af8be0f..beb245b737b63ed1ea0fd008a76fcb31e2dded5e 100644 (file)
--- a/src/kaka/cakelight/Main.java
+++ b/src/kaka/cakelight/Main.java
@@ -1,5 +1,7 @@
 package kaka.cakelight;
 
+import kaka.cakelight.mode.AmbientMode;
+import kaka.cakelight.mode.SmoothVideoMode;
 import org.opencv.core.Core;
 
 import java.io.FileOutputStream;

diff --git a/src/kaka/cakelight/AmbientMode.java b/src/kaka/cakelight/mode/AmbientMode.java
similarity index 97%
rename from src/kaka/cakelight/AmbientMode.java
rename to src/kaka/cakelight/mode/AmbientMode.java
index 35ec322d109c73d22ccd0619977c539abecb40f5..afe36ab9a657abf2a6520ff908d834ca4e82abf8 100644 (file)
--- a/src/kaka/cakelight/AmbientMode.java
+++ b/src/kaka/cakelight/mode/AmbientMode.java
@@ -1,5 +1,8 @@
-package kaka.cakelight;
+package kaka.cakelight.mode;
 
+import kaka.cakelight.Color;
+import kaka.cakelight.Configuration;
+import kaka.cakelight.LedFrame;
 import kaka.cakelight.util.SimplexNoise3D;
 
 public class AmbientMode extends Mode { // TODO split into DynamicAmbient and StaticAmbient?

diff --git a/src/kaka/cakelight/Mode.java b/src/kaka/cakelight/mode/Mode.java
similarity index 81%
rename from src/kaka/cakelight/Mode.java
rename to src/kaka/cakelight/mode/Mode.java
index ad9bc8d40847efd66c7e366fbaf254e1091b8b7e..5ece5ea017a7a641d21b4b2a1d8e081dd954f51c 100644 (file)
--- a/src/kaka/cakelight/Mode.java
+++ b/src/kaka/cakelight/mode/Mode.java
@@ -1,4 +1,7 @@
-package kaka.cakelight;
+package kaka.cakelight.mode;
+
+import kaka.cakelight.Configuration;
+import kaka.cakelight.LedFrame;
 
 import java.util.function.Consumer;
 

diff --git a/src/kaka/cakelight/SingleColorMode.java b/src/kaka/cakelight/mode/SingleColorMode.java
similarity index 73%
rename from src/kaka/cakelight/SingleColorMode.java
rename to src/kaka/cakelight/mode/SingleColorMode.java
index f72d77391967459c3d7285e7319a9ca9e37b8fbe..36c752a7163830e98326c38d2ffab4c08d663102 100644 (file)
--- a/src/kaka/cakelight/SingleColorMode.java
+++ b/src/kaka/cakelight/mode/SingleColorMode.java
@@ -1,4 +1,8 @@
-package kaka.cakelight;
+package kaka.cakelight.mode;
+
+import kaka.cakelight.Color;
+import kaka.cakelight.Configuration;
+import kaka.cakelight.LedFrame;
 
 public class SingleColorMode extends Mode {
     private Color color;

diff --git a/src/kaka/cakelight/SmoothVideoMode.java b/src/kaka/cakelight/mode/SmoothVideoMode.java
similarity index 83%
rename from src/kaka/cakelight/SmoothVideoMode.java
rename to src/kaka/cakelight/mode/SmoothVideoMode.java
index e9ef44225701f8c2f098db464de5a59cad8a5753..53b486018936576f93e7a032427634ecd1a08503 100644 (file)
--- a/src/kaka/cakelight/SmoothVideoMode.java
+++ b/src/kaka/cakelight/mode/SmoothVideoMode.java
@@ -1,4 +1,8 @@
-package kaka.cakelight;
+package kaka.cakelight.mode;
+
+import kaka.cakelight.Color;
+import kaka.cakelight.Configuration;
+import kaka.cakelight.LedFrame;
 
 public class SmoothVideoMode extends VideoMode {
     private LedFrame frame;

diff --git a/src/kaka/cakelight/VideoMode.java b/src/kaka/cakelight/mode/VideoMode.java
similarity index 91%
rename from src/kaka/cakelight/VideoMode.java
rename to src/kaka/cakelight/mode/VideoMode.java
index 134fa2d33ff574f837af3b68dbd7b0e967ddf4ed..91a9f04bb444f952dfec0f6f3b0e44f104c5b7f3 100644 (file)
--- a/src/kaka/cakelight/VideoMode.java
+++ b/src/kaka/cakelight/mode/VideoMode.java
@@ -1,4 +1,9 @@
-package kaka.cakelight;
+package kaka.cakelight.mode;
+
+import kaka.cakelight.Configuration;
+import kaka.cakelight.FrameGrabber;
+import kaka.cakelight.VideoDeviceListener;
+import kaka.cakelight.VideoFrame;
 
 import java.io.File;
 import java.io.IOException;