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

Refactoring of of inheritance structure, ControllerManagers will now also be able to be provided through plugins

Browse source
This commit is contained in:
Ziver Koc 2021-03-16 22:24:43 +01:00
parent 28bc108921
commit c0188cd5cc
73 changed files with 1083 additions and 991 deletions
Download patch file Download diff file Expand all files Collapse all files

16
plugins/hal-netscan/src/se/hal/plugin/netscan/NetScanController.java
View file

@ -26,7 +26,7 @@ public class NetScanController implements HalEventController, HalAutoScannableCo
private static final String PARAM_IPSCAN = "netscan.ipscan";
private ScheduledExecutorService executor;
private HalEventReportListener listener;
private HalDeviceReportListener listener;
/** A register and a cache of previous state **/
private HashMap<NetworkDevice, AvailabilityEventData> devices = new HashMap<>();
@ -97,14 +97,16 @@ public class NetScanController implements HalEventController, HalAutoScannableCo
@Override
public void register(HalEventConfig event) {
if (event instanceof NetworkDevice)
devices.put((NetworkDevice) event, null);
public void register(HalDeviceConfig deviceConfig) {
if (deviceConfig instanceof NetworkDevice)
devices.put((NetworkDevice) deviceConfig, null);
}
@Override
public void deregister(HalEventConfig event) {
devices.remove(event);
public void deregister(HalDeviceConfig deviceConfig) {
devices.remove(deviceConfig);
}
@Override
public int size() {
return devices.size();
@ -116,7 +118,7 @@ public class NetScanController implements HalEventController, HalAutoScannableCo
@Override
public void setListener(HalEventReportListener listener) {
public void setListener(HalDeviceReportListener listener) {
this.listener = listener;
}

4
plugins/hal-netscan/src/se/hal/plugin/netscan/NetworkDevice.java
View file

@ -35,11 +35,11 @@ public class NetworkDevice implements HalEventConfig {
}
@Override
public Class<? extends HalEventController> getEventControllerClass() {
public Class<? extends HalEventController> getDeviceControllerClass() {
return NetScanController.class;
}
@Override
public Class<? extends HalEventData> getEventDataClass() {
public Class<? extends HalEventData> getDeviceDataClass() {
return OnOffEventData.class;
}
}