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

Refactored alerts to be API based and not directly generated into the HTML

Browse source
This commit is contained in:
Ziver Koc 2023-01-11 03:41:15 +01:00
parent 2ee0e775be
commit ed04554a4a
27 changed files with 340 additions and 218 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/hal-nvr/src/se/hal/plugin/nvr/page/CameraConfigWebPage.java
View file

@ -24,16 +24,13 @@
package se.hal.plugin.nvr.page;
import se.hal.EventControllerManager;
import se.hal.HalContext;
import se.hal.intf.HalWebPage;
import se.hal.page.HalAlertManager;
import se.hal.plugin.nvr.CameraControllerManager;
import se.hal.plugin.nvr.struct.Camera;
import se.hal.struct.Room;
import se.hal.util.ClassConfigurationFacade;
import se.hal.struct.User;
import se.hal.util.RoomValueProvider;
import zutil.ObjectUtil;
import zutil.db.DBConnection;
import zutil.io.file.FileUtil;
@ -46,6 +43,7 @@ import java.util.logging.Logger;
import static zutil.ui.UserMessageManager.*;
public class CameraConfigWebPage extends HalWebPage {
private static final Logger logger = LogUtil.getLogger();
private static final String TEMPLATE = HalContext.RESOURCE_WEB_ROOT + "/camera_config.tmpl";
@ -86,7 +84,7 @@ public class CameraConfigWebPage extends HalWebPage {
if (camera == null) {
logger.warning("Unknown camera id: " + id);
HalAlertManager.getInstance().addAlert(new UserMessage(
HalContext.getUserMessageManager().add(new UserMessage(
MessageLevel.ERROR, "Unknown camera id: " + id, MessageTTL.ONE_VIEW));
}
}
@ -103,7 +101,7 @@ public class CameraConfigWebPage extends HalWebPage {
camera.save(db);
CameraControllerManager.getInstance().register(camera);
HalAlertManager.getInstance().addAlert(new UserMessage(
HalContext.getUserMessageManager().add(new UserMessage(
MessageLevel.SUCCESS, "Successfully created new camera: " + camera.getName(), MessageTTL.ONE_VIEW));
break;
@ -117,7 +115,7 @@ public class CameraConfigWebPage extends HalWebPage {
camera.getDeviceConfigurator().setValues(request).applyConfiguration();
camera.save(db);
HalAlertManager.getInstance().addAlert(new UserMessage(
HalContext.getUserMessageManager().add(new UserMessage(
MessageLevel.SUCCESS, "Successfully saved camera: " + camera.getName(), MessageTTL.ONE_VIEW));
}
break;
@ -128,7 +126,7 @@ public class CameraConfigWebPage extends HalWebPage {
CameraControllerManager.getInstance().deregister(camera);
camera.delete(db);
HalAlertManager.getInstance().addAlert(new UserMessage(
HalContext.getUserMessageManager().add(new UserMessage(
MessageLevel.SUCCESS, "Successfully removed camera: " + camera.getName(), MessageTTL.ONE_VIEW));
}
break;

3
plugins/hal-powerchallenge/src/se/hal/plugin/powerchallenge/daemon/PCDataSynchronizationClient.java
View file

@ -26,7 +26,6 @@ package se.hal.plugin.powerchallenge.daemon;
import se.hal.HalContext;
import se.hal.intf.HalDaemon;
import se.hal.page.HalAlertManager;
import se.hal.plugin.powerchallenge.daemon.PCDataSynchronizationDaemon.PeerDataRspDTO;
import se.hal.plugin.powerchallenge.daemon.PCDataSynchronizationDaemon.SensorDTO;
import se.hal.plugin.powerchallenge.daemon.PCDataSynchronizationDaemon.SensorDataDTO;
@ -157,7 +156,7 @@ public class PCDataSynchronizationClient implements HalDaemon, Runnable {
} catch (NoRouteToHostException|UnknownHostException|ConnectException|SocketTimeoutException e) {
logger.warning("Unable to connect to "+ user.getHostname()+":"+user.getPort() +", "+ e.getMessage());
HalAlertManager.getInstance().addAlert(new UserMessage(MessageLevel.WARNING,
HalContext.getUserMessageManager().add(new UserMessage(MessageLevel.WARNING,
"Unable to connect to user with host: "+user.getHostname(), MessageTTL.DISMISSED));
} catch (Exception e) {
logger.log(Level.SEVERE, null, e);