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

Added null check for selected target

Browse Source
This commit is contained in:
Kai Zimmermann
2016-06-01 13:17:40 +02:00
parent 4bea2ae1a5
commit 615cbe2308
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hawkbit-repository/hawkbit-repository-jpa/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
/bin/

22
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryTable.java
View File

@@ -69,14 +69,15 @@ import com.vaadin.ui.UI;
import com.vaadin.ui.themes.ValoTheme; import com.vaadin.ui.themes.ValoTheme;
/** /**
* * Table for {@link Target#getActions()} history.
* *
*/ */
@SpringComponent @SpringComponent
@ViewScope @ViewScope
public class ActionHistoryTable extends TreeTable implements Handler { public class ActionHistoryTable extends TreeTable implements Handler {
private static final String BUTTON_CANCEL = "button.cancel";
private static final String BUTTON_OK = "button.ok";
private static final long serialVersionUID = -1631514704696786653L; private static final long serialVersionUID = -1631514704696786653L;
@Autowired @Autowired
private I18N i18n; private I18N i18n;
@@ -241,11 +242,14 @@ public class ActionHistoryTable extends TreeTable implements Handler {
private void getcontainerData() { private void getcontainerData() {
hierarchicalContainer.removeAllItems(); hierarchicalContainer.removeAllItems();
/* service method to create action history for target */
final List<ActionWithStatusCount> actionHistory = deploymentManagement if (target != null) {
/* service method to create action history for target */
final List<ActionWithStatusCount> actionHistory = deploymentManagement
.findActionsWithStatusCountByTargetOrderByIdDesc(target); .findActionsWithStatusCountByTargetOrderByIdDesc(target);
addDetailsToContainer(actionHistory); addDetailsToContainer(actionHistory);
}
} }
/** /**
@@ -751,7 +755,7 @@ public class ActionHistoryTable extends TreeTable implements Handler {
private void confirmAndForceAction(final Long actionId) { private void confirmAndForceAction(final Long actionId) {
/* Display the confirmation */ /* Display the confirmation */
final ConfirmationDialog confirmDialog = new ConfirmationDialog(i18n.get("caption.force.action.confirmbox"), final ConfirmationDialog confirmDialog = new ConfirmationDialog(i18n.get("caption.force.action.confirmbox"),
i18n.get("message.force.action.confirm"), i18n.get("button.ok"), i18n.get("button.cancel"), ok -> { i18n.get("message.force.action.confirm"), i18n.get(BUTTON_OK), i18n.get(BUTTON_CANCEL), ok -> {
if (ok) { if (ok) {
/* cancel the action */ /* cancel the action */
deploymentManagement.forceTargetAction(actionId); deploymentManagement.forceTargetAction(actionId);
@@ -773,7 +777,7 @@ public class ActionHistoryTable extends TreeTable implements Handler {
private void confirmAndForceQuitAction(final Long actionId) { private void confirmAndForceQuitAction(final Long actionId) {
/* Display the confirmation */ /* Display the confirmation */
final ConfirmationDialog confirmDialog = new ConfirmationDialog(i18n.get("caption.forcequit.action.confirmbox"), final ConfirmationDialog confirmDialog = new ConfirmationDialog(i18n.get("caption.forcequit.action.confirmbox"),
i18n.get("message.forcequit.action.confirm"), i18n.get("button.ok"), i18n.get("button.cancel"), ok -> { i18n.get("message.forcequit.action.confirm"), i18n.get(BUTTON_OK), i18n.get(BUTTON_CANCEL), ok -> {
if (ok) { if (ok) {
final boolean cancelResult = forceQuitActiveAction(actionId); final boolean cancelResult = forceQuitActiveAction(actionId);
if (cancelResult) { if (cancelResult) {
@@ -801,7 +805,7 @@ public class ActionHistoryTable extends TreeTable implements Handler {
*/ */
private void confirmAndCancelAction(final Long actionId) { private void confirmAndCancelAction(final Long actionId) {
final ConfirmationDialog confirmDialog = new ConfirmationDialog(i18n.get("caption.cancel.action.confirmbox"), final ConfirmationDialog confirmDialog = new ConfirmationDialog(i18n.get("caption.cancel.action.confirmbox"),
i18n.get("message.cancel.action.confirm"), i18n.get("button.ok"), i18n.get("button.cancel"), ok -> { i18n.get("message.cancel.action.confirm"), i18n.get(BUTTON_OK), i18n.get(BUTTON_CANCEL), ok -> {
if (ok) { if (ok) {
final boolean cancelResult = cancelActiveAction(actionId); final boolean cancelResult = cancelActiveAction(actionId);
if (cancelResult) { if (cancelResult) {