From 6609d1a44b35948b728994de2abdc79d6deb2376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Ple=C3=9F?= Date: Fri, 2 Mar 2012 22:08:24 +0100 Subject: [PATCH] refactoring mit DAO, Controller und DMXDevices --- .../java/de/ctdo/{ => bunti}/control/BroadcastListener.java | 2 +- .../java/de/ctdo/{ => bunti}/control/BuntiController.java | 4 ++-- .../java/de/ctdo/{ => bunti}/dmx/DMXDataChangedListener.java | 2 +- .../src/main/java/de/ctdo/{ => bunti}/web/TestController.java | 2 +- .../{ => bunti}/websocket/BuntiControllerApplication.java | 4 ++-- .../de/ctdo/{ => bunti}/websocket/BuntiControllerServlet.java | 2 +- .../ctdo/{ => bunti}/websocket/BuntiControllerWebSocket.java | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) rename bunti_server/src/main/java/de/ctdo/{ => bunti}/control/BroadcastListener.java (70%) rename bunti_server/src/main/java/de/ctdo/{ => bunti}/control/BuntiController.java (94%) rename bunti_server/src/main/java/de/ctdo/{ => bunti}/dmx/DMXDataChangedListener.java (76%) rename bunti_server/src/main/java/de/ctdo/{ => bunti}/web/TestController.java (92%) rename bunti_server/src/main/java/de/ctdo/{ => bunti}/websocket/BuntiControllerApplication.java (95%) rename bunti_server/src/main/java/de/ctdo/{ => bunti}/websocket/BuntiControllerServlet.java (97%) rename bunti_server/src/main/java/de/ctdo/{ => bunti}/websocket/BuntiControllerWebSocket.java (92%) diff --git a/bunti_server/src/main/java/de/ctdo/control/BroadcastListener.java b/bunti_server/src/main/java/de/ctdo/bunti/control/BroadcastListener.java similarity index 70% rename from bunti_server/src/main/java/de/ctdo/control/BroadcastListener.java rename to bunti_server/src/main/java/de/ctdo/bunti/control/BroadcastListener.java index eed4d1c..3174291 100644 --- a/bunti_server/src/main/java/de/ctdo/control/BroadcastListener.java +++ b/bunti_server/src/main/java/de/ctdo/bunti/control/BroadcastListener.java @@ -1,4 +1,4 @@ -package de.ctdo.control; +package de.ctdo.bunti.control; public interface BroadcastListener { void Broadcast(String message); diff --git a/bunti_server/src/main/java/de/ctdo/control/BuntiController.java b/bunti_server/src/main/java/de/ctdo/bunti/control/BuntiController.java similarity index 94% rename from bunti_server/src/main/java/de/ctdo/control/BuntiController.java rename to bunti_server/src/main/java/de/ctdo/bunti/control/BuntiController.java index d786a5e..0fab845 100644 --- a/bunti_server/src/main/java/de/ctdo/control/BuntiController.java +++ b/bunti_server/src/main/java/de/ctdo/bunti/control/BuntiController.java @@ -1,10 +1,10 @@ -package de.ctdo.control; +package de.ctdo.bunti.control; import java.util.ArrayList; import java.util.List; import net.sf.json.JSONObject; -import de.ctdo.dmx.DMXMixer; +import de.ctdo.bunti.dmx.DMXMixer; public class BuntiController { static BuntiController instance = new BuntiController(); diff --git a/bunti_server/src/main/java/de/ctdo/dmx/DMXDataChangedListener.java b/bunti_server/src/main/java/de/ctdo/bunti/dmx/DMXDataChangedListener.java similarity index 76% rename from bunti_server/src/main/java/de/ctdo/dmx/DMXDataChangedListener.java rename to bunti_server/src/main/java/de/ctdo/bunti/dmx/DMXDataChangedListener.java index d060191..21ae977 100644 --- a/bunti_server/src/main/java/de/ctdo/dmx/DMXDataChangedListener.java +++ b/bunti_server/src/main/java/de/ctdo/bunti/dmx/DMXDataChangedListener.java @@ -1,4 +1,4 @@ -package de.ctdo.dmx; +package de.ctdo.bunti.dmx; public interface DMXDataChangedListener { diff --git a/bunti_server/src/main/java/de/ctdo/web/TestController.java b/bunti_server/src/main/java/de/ctdo/bunti/web/TestController.java similarity index 92% rename from bunti_server/src/main/java/de/ctdo/web/TestController.java rename to bunti_server/src/main/java/de/ctdo/bunti/web/TestController.java index 163c5e0..e169c55 100644 --- a/bunti_server/src/main/java/de/ctdo/web/TestController.java +++ b/bunti_server/src/main/java/de/ctdo/bunti/web/TestController.java @@ -1,4 +1,4 @@ -package de.ctdo.web; +package de.ctdo.bunti.web; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/bunti_server/src/main/java/de/ctdo/websocket/BuntiControllerApplication.java b/bunti_server/src/main/java/de/ctdo/bunti/websocket/BuntiControllerApplication.java similarity index 95% rename from bunti_server/src/main/java/de/ctdo/websocket/BuntiControllerApplication.java rename to bunti_server/src/main/java/de/ctdo/bunti/websocket/BuntiControllerApplication.java index a46e546..4c17e40 100644 --- a/bunti_server/src/main/java/de/ctdo/websocket/BuntiControllerApplication.java +++ b/bunti_server/src/main/java/de/ctdo/bunti/websocket/BuntiControllerApplication.java @@ -1,4 +1,4 @@ -package de.ctdo.websocket; +package de.ctdo.bunti.websocket; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -10,7 +10,7 @@ import com.sun.grizzly.websockets.WebSocket; import com.sun.grizzly.websockets.WebSocketApplication; import com.sun.grizzly.websockets.WebSocketListener; -import de.ctdo.control.BuntiController; +import de.ctdo.bunti.control.BuntiController; @Component public class BuntiControllerApplication extends WebSocketApplication { diff --git a/bunti_server/src/main/java/de/ctdo/websocket/BuntiControllerServlet.java b/bunti_server/src/main/java/de/ctdo/bunti/websocket/BuntiControllerServlet.java similarity index 97% rename from bunti_server/src/main/java/de/ctdo/websocket/BuntiControllerServlet.java rename to bunti_server/src/main/java/de/ctdo/bunti/websocket/BuntiControllerServlet.java index d0a04c2..6179bfc 100644 --- a/bunti_server/src/main/java/de/ctdo/websocket/BuntiControllerServlet.java +++ b/bunti_server/src/main/java/de/ctdo/bunti/websocket/BuntiControllerServlet.java @@ -1,4 +1,4 @@ -package de.ctdo.websocket; +package de.ctdo.bunti.websocket; import javax.servlet.ServletConfig; import javax.servlet.ServletException; diff --git a/bunti_server/src/main/java/de/ctdo/websocket/BuntiControllerWebSocket.java b/bunti_server/src/main/java/de/ctdo/bunti/websocket/BuntiControllerWebSocket.java similarity index 92% rename from bunti_server/src/main/java/de/ctdo/websocket/BuntiControllerWebSocket.java rename to bunti_server/src/main/java/de/ctdo/bunti/websocket/BuntiControllerWebSocket.java index 4851ca7..8096e89 100644 --- a/bunti_server/src/main/java/de/ctdo/websocket/BuntiControllerWebSocket.java +++ b/bunti_server/src/main/java/de/ctdo/bunti/websocket/BuntiControllerWebSocket.java @@ -1,4 +1,4 @@ -package de.ctdo.websocket; +package de.ctdo.bunti.websocket; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -7,7 +7,7 @@ import com.sun.grizzly.websockets.DefaultWebSocket; import com.sun.grizzly.websockets.ProtocolHandler; import com.sun.grizzly.websockets.WebSocketListener; -import de.ctdo.control.BroadcastListener; +import de.ctdo.bunti.control.BroadcastListener; /** * Ein DMXControllerWebSocket gehoert immer zu einem Browserfenster/Tab