From 89605b0984beb72525476fa7eb88ddbff4ab0959 Mon Sep 17 00:00:00 2001 From: Jonathan Philip Knoblauch Date: Fri, 5 Aug 2016 12:42:03 +0200 Subject: [PATCH] Changed error and how it is connected to current page Signed-off-by: Jonathan Philip Knoblauch --- .../hawkbit/ui/components/HawkbitUIErrorHandler.java | 2 +- .../ui/management/targettable/BulkUploadHandler.java | 12 +++--------- .../ui/management/targettable/TargetTableHeader.java | 1 - 3 files changed, 4 insertions(+), 11 deletions(-) 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 56bcba421..a860b7ff4 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 @@ -68,7 +68,7 @@ public class HawkbitUIErrorHandler extends DefaultErrorHandler { return Optional.fromNullable(errorOrigin.getUI().getPage()); } - return Optional.absent(); + return Optional.of(Page.getCurrent()); } protected HawkbitErrorNotificationMessage buildNotification(final Throwable exception) { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java index 44b3d2e50..0fe512334 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.concurrent.Executor; import org.eclipse.hawkbit.repository.DeploymentManagement; @@ -100,8 +99,6 @@ public class BulkUploadHandler extends CustomComponent final TargetBulkUpdateWindowLayout targetBulkUpdateWindowLayout; - private TargetTableHeader targetTableHeader; - private transient EntityFactory entityFactory; /** @@ -225,9 +222,9 @@ public class BulkUploadHandler extends CustomComponent } catch (final IOException e) { LOG.error("Error reading file {}", tempFile.getName(), e); } catch (final RuntimeException e) { - Optional.ofNullable(UI.getCurrent()).ifPresent(error -> UI.getCurrent().getErrorHandler() - .error(new ConnectorErrorEvent(targetTableHeader, e))); - + if (UI.getCurrent() != null) { + UI.getCurrent().getErrorHandler().error(new com.vaadin.server.ErrorEvent(e)); + } } finally { updateBulkUpload(); doAssignments(); @@ -465,7 +462,4 @@ public class BulkUploadHandler extends CustomComponent } } - public void setTargetBulkUpdateWindowLayout(final TargetTableHeader targetTableHeader) { - this.targetTableHeader = targetTableHeader; - } } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableHeader.java index 760332e09..16dc584ed 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableHeader.java @@ -82,7 +82,6 @@ public class TargetTableHeader extends AbstractTableHeader { // creating add window for adding new target targetAddUpdateWindow.init(); targetBulkUpdateWindow.init(); - targetBulkUpdateWindow.getBulkUploader().setTargetBulkUpdateWindowLayout(this); onLoadRestoreState(); }