From 7004cf1568ffaa605016d67602187d12f180118d Mon Sep 17 00:00:00 2001 From: "giancarlo.panichi" Date: Thu, 2 Mar 2017 12:00:11 +0000 Subject: [PATCH] Fixed error handling git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/admin/accounting-manager@144526 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/AccountingManagerController.java | 88 ++++++++++++++++++- 1 file changed, 86 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/AccountingManagerController.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/AccountingManagerController.java index f7542a6..d564adc 100644 --- a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/AccountingManagerController.java +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/AccountingManagerController.java @@ -459,9 +459,15 @@ public class AccountingManagerController { caught.printStackTrace(); UtilsGXT3.alert("Error", caught.getLocalizedMessage()); + AccountingClientStateData accountingStateData = accountingState + .getState(accountingType); + accountingStateData + .setSeriesResponse(null); + accountingState.setState( + accountingType, + accountingStateData); StateChangeEvent stateChangeEvent = new StateChangeEvent( - StateChangeType.Restore, accountingState - .getState(accountingType)); + StateChangeType.Restore, accountingState.getState(accountingType)); eventBus.fireEvent(stateChangeEvent); } @@ -485,6 +491,13 @@ public class AccountingManagerController { Log.error("Invalid Operation Id: " + operationId); UtilsGXT3.alert("Error", "Invalid Operation Id: " + operationId); + AccountingClientStateData accountingStateData = accountingState + .getState(accountingType); + accountingStateData + .setSeriesResponse(null); + accountingState.setState( + accountingType, + accountingStateData); StateChangeEvent stateChangeEvent = new StateChangeEvent( StateChangeType.Restore, accountingState .getState(accountingType)); @@ -505,6 +518,13 @@ public class AccountingManagerController { caught.printStackTrace(); UtilsGXT3.alert("Error", caught.getLocalizedMessage()); + AccountingClientStateData accountingStateData = accountingState + .getState(accountingType); + accountingStateData + .setSeriesResponse(null); + accountingState.setState( + accountingType, + accountingStateData); StateChangeEvent stateChangeEvent = new StateChangeEvent( StateChangeType.Restore, accountingState .getState(accountingType)); @@ -565,6 +585,13 @@ public class AccountingManagerController { caught.printStackTrace(); UtilsGXT3.alert("Error", caught.getLocalizedMessage()); + AccountingClientStateData accountingStateData = accountingState + .getState(accountingType); + accountingStateData + .setSeriesResponse(null); + accountingState.setState( + accountingType, + accountingStateData); StateChangeEvent stateChangeEvent = new StateChangeEvent( StateChangeType.Restore, accountingState @@ -583,6 +610,13 @@ public class AccountingManagerController { accountingMonitor.hide(); Log.error("Error: TimeOut!"); UtilsGXT3.alert("Error Time Out", "Time Out"); + AccountingClientStateData accountingStateData = accountingState + .getState(accountingType); + accountingStateData + .setSeriesResponse(null); + accountingState.setState( + accountingType, + accountingStateData); StateChangeEvent stateChangeEvent = new StateChangeEvent( StateChangeType.Restore, accountingState.getState(accountingType)); @@ -662,6 +696,16 @@ public class AccountingManagerController { UtilsGXT3.alert("Error", caught.getLocalizedMessage()); caught.printStackTrace(); + AccountingClientStateData accountingStateData = accountingState + .getState(accountingType); + accountingStateData + .setSeriesResponse(null); + accountingState.setState( + accountingType, + accountingStateData); + StateChangeEvent stateChangeEvent = new StateChangeEvent( + StateChangeType.Update, accountingState.getState(accountingType)); + eventBus.fireEvent(stateChangeEvent); } } @@ -683,6 +727,16 @@ public class AccountingManagerController { Log.error("Invalid Operation Id: " + operationId); UtilsGXT3.alert("Error", "Invalid Operation Id: " + operationId); + AccountingClientStateData accountingStateData = accountingState + .getState(accountingType); + accountingStateData + .setSeriesResponse(null); + accountingState.setState( + accountingType, + accountingStateData); + StateChangeEvent stateChangeEvent = new StateChangeEvent( + StateChangeType.Update, accountingState.getState(accountingType)); + eventBus.fireEvent(stateChangeEvent); } else { operationMonitor(operationId); } @@ -699,6 +753,16 @@ public class AccountingManagerController { UtilsGXT3.alert("Error", caught.getLocalizedMessage()); caught.printStackTrace(); + AccountingClientStateData accountingStateData = accountingState + .getState(accountingType); + accountingStateData + .setSeriesResponse(null); + accountingState.setState( + accountingType, + accountingStateData); + StateChangeEvent stateChangeEvent = new StateChangeEvent( + StateChangeType.Update, accountingState.getState(accountingType)); + eventBus.fireEvent(stateChangeEvent); } } @@ -754,6 +818,16 @@ public class AccountingManagerController { UtilsGXT3.alert("Error", caught.getLocalizedMessage()); caught.printStackTrace(); + AccountingClientStateData accountingStateData = accountingState + .getState(accountingType); + accountingStateData + .setSeriesResponse(null); + accountingState.setState( + accountingType, + accountingStateData); + StateChangeEvent stateChangeEvent = new StateChangeEvent( + StateChangeType.Update, accountingState.getState(accountingType)); + eventBus.fireEvent(stateChangeEvent); } } @@ -766,6 +840,16 @@ public class AccountingManagerController { accountingMonitor.hide(); Log.error("Error: TimeOut!"); UtilsGXT3.alert("Error Time Out", "Time Out"); + AccountingClientStateData accountingStateData = accountingState + .getState(accountingType); + accountingStateData + .setSeriesResponse(null); + accountingState.setState( + accountingType, + accountingStateData); + StateChangeEvent stateChangeEvent = new StateChangeEvent( + StateChangeType.Update, accountingState.getState(accountingType)); + eventBus.fireEvent(stateChangeEvent); break; }