From 26c376e22ea7078ee14e8357aea4196ced0d0640 Mon Sep 17 00:00:00 2001
From: Melanie Retter <melanie.retter@bosch-si.com>
Date: Mon, 1 Aug 2016 10:13:45 +0200
Subject: [PATCH] Refactor HawkbitNotificationMessage

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
---
 ...a => HawkbitErrorNotificationMessage.java} | 32 +++++--------------
 .../ui/components/HawkbitUIErrorHandler.java  |  9 ++----
 .../hawkbit/ui/utils/NotificationMessage.java |  4 ---
 3 files changed, 11 insertions(+), 34 deletions(-)
 rename hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/{HawkbitNotificationMessage.java => HawkbitErrorNotificationMessage.java} (59%)

diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/HawkbitNotificationMessage.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/HawkbitErrorNotificationMessage.java
similarity index 59%
rename from hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/HawkbitNotificationMessage.java
rename to hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/HawkbitErrorNotificationMessage.java
index b0561dbb5..e7199c04f 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/HawkbitNotificationMessage.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/HawkbitErrorNotificationMessage.java
@@ -16,7 +16,7 @@ import com.vaadin.ui.Notification;
 /**
  * Notification message component.
  */
-public class HawkbitNotificationMessage extends Notification {
+public class HawkbitErrorNotificationMessage extends Notification {
 
     /**
      * ID.
@@ -26,34 +26,18 @@ public class HawkbitNotificationMessage extends Notification {
     /**
      * Constructor.
      */
-    public HawkbitNotificationMessage() {
-        super("");
-    }
-
-    /**
-     * Decorate.
-     * 
-     * @param styleName
-     *            style name of message
-     * @param caption
-     *            message caption
-     * @param description
-     *            message description
-     * @param autoClose
-     *            flag to indicate enable close option
-     */
-    public void decorateWith(final String styleName, final String caption, final String description,
-            final Boolean autoClose) {
-        setCaption(caption);
-        setDescription(description);
-        setStyleName(styleName);
-        setHtmlContentAllowed(true);
-        setPosition(Position.BOTTOM_RIGHT);
+    public HawkbitErrorNotificationMessage(final String style, final String caption, final String description,
+            final boolean autoClose) {
+        super(caption);
+        setStyleName(style);
         if (autoClose) {
             setDelayMsec(SPUILabelDefinitions.SP_DELAY);
         } else {
             setDelayMsec(-1);
         }
+        setHtmlContentAllowed(true);
+        setPosition(Position.BOTTOM_RIGHT);
+        setDescription(description);
     }
 
 }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/HawkbitUIErrorHandler.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/HawkbitUIErrorHandler.java
index 54552d4da..aa7e979f9 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/HawkbitUIErrorHandler.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/HawkbitUIErrorHandler.java
@@ -41,7 +41,7 @@ public class HawkbitUIErrorHandler extends DefaultErrorHandler {
         final Optional<Page> originError = getPageOriginError(event);
 
         if (originError.isPresent()) {
-            final HawkbitNotificationMessage message = buildNotification(getRootExceptionFrom(event));
+            final HawkbitErrorNotificationMessage message = buildNotification(getRootExceptionFrom(event));
             message.show(originError.get());
         }
     }
@@ -71,14 +71,11 @@ public class HawkbitUIErrorHandler extends DefaultErrorHandler {
         return Optional.absent();
     }
 
-    protected HawkbitNotificationMessage buildNotification(final Throwable exception) {
+    protected HawkbitErrorNotificationMessage buildNotification(final Throwable exception) {
 
-        final HawkbitNotificationMessage notification = new HawkbitNotificationMessage();
         final I18N i18n = SpringContextHelper.getBean(I18N.class);
-        notification.decorateWith(STYLE, i18n.get("caption.error"),
+        return new HawkbitErrorNotificationMessage(STYLE, i18n.get("caption.error"),
                 i18n.get("message.error.temp", exception.getClass().getSimpleName()), false);
-
-        return notification;
     }
 
 }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/NotificationMessage.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/NotificationMessage.java
index edfb99f22..1e2dbcf07 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/NotificationMessage.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/NotificationMessage.java
@@ -16,8 +16,6 @@ import com.vaadin.ui.Notification;
 
 /**
  * Show notification messages.
- * 
- *
  */
 @UIScope
 @SpringComponent
@@ -27,8 +25,6 @@ public class NotificationMessage extends Notification {
 
     /**
      * Default constructor of notification message.
-     * 
-     * @param caption
      */
     public NotificationMessage() {
         super("");