ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Removed generics from device listener and updated some js libs

Browse source
This commit is contained in:
Ziver Koc 2021-07-02 00:06:26 +02:00
parent 53d471c0aa
commit 94bfbbd664
18 changed files with 707 additions and 689 deletions
Download patch file Download diff file Expand all files Collapse all files

16
plugins/hal-tellstick/test/se/hal/plugin/tellstick/TellstickSerialCommEventTest.java
View file

@ -2,9 +2,7 @@ package se.hal.plugin.tellstick;
import org.junit.Before;
import org.junit.Test;
import se.hal.intf.HalDeviceReportListener;
import se.hal.intf.HalEventConfig;
import se.hal.intf.HalEventData;
import se.hal.intf.*;
import se.hal.plugin.tellstick.test.TestEventDevice;
import se.hal.plugin.tellstick.test.TestProtocol;
@ -47,10 +45,10 @@ public class TellstickSerialCommEventTest {
// Setup
TellstickSerialComm tellstick = new TellstickSerialComm();
final ArrayList<HalEventConfig> list = new ArrayList<>();
tellstick.setListener(new HalDeviceReportListener<HalEventConfig,HalEventData>() {
tellstick.addListener(new HalDeviceReportListener() {
@Override
public void reportReceived(HalEventConfig e, HalEventData d) {
list.add(e);
public void reportReceived(HalDeviceConfig e, HalDeviceData d) {
list.add((HalEventConfig) e);
}
});
// Execution
@ -65,10 +63,10 @@ public class TellstickSerialCommEventTest {
// Setup
TellstickSerialComm tellstick = new TellstickSerialComm();
final ArrayList<HalEventConfig> list = new ArrayList<>();
tellstick.setListener(new HalDeviceReportListener<HalEventConfig,HalEventData>() {
tellstick.addListener(new HalDeviceReportListener() {
@Override
public void reportReceived(HalEventConfig e, HalEventData d) {
list.add(e);
public void reportReceived(HalDeviceConfig e, HalDeviceData d) {
list.add((HalEventConfig) e);
}
});
// Execution

16
plugins/hal-tellstick/test/se/hal/plugin/tellstick/TellstickSerialCommSensorTest.java
View file

@ -2,9 +2,7 @@ package se.hal.plugin.tellstick;
import org.junit.Before;
import org.junit.Test;
import se.hal.intf.HalDeviceReportListener;
import se.hal.intf.HalSensorConfig;
import se.hal.intf.HalSensorData;
import se.hal.intf.*;
import se.hal.plugin.tellstick.test.TestProtocol;
import se.hal.plugin.tellstick.test.TestSensorDevice;
@ -32,10 +30,10 @@ public class TellstickSerialCommSensorTest {
// Setup
TellstickSerialComm tellstick = new TellstickSerialComm();
final ArrayList<HalSensorConfig> list = new ArrayList<>();
tellstick.setListener(new HalDeviceReportListener<HalSensorConfig,HalSensorData>() {
tellstick.addListener(new HalDeviceReportListener() {
@Override
public void reportReceived(HalSensorConfig e, HalSensorData d) {
list.add(e);
public void reportReceived(HalDeviceConfig e, HalDeviceData d) {
list.add((HalSensorConfig) e);
}
});
// Execution
@ -50,10 +48,10 @@ public class TellstickSerialCommSensorTest {
// Setup
TellstickSerialComm tellstick = new TellstickSerialComm();
final ArrayList<HalSensorConfig> list = new ArrayList<>();
tellstick.setListener(new HalDeviceReportListener<HalSensorConfig,HalSensorData>() {
tellstick.addListener(new HalDeviceReportListener() {
@Override
public void reportReceived(HalSensorConfig e, HalSensorData d) {
list.add(e);
public void reportReceived(HalDeviceConfig e, HalDeviceData d) {
list.add((HalSensorConfig) e);
}
});
// Execution