From 6be3d72a5a85ce625720e3b2b33ad91ac0b9f2bf Mon Sep 17 00:00:00 2001 From: Jonathan Philip Knoblauch Date: Thu, 4 Aug 2016 13:57:06 +0200 Subject: [PATCH] changed connector for error Signed-off-by: Jonathan Philip Knoblauch --- .../targettable/BulkUploadHandler.java | 24 +++++++++++++------ .../targettable/TargetTableHeader.java | 1 + 2 files changed, 18 insertions(+), 7 deletions(-) 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 11bbec918..5fcebbead 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 @@ -98,7 +98,9 @@ public class BulkUploadHandler extends CustomComponent private final transient Executor executor; private transient EventBus.SessionEventBus eventBus; - private final TargetBulkUpdateWindowLayout targetBulkUpdateWindowLayout; + final TargetBulkUpdateWindowLayout targetBulkUpdateWindowLayout; + + TargetTableHeader targetTableHeader; private transient EntityFactory entityFactory; @@ -223,9 +225,10 @@ 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(upload, e))); + Optional.ofNullable(UI.getCurrent()).ifPresent(error -> UI.getCurrent().getErrorHandler() + .error(new ConnectorErrorEvent(targetTableHeader, e))); } finally { + updateBulkUpload(); doAssignments(); eventBus.publish(this, new TargetTableEvent(TargetComponentEvent.BULK_UPLOAD_COMPLETED)); // Clearing after assignments are done @@ -283,13 +286,16 @@ public class BulkUploadHandler extends CustomComponent if (Math.abs(next - 0.1) < 0.00001 || current - next >= 0 || next - current >= 0.05 || Math.abs(next - 1) < 0.00001) { managementUIState.getTargetTableFilters().getBulkUpload().setProgressBarCurrentValue(next); - managementUIState.getTargetTableFilters().getBulkUpload() - .setSucessfulUploadCount(successfullTargetCount); - managementUIState.getTargetTableFilters().getBulkUpload().setFailedUploadCount(failedTargetCount); - eventBus.publish(this, new TargetTableEvent(TargetComponentEvent.BULK_TARGET_CREATED)); + updateBulkUpload(); } } + private void updateBulkUpload() { + managementUIState.getTargetTableFilters().getBulkUpload().setSucessfulUploadCount(successfullTargetCount); + managementUIState.getTargetTableFilters().getBulkUpload().setFailedUploadCount(failedTargetCount); + eventBus.publish(this, new TargetTableEvent(TargetComponentEvent.BULK_TARGET_CREATED)); + } + private void doAssignments() { final StringBuilder errorMessage = new StringBuilder(); String dsAssignmentFailedMsg = null; @@ -457,4 +463,8 @@ public class BulkUploadHandler extends CustomComponent eventBus.publish(this, new TargetTableEvent(TargetComponentEvent.BULK_TARGET_UPLOAD_STARTED)); } } + + 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 16dc584ed..760332e09 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,6 +82,7 @@ public class TargetTableHeader extends AbstractTableHeader { // creating add window for adding new target targetAddUpdateWindow.init(); targetBulkUpdateWindow.init(); + targetBulkUpdateWindow.getBulkUploader().setTargetBulkUpdateWindowLayout(this); onLoadRestoreState(); }