ctdo
/
bunti
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

renamed getDeviceID to getId

This commit is contained in:
Lucas Pleß 2012-03-21 21:22:53 +01:00
parent 351f1b1816
commit 793cb2a940
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/ctdo/bunti/dao/BuntiDevicesDAOImpl.java
View File

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

2
src/main/java/de/ctdo/bunti/model/BuntiDevice.java
View File

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

2
src/main/java/de/ctdo/bunti/model/Par56Spot.java
View File

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

2
src/main/java/de/ctdo/bunti/model/Strobe1500.java
View File

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

2
src/test/java/de/ctdo/bunti/model/BuntiDMXDeviceTest.java
View File

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