From e786db9406a4b3105f0006fa2231bdd018acd21b Mon Sep 17 00:00:00 2001 From: Juergen Jung Date: Sun, 4 Mar 2012 01:21:00 +0100 Subject: [PATCH] Do some cleanup --- .gitignore | 1 + .../java/de/ctdo/bunti/artnet/ArtNetSocket.java | 2 +- .../ctdo/bunti/artnet/SimpleArtNetSender.java | 2 +- .../java/de/ctdo/bunti/dao/BuntiDevicesDAO.java | 4 ++-- src/main/java/de/ctdo/bunti/dmx/DMX.java | 17 +++++++++++------ .../java/de/ctdo/bunti/dmx/DMXChannels.java | 4 ++-- src/main/java/de/ctdo/bunti/dmx/DMXMixer.java | 4 ++-- .../java/de/ctdo/bunti/dmx/DMXMixerImpl.java | 8 ++++---- .../java/de/ctdo/bunti/model/Par56Spot.java | 2 +- .../java/de/ctdo/bunti/web/TestController.java | 12 +++++------- .../bunti/websocket/BuntiControllerServlet.java | 7 ------- 11 files changed, 30 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index 2e1446a..e485ed6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ bunti.server.iml .classpath .project .settings/ +target/ diff --git a/src/main/java/de/ctdo/bunti/artnet/ArtNetSocket.java b/src/main/java/de/ctdo/bunti/artnet/ArtNetSocket.java index 38cb792..4f42e5c 100644 --- a/src/main/java/de/ctdo/bunti/artnet/ArtNetSocket.java +++ b/src/main/java/de/ctdo/bunti/artnet/ArtNetSocket.java @@ -5,6 +5,6 @@ import de.ctdo.bunti.artnet.packets.ArtNetPacket; public interface ArtNetSocket { - public boolean unicastPacket(ArtNetPacket pack, String address); + boolean unicastPacket(ArtNetPacket pack, String address); } diff --git a/src/main/java/de/ctdo/bunti/artnet/SimpleArtNetSender.java b/src/main/java/de/ctdo/bunti/artnet/SimpleArtNetSender.java index 83abda7..b80832b 100644 --- a/src/main/java/de/ctdo/bunti/artnet/SimpleArtNetSender.java +++ b/src/main/java/de/ctdo/bunti/artnet/SimpleArtNetSender.java @@ -4,6 +4,6 @@ import java.util.Map; public interface SimpleArtNetSender { - public void sendDMXData(Map dmxdata, String adr); + void sendDMXData(Map dmxdata, String adr); } diff --git a/src/main/java/de/ctdo/bunti/dao/BuntiDevicesDAO.java b/src/main/java/de/ctdo/bunti/dao/BuntiDevicesDAO.java index 6d90cfa..78fa900 100644 --- a/src/main/java/de/ctdo/bunti/dao/BuntiDevicesDAO.java +++ b/src/main/java/de/ctdo/bunti/dao/BuntiDevicesDAO.java @@ -6,7 +6,7 @@ import de.ctdo.bunti.model.*; public interface BuntiDevicesDAO { - public Collection getAllDMXDevices(); - public BuntiDevice getDeviceById(int deviceId); + Collection getAllDMXDevices(); + BuntiDevice getDeviceById(int deviceId); } diff --git a/src/main/java/de/ctdo/bunti/dmx/DMX.java b/src/main/java/de/ctdo/bunti/dmx/DMX.java index e54a0df..7735fac 100644 --- a/src/main/java/de/ctdo/bunti/dmx/DMX.java +++ b/src/main/java/de/ctdo/bunti/dmx/DMX.java @@ -2,16 +2,21 @@ package de.ctdo.bunti.dmx; public class DMX { - public static int DMX_CHANNELS_MAX = (byte) 511; - public static int DMX_CHANNELS_MIN = 0; - public static int DMX_CHANNEL_VALUE_MAX = (byte) 255; - public static int DMX_CHANNEL_VALUE_MIN = 0; + public static final int DMX_CHANNELS_MAX = (byte) 511; + public static final int DMX_CHANNELS_MIN = 0; + public static final int DMX_CHANNEL_VALUE_MAX = (byte) 255; + public static final int DMX_CHANNEL_VALUE_MIN = 0; /** * Offset by which startaddress differs from DMX512 Data Array location */ - public static int DMX_STARTADDRESS_OFFSET = -1; - + public static final int DMX_STARTADDRESS_OFFSET = -1; + + + private DMX(){ + + } + /** * Checks the DMX Value boundaries * @param value diff --git a/src/main/java/de/ctdo/bunti/dmx/DMXChannels.java b/src/main/java/de/ctdo/bunti/dmx/DMXChannels.java index 99bb3f0..4ae9eb3 100644 --- a/src/main/java/de/ctdo/bunti/dmx/DMXChannels.java +++ b/src/main/java/de/ctdo/bunti/dmx/DMXChannels.java @@ -59,11 +59,11 @@ public class DMXChannels { return false; } // entry must not exist by offset - if (this.channelByNumber.containsKey(channel.getOffset()) == true) { + if (this.channelByNumber.containsKey(channel.getOffset())) { return false; } // entry must not exist by name - if (this.channelByName.containsKey(channel.getName()) == true) { + if (this.channelByName.containsKey(channel.getName())) { return false; } this.channelByNumber.put(channel.getOffset(), channel); diff --git a/src/main/java/de/ctdo/bunti/dmx/DMXMixer.java b/src/main/java/de/ctdo/bunti/dmx/DMXMixer.java index 8f223ea..1f5ea80 100644 --- a/src/main/java/de/ctdo/bunti/dmx/DMXMixer.java +++ b/src/main/java/de/ctdo/bunti/dmx/DMXMixer.java @@ -6,7 +6,7 @@ import de.ctdo.bunti.model.BuntiDevice; public interface DMXMixer { - public void setDMX512Channel(int channel, int value); - public void updateDevice(BuntiDevice device, Map options); + void setDMX512Channel(int channel, int value); + void updateDevice(BuntiDevice device, Map options); } diff --git a/src/main/java/de/ctdo/bunti/dmx/DMXMixerImpl.java b/src/main/java/de/ctdo/bunti/dmx/DMXMixerImpl.java index 92e7ded..6c18b33 100644 --- a/src/main/java/de/ctdo/bunti/dmx/DMXMixerImpl.java +++ b/src/main/java/de/ctdo/bunti/dmx/DMXMixerImpl.java @@ -20,8 +20,8 @@ import de.ctdo.bunti.model.*; @Component public class DMXMixerImpl implements DMXMixer, ApplicationListener { - private final Logger logger = LoggerFactory.getLogger(getClass()); - private final String ARTNET_DEVICE_ADDRESS = "192.168.0.90"; + private static final Logger LOGGER = LoggerFactory.getLogger(DMXMixerImpl.class); + private static final String ARTNET_DEVICE_ADDRESS = "192.168.0.90"; private final Map dmxMap = Collections.synchronizedMap(new HashMap()); private SimpleArtNetSender artNetSender; @@ -59,9 +59,9 @@ public class DMXMixerImpl implements DMXMixer, ApplicationListener