diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXExportWizardTD.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXExportWizardTD.java index ee65cf3..d63b580 100644 --- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXExportWizardTD.java +++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXExportWizardTD.java @@ -25,7 +25,7 @@ import com.sencha.gxt.widget.core.client.box.AutoProgressMessageBox; public class SDMXExportWizardTD extends WizardWindow { protected SDMXExportSession exportSession; - + /** * The id of the {@link CSVTarget} to use. * @@ -56,15 +56,16 @@ public class SDMXExportWizardTD extends WizardWindow { if (caught instanceof TDGWTIsLockedException) { Log.error(caught.getLocalizedMessage()); showErrorAndHide("Error Locked", - caught.getLocalizedMessage(), caught); + caught.getLocalizedMessage(), "", + caught); } else { Log.error("No Tabular Resource Information retrived from server " + caught.getLocalizedMessage()); box.hide(); - showErrorAndHide("Error", - "Error retrieving tabular resource information: " - + caught.getLocalizedMessage(), - caught); + showErrorAndHide( + "Error", + "Error retrieving tabular resource information: ", + caught.getLocalizedMessage(), caught); } } } diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXOperationInProgressCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXOperationInProgressCard.java index 41d263f..9632708 100644 --- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXOperationInProgressCard.java +++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXOperationInProgressCard.java @@ -23,6 +23,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; @@ -95,7 +96,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); } @@ -121,12 +122,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 exportSDMX", - "An error occured in exportSDMX: " - + caught.getLocalizedMessage(), - caught); + "An error occured in exportSDMX.", + caught.getLocalizedMessage(), caught); } } } @@ -137,7 +138,6 @@ public class SDMXOperationInProgressCard extends WizardCard implements public void setup() { getWizardWindow().setEnableBackButton(false); setBackButtonVisible(false); - setNextButtonVisible(false); getWizardWindow().setEnableNextButton(false); getWizardWindow().setNextButtonToFinish(); exportSDMX(); @@ -193,8 +193,7 @@ public class SDMXOperationInProgressCard extends WizardCard implements new SessionExpiredEvent( SessionExpiredType.EXPIREDONSERVER)); } else { - showErrorAndHide("Error in SDMX Export", - reason,caught); + showErrorAndHide("Error in SDMX Export", reason, details, caught); } forceLayout(); } diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXRegistrySelectionCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXRegistrySelectionCard.java index 0989643..77dfbbf 100644 --- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXRegistrySelectionCard.java +++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXRegistrySelectionCard.java @@ -21,6 +21,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.HasValue; import com.google.gwt.user.client.ui.VerticalPanel; import com.sencha.gxt.core.client.util.ToggleGroup; +import com.sencha.gxt.widget.core.client.container.MarginData; import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer; import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData; import com.sencha.gxt.widget.core.client.form.FieldLabel; @@ -132,7 +133,7 @@ public class SDMXRegistrySelectionCard extends WizardCard { } }); - setContent(registrySelectionPanel); + setCenterWidget(registrySelectionPanel, new MarginData(0)); } @@ -158,8 +159,8 @@ public class SDMXRegistrySelectionCard extends WizardCard { } else { Log.error("SDMXRegistrySource do not stored " + caught.getLocalizedMessage()); - showErrorAndHide("Error", "SDMXRegistrySource do not stored " - + caught.getLocalizedMessage(), caught); + showErrorAndHide("Error", "SDMXRegistrySource do not stored." + ,caught.getLocalizedMessage(), caught); } }