From 9fef37b20adb715a5ef96e0d5457302ede153f87 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 4 Dec 2014 16:41:44 +0000 Subject: [PATCH] Fixed Error Management git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-csv-export-widget@101899 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/CSVExportConfigCard.java | 5 +++-- .../client/CSVOperationInProgressCard.java | 14 +++++++------- .../client/grid/ColumnDataGridPanel.java | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVExportConfigCard.java b/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVExportConfigCard.java index cb60562..4b1d9bf 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVExportConfigCard.java +++ b/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVExportConfigCard.java @@ -27,6 +27,7 @@ import com.sencha.gxt.core.client.util.Padding; import com.sencha.gxt.core.client.util.ToggleGroup; import com.sencha.gxt.data.shared.StringLabelProvider; import com.sencha.gxt.widget.core.client.box.AlertMessageBox; +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.event.HideEvent; import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler; @@ -73,7 +74,7 @@ public class CSVExportConfigCard extends WizardCard { this.exportSession = exportSession; FormPanel panel = createPanel(); - setContent(panel); + setCenterWidget(panel, new MarginData(0)); } @@ -130,7 +131,7 @@ public class CSVExportConfigCard extends WizardCard { Log.error("Error loading charset list", caught); showErrorAndHide("Error loading charset list", - "Error loading charset list", caught); + "Error loading charset list:",caught.getLocalizedMessage() , caught); } } diff --git a/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVOperationInProgressCard.java b/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVOperationInProgressCard.java index 3b8e585..668c538 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVOperationInProgressCard.java +++ b/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVOperationInProgressCard.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; @@ -79,7 +80,7 @@ public class CSVOperationInProgressCard extends WizardCard implements operationInProgressPanel.add(resultField, new BoxLayoutData( new Margins(10, 5, 10, 5))); - setContent(operationInProgressPanel); + setCenterWidget(operationInProgressPanel, new MarginData(0)); resultField.setVisible(false); } @@ -103,12 +104,12 @@ public class CSVOperationInProgressCard extends WizardCard implements if (caught instanceof TDGWTIsLockedException) { Log.error(caught.getLocalizedMessage()); showErrorAndHide("Error Locked", - caught.getLocalizedMessage(), caught); + caught.getLocalizedMessage(), "", caught); } else { showErrorAndHide("Error in exportCSV", - "An error occured in exportCSV: " - + caught.getLocalizedMessage(), - caught); + "An error occured in exportCSV: ", + caught.getLocalizedMessage(), + caught); } } @@ -120,7 +121,6 @@ public class CSVOperationInProgressCard extends WizardCard implements public void setup() { getWizardWindow().setEnableBackButton(false); setBackButtonVisible(false); - setNextButtonVisible(false); getWizardWindow().setEnableNextButton(false); getWizardWindow().setNextButtonToFinish(); exportCSV(); @@ -180,7 +180,7 @@ public class CSVOperationInProgressCard extends WizardCard implements SessionExpiredType.EXPIREDONSERVER)); } else { showErrorAndHide("Error in CSV Export", - reason,caught); + reason,details, caught); } forceLayout(); diff --git a/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/grid/ColumnDataGridPanel.java b/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/grid/ColumnDataGridPanel.java index e8d416f..603b7a9 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/grid/ColumnDataGridPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/grid/ColumnDataGridPanel.java @@ -136,7 +136,7 @@ public class ColumnDataGridPanel extends ContentPanel implements if (caught instanceof TDGWTIsLockedException) { Log.error(caught.getLocalizedMessage()); parent.showErrorAndHide("Error Locked", - caught.getLocalizedMessage(), caught); + caught.getLocalizedMessage(), "", caught); } else { Log.error("No load columns: "