lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

changed connector for error

Browse Source 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
This commit is contained in:
Jonathan Philip Knoblauch
2016-08-04 13:57:06 +02:00
parent cad916c1d7
commit 6be3d72a5a
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java
View File

@@ -98,7 +98,9 @@ public class BulkUploadHandler extends CustomComponent
private final transient Executor executor; private final transient Executor executor;
private transient EventBus.SessionEventBus eventBus; private transient EventBus.SessionEventBus eventBus;
private final TargetBulkUpdateWindowLayout targetBulkUpdateWindowLayout; final TargetBulkUpdateWindowLayout targetBulkUpdateWindowLayout;
TargetTableHeader targetTableHeader;
private transient EntityFactory entityFactory; private transient EntityFactory entityFactory;
@@ -223,9 +225,10 @@ public class BulkUploadHandler extends CustomComponent
} catch (final IOException e) { } catch (final IOException e) {
LOG.error("Error reading file {}", tempFile.getName(), e); LOG.error("Error reading file {}", tempFile.getName(), e);
} catch (final RuntimeException e) { } catch (final RuntimeException e) {
Optional.ofNullable(UI.getCurrent()).ifPresent( Optional.ofNullable(UI.getCurrent()).ifPresent(error -> UI.getCurrent().getErrorHandler()
error -> UI.getCurrent().getErrorHandler().error(new ConnectorErrorEvent(upload, e))); .error(new ConnectorErrorEvent(targetTableHeader, e)));
} finally { } finally {
updateBulkUpload();
doAssignments(); doAssignments();
eventBus.publish(this, new TargetTableEvent(TargetComponentEvent.BULK_UPLOAD_COMPLETED)); eventBus.publish(this, new TargetTableEvent(TargetComponentEvent.BULK_UPLOAD_COMPLETED));
// Clearing after assignments are done // 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 if (Math.abs(next - 0.1) < 0.00001 || current - next >= 0 || next - current >= 0.05
|| Math.abs(next - 1) < 0.00001) { || Math.abs(next - 1) < 0.00001) {
managementUIState.getTargetTableFilters().getBulkUpload().setProgressBarCurrentValue(next); managementUIState.getTargetTableFilters().getBulkUpload().setProgressBarCurrentValue(next);
managementUIState.getTargetTableFilters().getBulkUpload() updateBulkUpload();
.setSucessfulUploadCount(successfullTargetCount);
managementUIState.getTargetTableFilters().getBulkUpload().setFailedUploadCount(failedTargetCount);
eventBus.publish(this, new TargetTableEvent(TargetComponentEvent.BULK_TARGET_CREATED));
} }
} }
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() { private void doAssignments() {
final StringBuilder errorMessage = new StringBuilder(); final StringBuilder errorMessage = new StringBuilder();
String dsAssignmentFailedMsg = null; String dsAssignmentFailedMsg = null;
@@ -457,4 +463,8 @@ public class BulkUploadHandler extends CustomComponent
eventBus.publish(this, new TargetTableEvent(TargetComponentEvent.BULK_TARGET_UPLOAD_STARTED)); eventBus.publish(this, new TargetTableEvent(TargetComponentEvent.BULK_TARGET_UPLOAD_STARTED));
} }
} }
public void setTargetBulkUpdateWindowLayout(final TargetTableHeader targetTableHeader) {
this.targetTableHeader = targetTableHeader;
}
} }

1
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableHeader.java
View File

@@ -82,6 +82,7 @@ public class TargetTableHeader extends AbstractTableHeader {
// creating add window for adding new target // creating add window for adding new target
targetAddUpdateWindow.init(); targetAddUpdateWindow.init();
targetBulkUpdateWindow.init(); targetBulkUpdateWindow.init();
targetBulkUpdateWindow.getBulkUploader().setTargetBulkUpdateWindowLayout(this);
onLoadRestoreState(); onLoadRestoreState();
} }