lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Refactoring HawkbitUiErrorHandler

Browse Source 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
This commit is contained in:
Melanie Retter
2016-08-11 16:05:22 +02:00
parent 0d632d598a
commit 92fb82129a
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/HawkbitUIErrorHandler.java
View File

@@ -46,16 +46,13 @@ public class HawkbitUIErrorHandler extends DefaultErrorHandler {
if (originError.isPresent()) { if (originError.isPresent()) {
final Connector connector = ((ConnectorErrorEvent) event).getConnector(); final Connector connector = ((ConnectorErrorEvent) event).getConnector();
// in case of BulkUpload: BulkUpload needs a lock to show the
// notification
if (connector instanceof UI) { if (connector instanceof UI) {
((UI) (((ConnectorErrorEvent) event).getConnector())).access(() -> message.show(originError.get())); ((UI) connector).access(() -> message.show(originError.get()));
return; return;
} }
message.show(originError.get()); message.show(originError.get());
return; return;
} }
// Default
HawkbitErrorNotificationMessage.show(message.getCaption(), message.getDescription(), Type.HUMANIZED_MESSAGE); HawkbitErrorNotificationMessage.show(message.getCaption(), message.getDescription(), Type.HUMANIZED_MESSAGE);
} }
@@ -86,10 +83,6 @@ public class HawkbitUIErrorHandler extends DefaultErrorHandler {
protected HawkbitErrorNotificationMessage buildNotification(final Throwable exception) { protected HawkbitErrorNotificationMessage buildNotification(final Throwable exception) {
LOG.error("Error in UI: ", exception); LOG.error("Error in UI: ", exception);
return createHawkbitErrorNotificationMessage(exception);
}
protected HawkbitErrorNotificationMessage createHawkbitErrorNotificationMessage(final Throwable exception) {
final I18N i18n = SpringContextHelper.getBean(I18N.class); final I18N i18n = SpringContextHelper.getBean(I18N.class);
return new HawkbitErrorNotificationMessage(STYLE, i18n.get("caption.error"), return new HawkbitErrorNotificationMessage(STYLE, i18n.get("caption.error"),
i18n.get("message.error.temp", exception.getClass().getSimpleName()), false); i18n.get("message.error.temp", exception.getClass().getSimpleName()), false);