From 9e17c8f62515a922f80c8e7e0d4cfe88b1dda17e Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 4 Dec 2014 17:03:57 +0000 Subject: [PATCH] Fixed Error Management git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-sdmx-import-widget@101907 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/SDMXOperationInProgressCard.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/sdmximportwidget/client/SDMXOperationInProgressCard.java b/src/main/java/org/gcube/portlets/user/td/sdmximportwidget/client/SDMXOperationInProgressCard.java index 361ee57..fb08039 100644 --- a/src/main/java/org/gcube/portlets/user/td/sdmximportwidget/client/SDMXOperationInProgressCard.java +++ b/src/main/java/org/gcube/portlets/user/td/sdmximportwidget/client/SDMXOperationInProgressCard.java @@ -26,6 +26,7 @@ import com.sencha.gxt.core.client.util.Margins; import com.sencha.gxt.widget.core.client.FramedPanel; import com.sencha.gxt.widget.core.client.container.BoxLayoutContainer.BoxLayoutData; import com.sencha.gxt.widget.core.client.container.HtmlLayoutContainer; +import com.sencha.gxt.widget.core.client.container.MarginData; import com.sencha.gxt.widget.core.client.container.VBoxLayoutContainer; import com.sencha.gxt.widget.core.client.container.VBoxLayoutContainer.VBoxLayoutAlign; @@ -125,7 +126,7 @@ public class SDMXOperationInProgressCard extends WizardCard implements operationInProgressPanel.add(resultField, new BoxLayoutData( new Margins(10, 5, 10, 5))); - setContent(operationInProgressPanel); + setCenterWidget(operationInProgressPanel, new MarginData(0)); resultField.setVisible(false); } @@ -149,12 +150,12 @@ public class SDMXOperationInProgressCard extends WizardCard implements if (caught instanceof TDGWTIsLockedException) { Log.error(caught.getLocalizedMessage()); showErrorAndHide("Error Locked", - caught.getLocalizedMessage(), caught); + caught.getLocalizedMessage(), "", caught); } else { showErrorAndHide("Error in importSDMX", - "An error occured in importSDMX", - caught); + "An error occured in importSDMX.", + caught.getLocalizedMessage(), caught); } } @@ -166,7 +167,6 @@ public class SDMXOperationInProgressCard extends WizardCard implements public void setup() { getWizardWindow().setEnableBackButton(false); setBackButtonVisible(false); - setNextButtonVisible(false); getWizardWindow().setEnableNextButton(false); getWizardWindow().setNextButtonToFinish(); importSDMX(); @@ -223,7 +223,7 @@ public class SDMXOperationInProgressCard extends WizardCard implements SessionExpiredType.EXPIREDONSERVER)); } else { showErrorAndHide("Error in SDMX Import", - reason,caught); + reason,details, caught); } forceLayout();