Some bugfixes for multiple reports
This commit is contained in:
parent
17438db7a2
commit
a21ac02333
9 changed files with 21 additions and 15 deletions
|
|
@ -26,7 +26,7 @@ public class SensorControllerManager extends HalAbstractControllerManager<HalAbs
|
|||
|
||||
/** List of all registered sensors **/
|
||||
private List<Sensor> registeredSensors = Collections.synchronizedList(new ArrayList<>());
|
||||
/** List of auto detected sensors **/
|
||||
/** List of auto-detected sensors **/
|
||||
private List<Sensor> detectedSensors = Collections.synchronizedList(new ArrayList<>());
|
||||
|
||||
|
||||
|
|
@ -122,7 +122,7 @@ public class SensorControllerManager extends HalAbstractControllerManager<HalAbs
|
|||
}
|
||||
|
||||
/**
|
||||
* Removes all auto detected sensors.
|
||||
* Removes all auto-detected sensors.
|
||||
*/
|
||||
@Override
|
||||
public void clearDetectedDevices(){
|
||||
|
|
|
|||
|
|
@ -28,15 +28,13 @@ public class SendEventAction implements HalAction {
|
|||
@Override
|
||||
public void execute() {
|
||||
try {
|
||||
DBConnection db = HalContext.getDB();
|
||||
if (event != null) {
|
||||
HalEventData dataObj = (HalEventData) event.getDeviceConfig().getDeviceDataClass().newInstance();
|
||||
HalEventData dataObj = (HalEventData) event.getDeviceConfig().getDeviceDataClass().getDeclaredConstructor().newInstance();
|
||||
dataObj.setData(data);
|
||||
event.setDeviceData(dataObj);
|
||||
// Send
|
||||
EventControllerManager.getInstance().send(event);
|
||||
}
|
||||
else
|
||||
} else
|
||||
logger.warning("Unable to find event with id: "+ event.getId());
|
||||
} catch (Exception e) {
|
||||
logger.log(Level.SEVERE, null, e);
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ public class ConfigEventValueProvider implements Configurator.ConfigValueProvide
|
|||
|
||||
@Override
|
||||
public List<String> getPossibleValues() {
|
||||
return new ArrayList<String>(events.keySet());
|
||||
return new ArrayList<>(events.keySet());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue