From 887536b2b79561724e3cf7817fff739b7df650d7 Mon Sep 17 00:00:00 2001
From: Asharani <asharani.murugesh@in.bosch.com>
Date: Mon, 9 May 2016 10:42:23 +0530
Subject: [PATCH] Upload confirmation popup - on discard remove the upload
 status button

Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
---
 .../artifacts/upload/UploadConfirmationwindow.java   |  2 +-
 .../hawkbit/ui/artifacts/upload/UploadLayout.java    | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadConfirmationwindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadConfirmationwindow.java
index f009985f9..d7231cafe 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadConfirmationwindow.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadConfirmationwindow.java
@@ -544,7 +544,7 @@ public class UploadConfirmationwindow implements Button.ClickListener {
         if (event.getComponent().getId().equals(SPUIComponetIdProvider.UPLOAD_ARTIFACT_DETAILS_CLOSE)) {
             uploadConfrimationWindow.close();
         } else if (event.getComponent().getId().equals(SPUIComponetIdProvider.UPLOAD_DISCARD_DETAILS_BUTTON)) {
-            uploadLayout.clearFileList();
+            uploadLayout.removeUploadedFileDetails();
             uploadConfrimationWindow.close();
         } else if (event.getComponent().getId().equals(SPUIComponetIdProvider.UPLOAD_BUTTON)) {
             processArtifactUpload();
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java
index 340f66287..9e304efe8 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java
@@ -520,13 +520,17 @@ public class UploadLayout extends VerticalLayout {
             if (artifactUploadState.getFileSelected().isEmpty()) {
                 uiNotification.displayValidationError(i18n.get("message.error.noFileSelected"));
             } else {
-                clearFileList();
-                uploadInfoWindow.clearWindow();
-                hideUploadStatusButton();
+                removeUploadedFileDetails();
             }
         }
     }
 
+    protected void removeUploadedFileDetails() {
+        clearFileList();
+        uploadInfoWindow.clearWindow();
+        hideUploadStatusButton();
+    }
+
     /**
      * Clear details.
      */
@@ -707,7 +711,7 @@ public class UploadLayout extends VerticalLayout {
         uploadStatusButton.setVisible(true);
     }
 
-    private void hideUploadStatusButton() {
+    protected void hideUploadStatusButton() {
         if (uploadStatusButton == null) {
             return;
         }