renamed getDeviceID to getId

src/main/java/de/ctdo/bunti/dao/BuntiDevicesDAOImpl.java

@@ -53,7 +53,7 @@ public final class BuntiDevicesDAOImpl implements BuntiDevicesDAO {
 	@Override
 	public BuntiDevice getDeviceById(int deviceId) {
 		for (BuntiDevice dev : devices) {
-			if(dev.getDeviceId() == deviceId) {
+			if(dev.getId() == deviceId) {
 				return dev;
 			}
 		}

src/main/java/de/ctdo/bunti/model/BuntiDevice.java

@@ -35,7 +35,7 @@ public abstract class BuntiDevice {
      * Gets the device Id
      * @return the device Id
      */
-    public final int getDeviceId() {
+    public final int getId() {
         return deviceId;
     }
 

src/main/java/de/ctdo/bunti/model/Par56Spot.java

@@ -67,7 +67,7 @@ public class Par56Spot extends BuntiDMXDevice {
     public final String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("Par56Spot ");
-        sb.append(getDeviceId());
+        sb.append(getId());
         sb.append(", ");
         sb.append(getDeviceName());
         sb.append(" [");

src/main/java/de/ctdo/bunti/model/Strobe1500.java

@@ -59,7 +59,7 @@ public class Strobe1500 extends BuntiDMXDevice {
     public final String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("Strobe1500 ");
-        sb.append(getDeviceId());
+        sb.append(getId());
         sb.append(", ");
         sb.append(getDeviceName());
         sb.append(" [");

src/test/java/de/ctdo/bunti/model/BuntiDMXDeviceTest.java

@@ -139,7 +139,7 @@ public class BuntiDMXDeviceTest {
     
     @Test
     public void testGetDeviceId() throws Exception {
-        assertEquals(DEVICEID, dut.getDeviceId());
+        assertEquals(DEVICEID, dut.getId());
     }
 
     @Test