From e5fb13bdcf85ab7d10cfc579bfdda1b0ca364047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Ple=C3=9F?= <lucas.pless@isst.fraunhofer.de>
Date: Tue, 6 Mar 2012 18:11:20 +0100
Subject: [PATCH] removed commented out code

---
 .../de/ctdo/bunti/model/BuntiDMXDevice.java   | 50 +------------------
 1 file changed, 1 insertion(+), 49 deletions(-)

diff --git a/src/main/java/de/ctdo/bunti/model/BuntiDMXDevice.java b/src/main/java/de/ctdo/bunti/model/BuntiDMXDevice.java
index 73a9110..1618977 100644
--- a/src/main/java/de/ctdo/bunti/model/BuntiDMXDevice.java
+++ b/src/main/java/de/ctdo/bunti/model/BuntiDMXDevice.java
@@ -60,55 +60,7 @@ public abstract class BuntiDMXDevice extends BuntiDevice {
 		}
 		return 0;
 	}
-	
-//	/**
-//	 * Merge the DMX values from this device into a global DMX512 Data Array.
-//	 * @param dmxData DMX512 Data array to merge the local values into.
-//	 * @return True on success, false otherwise.
-//	 */
-//	public boolean mergeDMXData(int[] dmxData) {
-//
-//		if(dmxData == null || dmxData.length == 0) {
-//			return false;
-//		}
-//		
-//		for (DMXChannel channel : dmxChannels.getAllChannels()) {
-//			int index = channel.getOffset() + (startAddress - DMX.DMX_STARTADDRESS_OFFSET);
-//			
-//			if(index >= 0 && index < dmxData.length){
-//				dmxData[index] = channel.getValue();
-//			} else {
-//				return false;
-//			}
-//		}
-//		
-//		return true;
-//	}
-//	
-//	/**
-//	 * Merge the DMX values from this device into a global DMX512 Data Array.
-//	 * @param dmxData DMX512 Data to merge the local values into.
-//	 * @return True on success, false otherwise.
-//	 */
-//	public boolean mergeDMXData(Map<Integer,Integer> dmxData) {
-//	
-//		if(dmxData == null || dmxData.size() == 0) {
-//			return false;
-//		}
-//			
-//		for (DMXChannel channel : dmxChannels.getAllChannels()) {
-//			int index = channel.getOffset() + (startAddress - DMX.DMX_STARTADDRESS_OFFSET);
-//			
-//			if(index >= DMX.DMX_CHANNELS_MIN && index <= DMX.DMX_CHANNELS_MAX){
-//				dmxData.put(index, channel.getValue());
-//			} else {
-//				return false;
-//			}
-//		}
-//		
-//		return true;
-//	}
-	
+
 	public Map<Integer,Integer> getChannelData() {
 		Map<Integer,Integer> map = new HashMap<Integer, Integer>();