From 8f2610314eab8be1d60c22789242b9a7da977bd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Ple=C3=9F?= Date: Sun, 25 Mar 2012 18:30:51 +0200 Subject: [PATCH] moved devicechange event and the webmodel to web.model --- src/main/java/de/ctdo/bunti/control/BuntiControllerImpl.java | 1 - .../java/de/ctdo/bunti/{ => control}/DeviceChangedEvent.java | 2 +- src/main/java/de/ctdo/bunti/devices/DeviceMixerImpl.java | 2 +- src/main/java/de/ctdo/bunti/dmx/DMXMixerImpl.java | 2 +- src/main/java/de/ctdo/bunti/web/DeviceControlController.java | 4 ++-- .../de/ctdo/bunti/{webmodel => web/model}/DeviceUpdate.java | 3 +-- .../de/ctdo/bunti/{webmodel => web/model}/DeviceUpdates.java | 2 +- 7 files changed, 7 insertions(+), 9 deletions(-) rename src/main/java/de/ctdo/bunti/{ => control}/DeviceChangedEvent.java (95%) rename src/main/java/de/ctdo/bunti/{webmodel => web/model}/DeviceUpdate.java (87%) rename src/main/java/de/ctdo/bunti/{webmodel => web/model}/DeviceUpdates.java (95%) diff --git a/src/main/java/de/ctdo/bunti/control/BuntiControllerImpl.java b/src/main/java/de/ctdo/bunti/control/BuntiControllerImpl.java index 95cb875..f9e4581 100644 --- a/src/main/java/de/ctdo/bunti/control/BuntiControllerImpl.java +++ b/src/main/java/de/ctdo/bunti/control/BuntiControllerImpl.java @@ -11,7 +11,6 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.stereotype.Component; -import de.ctdo.bunti.DeviceChangedEvent; import de.ctdo.bunti.dao.BuntiDevicesDAO; import de.ctdo.bunti.model.*; diff --git a/src/main/java/de/ctdo/bunti/DeviceChangedEvent.java b/src/main/java/de/ctdo/bunti/control/DeviceChangedEvent.java similarity index 95% rename from src/main/java/de/ctdo/bunti/DeviceChangedEvent.java rename to src/main/java/de/ctdo/bunti/control/DeviceChangedEvent.java index 0c5af4b..a6e4691 100644 --- a/src/main/java/de/ctdo/bunti/DeviceChangedEvent.java +++ b/src/main/java/de/ctdo/bunti/control/DeviceChangedEvent.java @@ -1,4 +1,4 @@ -package de.ctdo.bunti; +package de.ctdo.bunti.control; import java.util.Map; diff --git a/src/main/java/de/ctdo/bunti/devices/DeviceMixerImpl.java b/src/main/java/de/ctdo/bunti/devices/DeviceMixerImpl.java index 70d3fba..a1345c6 100644 --- a/src/main/java/de/ctdo/bunti/devices/DeviceMixerImpl.java +++ b/src/main/java/de/ctdo/bunti/devices/DeviceMixerImpl.java @@ -1,9 +1,9 @@ package de.ctdo.bunti.devices; +import de.ctdo.bunti.control.DeviceChangedEvent; import org.springframework.context.ApplicationListener; import org.springframework.stereotype.Component; -import de.ctdo.bunti.DeviceChangedEvent; import de.ctdo.bunti.model.BuntiSwitchingDevice; diff --git a/src/main/java/de/ctdo/bunti/dmx/DMXMixerImpl.java b/src/main/java/de/ctdo/bunti/dmx/DMXMixerImpl.java index c316c81..da35663 100644 --- a/src/main/java/de/ctdo/bunti/dmx/DMXMixerImpl.java +++ b/src/main/java/de/ctdo/bunti/dmx/DMXMixerImpl.java @@ -1,6 +1,6 @@ package de.ctdo.bunti.dmx; -import de.ctdo.bunti.DeviceChangedEvent; +import de.ctdo.bunti.control.DeviceChangedEvent; import de.ctdo.bunti.artnet.SimpleArtNetSender; import de.ctdo.bunti.model.BuntiDMXDevice; import de.ctdo.bunti.model.BuntiDevice; diff --git a/src/main/java/de/ctdo/bunti/web/DeviceControlController.java b/src/main/java/de/ctdo/bunti/web/DeviceControlController.java index 6428089..5d85a6f 100644 --- a/src/main/java/de/ctdo/bunti/web/DeviceControlController.java +++ b/src/main/java/de/ctdo/bunti/web/DeviceControlController.java @@ -1,8 +1,8 @@ package de.ctdo.bunti.web; import de.ctdo.bunti.control.BuntiController; -import de.ctdo.bunti.webmodel.DeviceUpdate; -import de.ctdo.bunti.webmodel.DeviceUpdates; +import de.ctdo.bunti.web.model.DeviceUpdate; +import de.ctdo.bunti.web.model.DeviceUpdates; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/de/ctdo/bunti/webmodel/DeviceUpdate.java b/src/main/java/de/ctdo/bunti/web/model/DeviceUpdate.java similarity index 87% rename from src/main/java/de/ctdo/bunti/webmodel/DeviceUpdate.java rename to src/main/java/de/ctdo/bunti/web/model/DeviceUpdate.java index 4437c5c..0c5200b 100644 --- a/src/main/java/de/ctdo/bunti/webmodel/DeviceUpdate.java +++ b/src/main/java/de/ctdo/bunti/web/model/DeviceUpdate.java @@ -1,6 +1,5 @@ -package de.ctdo.bunti.webmodel; +package de.ctdo.bunti.web.model; -import java.io.Serializable; import java.util.Map; diff --git a/src/main/java/de/ctdo/bunti/webmodel/DeviceUpdates.java b/src/main/java/de/ctdo/bunti/web/model/DeviceUpdates.java similarity index 95% rename from src/main/java/de/ctdo/bunti/webmodel/DeviceUpdates.java rename to src/main/java/de/ctdo/bunti/web/model/DeviceUpdates.java index 11635a6..3460e9c 100644 --- a/src/main/java/de/ctdo/bunti/webmodel/DeviceUpdates.java +++ b/src/main/java/de/ctdo/bunti/web/model/DeviceUpdates.java @@ -1,4 +1,4 @@ -package de.ctdo.bunti.webmodel; +package de.ctdo.bunti.web.model; import java.util.ArrayList; import java.util.List;