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

Refactoring of bulk upload

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

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

@@ -214,22 +214,22 @@ public class BulkUploadHandler extends CustomComponent
* below event. * below event.
*/ */
eventBus.publish(this, new TargetTableEvent(TargetComponentEvent.BULK_UPLOAD_PROCESS_STARTED)); eventBus.publish(this, new TargetTableEvent(TargetComponentEvent.BULK_UPLOAD_PROCESS_STARTED));
while ((line = reader.readLine()) != null) { while ((line = reader.readLine()) != null) {
innerCounter++; innerCounter++;
readEachLine(line, innerCounter, totalFileSize); readEachLine(line, innerCounter, totalFileSize);
} }
doAssignments();
eventBus.publish(this, new TargetTableEvent(TargetComponentEvent.BULK_UPLOAD_COMPLETED));
// Clearing after assignments are done
managementUIState.getTargetTableFilters().getBulkUpload().getTargetsCreated().clear();
} 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(new ConnectorErrorEvent(upload, e))); error -> UI.getCurrent().getErrorHandler().error(new ConnectorErrorEvent(upload, e)));
targetBulkUpdateWindowLayout.closePopupAfterFailureAndRefresh();
} finally { } finally {
doAssignments();
eventBus.publish(this, new TargetTableEvent(TargetComponentEvent.BULK_UPLOAD_COMPLETED));
// Clearing after assignments are done
managementUIState.getTargetTableFilters().getBulkUpload().getTargetsCreated().clear();
resetCounts(); resetCounts();
deleteFile(); deleteFile();
} }

9
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java
View File

@@ -239,15 +239,6 @@ public class TargetBulkUpdateWindowLayout extends CustomComponent {
eventBus.publish(this, BulkUploadPopupEvent.CLOSED); eventBus.publish(this, BulkUploadPopupEvent.CLOSED);
} }
/**
* Close and refresh this component.
*/
public void closePopupAfterFailureAndRefresh() {
closePopup();
destroy();
init();
}
/** /**
* @return * @return
*/ */