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

Changed error and how it is connected to current page

Browse Source 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
This commit is contained in:
Jonathan Philip Knoblauch
2016-08-05 12:42:03 +02:00
parent 709ea990df
commit 89605b0984
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/HawkbitUIErrorHandler.java
View File

@@ -68,7 +68,7 @@ public class HawkbitUIErrorHandler extends DefaultErrorHandler {
return Optional.fromNullable(errorOrigin.getUI().getPage()); return Optional.fromNullable(errorOrigin.getUI().getPage());
} }
return Optional.absent(); return Optional.of(Page.getCurrent());
} }
protected HawkbitErrorNotificationMessage buildNotification(final Throwable exception) { protected HawkbitErrorNotificationMessage buildNotification(final Throwable exception) {

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

@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import org.eclipse.hawkbit.repository.DeploymentManagement; import org.eclipse.hawkbit.repository.DeploymentManagement;
@@ -100,8 +99,6 @@ public class BulkUploadHandler extends CustomComponent
final TargetBulkUpdateWindowLayout targetBulkUpdateWindowLayout; final TargetBulkUpdateWindowLayout targetBulkUpdateWindowLayout;
private TargetTableHeader targetTableHeader;
private transient EntityFactory entityFactory; private transient EntityFactory entityFactory;
/** /**
@@ -225,9 +222,9 @@ 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(error -> UI.getCurrent().getErrorHandler() if (UI.getCurrent() != null) {
.error(new ConnectorErrorEvent(targetTableHeader, e))); UI.getCurrent().getErrorHandler().error(new com.vaadin.server.ErrorEvent(e));
}
} finally { } finally {
updateBulkUpload(); updateBulkUpload();
doAssignments(); doAssignments();
@@ -465,7 +462,4 @@ public class BulkUploadHandler extends CustomComponent
} }
} }
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,7 +82,6 @@ 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();
} }