From 11bb28269958d1217e144c89dcbeebbe694ad43a Mon Sep 17 00:00:00 2001 From: Jonathan Philip Knoblauch Date: Thu, 4 Aug 2016 15:57:20 +0200 Subject: [PATCH] Refactoring for button enable Signed-off-by: Jonathan Philip Knoblauch --- .../hawkbit/ui/management/targettable/BulkUploadHandler.java | 3 ++- .../management/targettable/TargetBulkUpdateWindowLayout.java | 3 ++- 2 files changed, 4 insertions(+), 2 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 5fcebbead..fd7f5fa3d 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 @@ -138,7 +138,7 @@ public class BulkUploadHandler extends CustomComponent public void buildLayout() { final HorizontalLayout horizontalLayout = new HorizontalLayout(); upload = new Upload(); - upload.setEnabled(true); + upload.setEnabled(false); upload.setButtonCaption("Bulk Upload"); upload.setReceiver(this); upload.setImmediate(true); @@ -227,6 +227,7 @@ public class BulkUploadHandler extends CustomComponent } catch (final RuntimeException e) { Optional.ofNullable(UI.getCurrent()).ifPresent(error -> UI.getCurrent().getErrorHandler() .error(new ConnectorErrorEvent(targetTableHeader, e))); + } finally { updateBulkUpload(); doAssignments(); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java index f8e273232..77eaaddea 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java @@ -296,8 +296,9 @@ public class TargetBulkUpdateWindowLayout extends CustomComponent { descTextArea.clear(); targetBulkTokenTags.getTokenField().clear(); targetBulkTokenTags.populateContainer(); - progressBar.setValue(0f); + progressBar.setValue(0F); progressBar.setVisible(false); + managementUIState.getTargetTableFilters().getBulkUpload().setProgressBarCurrentValue(0F); targetsCountLabel.setVisible(false); }