From 40bf50c0f2669069dda51eab579417c2e582da51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Ple=C3=9F?= <lucas@xleave.de>
Date: Wed, 7 Mar 2012 00:41:24 +0100
Subject: [PATCH] moved address configuration in seperate file

---
 src/main/java/de/ctdo/bunti/dmx/DMXMixerImpl.java |  8 ++++++--
 src/main/resources/bunti.properties               |  1 +
 src/main/webapp/WEB-INF/dispatcher-servlet.xml    | 12 +++++++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 src/main/resources/bunti.properties

diff --git a/src/main/java/de/ctdo/bunti/dmx/DMXMixerImpl.java b/src/main/java/de/ctdo/bunti/dmx/DMXMixerImpl.java
index e4c1dfb..90029e3 100644
--- a/src/main/java/de/ctdo/bunti/dmx/DMXMixerImpl.java
+++ b/src/main/java/de/ctdo/bunti/dmx/DMXMixerImpl.java
@@ -19,7 +19,7 @@ import java.util.Map;
 
 public class DMXMixerImpl implements DMXMixer, ApplicationListener<DeviceChangedEvent> {
     private static final Logger LOGGER                = LoggerFactory.getLogger(DMXMixerImpl.class);
-    private static final String ARTNET_DEVICE_ADDRESS = "192.168.0.90";
+    private String artNetDeviceAddress;
 
     private final Map<Integer, Integer> dmxMap = Collections.synchronizedMap(new HashMap<Integer, Integer>());
     private SimpleArtNetSender artNetSender;
@@ -30,6 +30,9 @@ public class DMXMixerImpl implements DMXMixer, ApplicationListener<DeviceChanged
         this.artNetSender = artNetSender;
     }
 
+    public void setArtNetDeviceAddress(String artNetDeviceAddress) {
+        this.artNetDeviceAddress = artNetDeviceAddress;
+    }
 
     public final void initDMXData() {
         for (int i = 0; i <= DMX.DMX_CHANNELS_MAX; i++) {
@@ -45,7 +48,7 @@ public class DMXMixerImpl implements DMXMixer, ApplicationListener<DeviceChanged
         }
 
         if (hasDataChanged) {
-            artNetSender.sendDMXData(dmxMap, ARTNET_DEVICE_ADDRESS);
+            artNetSender.sendDMXData(dmxMap, artNetDeviceAddress);
             hasDataChanged = false;
         }
 
@@ -87,4 +90,5 @@ public class DMXMixerImpl implements DMXMixer, ApplicationListener<DeviceChanged
         }
     }
 
+
 }
diff --git a/src/main/resources/bunti.properties b/src/main/resources/bunti.properties
new file mode 100644
index 0000000..3a61845
--- /dev/null
+++ b/src/main/resources/bunti.properties
@@ -0,0 +1 @@
+artnet.deviceAddress=192.168.0.90
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/dispatcher-servlet.xml b/src/main/webapp/WEB-INF/dispatcher-servlet.xml
index 07d1f55..74a44f7 100644
--- a/src/main/webapp/WEB-INF/dispatcher-servlet.xml
+++ b/src/main/webapp/WEB-INF/dispatcher-servlet.xml
@@ -8,7 +8,12 @@
         http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
         http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd">
 
-	<context:component-scan base-package="de.ctdo" />
+
+    <context:component-scan base-package="de.ctdo" />
+
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+        <property name="location" value="classpath:bunti.properties"/>
+    </bean>
 
 	
 	<bean class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping" />
@@ -19,4 +24,9 @@
 	<task:executor id="myExecutor" pool-size="3-10" queue-capacity="50" />-->
 	<task:scheduler id="myScheduler" pool-size="3"/>
 
+
+    <bean class="de.ctdo.bunti.dmx.DMXMixerImpl">
+        <property name="artNetDeviceAddress" value="${artnet.deviceAddress}"/>
+    </bean>
+
 </beans>
\ No newline at end of file