From 67b0a75891f19e91cc35e23fa56915cfd7cd52de Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tomas=20Wenstr=C3=B6m?= Date: Sun, 24 Nov 2019 18:28:27 +0100 Subject: [PATCH] Move all modes to package kaka.cakelight.mode --- src/kaka/cakelight/CakeLight.java | 1 + src/kaka/cakelight/Console.java | 4 ++++ src/kaka/cakelight/GuiTest.java | 1 + src/kaka/cakelight/Main.java | 2 ++ src/kaka/cakelight/{ => mode}/AmbientMode.java | 5 ++++- src/kaka/cakelight/{ => mode}/Mode.java | 5 ++++- src/kaka/cakelight/{ => mode}/SingleColorMode.java | 6 +++++- src/kaka/cakelight/{ => mode}/SmoothVideoMode.java | 6 +++++- src/kaka/cakelight/{ => mode}/VideoMode.java | 7 ++++++- 9 files changed, 32 insertions(+), 5 deletions(-) rename src/kaka/cakelight/{ => mode}/AmbientMode.java (97%) rename src/kaka/cakelight/{ => mode}/Mode.java (81%) rename src/kaka/cakelight/{ => mode}/SingleColorMode.java (73%) rename src/kaka/cakelight/{ => mode}/SmoothVideoMode.java (83%) rename src/kaka/cakelight/{ => mode}/VideoMode.java (91%) diff --git a/src/kaka/cakelight/CakeLight.java b/src/kaka/cakelight/CakeLight.java index c2f896d..4b37bd7 100644 --- 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 84ca61e..caf8195 100644 --- 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 0d199c2..8c1516c 100644 --- 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 dd3c1f7..beb245b 100644 --- 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 35ec322..afe36ab 100644 --- 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 ad9bc8d..5ece5ea 100644 --- 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 f72d773..36c752a 100644 --- 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 e9ef442..53b4860 100644 --- 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 134fa2d..91a9f04 100644 --- 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; -- 2.11.0