From 03b7238b487d9b6f4b5b5060cc98b317f7ff1e36 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 4 Dec 2014 16:41:54 +0000 Subject: [PATCH] Fixed Error Management git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-csv-import-widget@101900 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../td/csvimportwidget/client/CSVConfigCard.java | 7 ++++--- .../client/CSVOperationInProgressCard.java | 15 ++++++++------- .../client/CSVTableDetailCard.java | 9 +++++---- .../csvimportwidget/client/CSVUploadFileCard.java | 3 ++- .../client/CSVWorkSpaceSelectionCard.java | 7 ++++--- .../csvimportwidget/client/FileUploadPanel.java | 2 +- .../client/SourceSelectionCard.java | 4 ++-- 7 files changed, 26 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVConfigCard.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVConfigCard.java index 61cfe04..1c801b0 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVConfigCard.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVConfigCard.java @@ -33,6 +33,7 @@ import com.sencha.gxt.core.client.util.Padding; import com.sencha.gxt.core.client.util.ToggleGroup; import com.sencha.gxt.data.shared.LabelProvider; import com.sencha.gxt.data.shared.StringLabelProvider; +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.event.SelectEvent; @@ -80,8 +81,8 @@ public class CSVConfigCard extends WizardCard { this.csvImportSession = csvImportSession; FormPanel panel = createPanel(); - setContent(panel); - + setCenterWidget(panel,new MarginData(0)); + } protected FormPanel createPanel() { @@ -418,7 +419,7 @@ public class CSVConfigCard extends WizardCard { } else { 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/csvimportwidget/client/CSVOperationInProgressCard.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVOperationInProgressCard.java index f115e24..35edb65 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVOperationInProgressCard.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVOperationInProgressCard.java @@ -22,6 +22,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; @@ -47,7 +48,8 @@ public class CSVOperationInProgressCard extends WizardCard implements VBoxLayoutContainer operationInProgressPanel = new VBoxLayoutContainer(); operationInProgressPanel.setVBoxLayoutAlign(VBoxLayoutAlign.CENTER); - + //operationInProgressPanel.setHeight(390); + final FlexTable description = new FlexTable(); // FlexCellFormatter cellFormatter = description.getFlexCellFormatter(); description.setCellSpacing(10); @@ -78,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); } @@ -101,9 +103,9 @@ public class CSVOperationInProgressCard extends WizardCard implements } else { showErrorAndHide( "Error in importCSV", - "An error occured in importCSV: " - + caught.getLocalizedMessage(), - caught); + "An error occured in importCSV: ", + caught.getLocalizedMessage(), + caught); } } }); @@ -113,7 +115,6 @@ public class CSVOperationInProgressCard extends WizardCard implements public void setup() { getWizardWindow().setEnableBackButton(false); setBackButtonVisible(false); - setNextButtonVisible(false); getWizardWindow().setEnableNextButton(false); getWizardWindow().setNextButtonToFinish(); importCSV(); @@ -169,7 +170,7 @@ public class CSVOperationInProgressCard extends WizardCard implements new SessionExpiredEvent( SessionExpiredType.EXPIREDONSERVER)); } else { - showErrorAndHide("Error in CSV Import", reason,caught); + showErrorAndHide("Error in CSV Import", reason,"", caught); } forceLayout(); } diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVTableDetailCard.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVTableDetailCard.java index 81f6ad6..2301b97 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVTableDetailCard.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVTableDetailCard.java @@ -15,7 +15,6 @@ import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource; import org.gcube.portlets.user.td.widgetcommonevent.client.event.SessionExpiredEvent; import org.gcube.portlets.user.td.widgetcommonevent.client.type.SessionExpiredType; import org.gcube.portlets.user.td.wizardwidget.client.WizardCard; -import org.gcube.portlets.user.td.wizardwidget.client.util.UtilsGXT3; import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.core.client.GWT; @@ -36,6 +35,7 @@ import com.sencha.gxt.data.shared.loader.ListLoader; import com.sencha.gxt.data.shared.loader.LoadResultListStoreBinding; import com.sencha.gxt.widget.core.client.FramedPanel; 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.container.VerticalLayoutContainer.VerticalLayoutData; import com.sencha.gxt.widget.core.client.event.HideEvent; @@ -96,6 +96,7 @@ public class CSVTableDetailCard extends WizardCard { FieldSet fieldSet = new FieldSet(); fieldSet.setHeadingText("Information"); fieldSet.setCollapsible(false); + form.add(fieldSet); p = new VerticalLayoutContainer(); @@ -182,7 +183,7 @@ public class CSVTableDetailCard extends WizardCard { tableDetailPanel.add(form); - setContent(tableDetailPanel); + setCenterWidget(tableDetailPanel, new MarginData(0)); } @@ -200,8 +201,8 @@ public class CSVTableDetailCard extends WizardCard { } else { Log.error("load combo failure:" + caught.getLocalizedMessage()); - UtilsGXT3.alert("Error", - "Error retrieving licences."); + showErrorAndHide("Error", + "Error retrieving licences.",caught.getLocalizedMessage(),caught); } callback.onFailure(caught); } diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVUploadFileCard.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVUploadFileCard.java index 4424313..931ec3f 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVUploadFileCard.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVUploadFileCard.java @@ -8,6 +8,7 @@ import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportSession; import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.user.client.Command; +import com.sencha.gxt.widget.core.client.container.MarginData; /** * @@ -27,7 +28,7 @@ public class CSVUploadFileCard extends WizardCard { this.fileUploadPanel = new FileUploadPanel(res, thisCard,importSession); - setContent(fileUploadPanel); + setCenterWidget(fileUploadPanel, new MarginData(0)); } diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVWorkSpaceSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVWorkSpaceSelectionCard.java index 8add550..0f57412 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVWorkSpaceSelectionCard.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVWorkSpaceSelectionCard.java @@ -18,6 +18,7 @@ import org.gcube.portlets.widgets.lighttree.client.event.ItemSelectionHandler; import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.rpc.AsyncCallback; +import com.sencha.gxt.widget.core.client.container.MarginData; import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer; /** @@ -81,7 +82,7 @@ public class CSVWorkSpaceSelectionCard extends WizardCard { }); p.add(wpanel); wpanel.loadTree(); - setContent(p); + setCenterWidget(p, new MarginData(0)); } @@ -133,8 +134,8 @@ public class CSVWorkSpaceSelectionCard extends WizardCard { getEventBus().fireEvent(new SessionExpiredEvent( SessionExpiredType.EXPIREDONSERVER)); } else { - thisCard.showErrorAndHide("Error", "Error retrieving the file from the workspace: "+caught.getLocalizedMessage(), - caught); + thisCard.showErrorAndHide("Error", "Error retrieving the file from the workspace.", + caught.getLocalizedMessage(), caught); } } diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/FileUploadPanel.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/FileUploadPanel.java index 5942f68..87bab9b 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/FileUploadPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/FileUploadPanel.java @@ -160,7 +160,7 @@ public class FileUploadPanel extends FormPanel { public void operationFailed(Throwable caught, String reason, String failureDetails) { card.showErrorAndHide("Error uploading the csv file", reason, - caught); + "", caught); } public void operationComplete() { diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/SourceSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/SourceSelectionCard.java index 219cfba..08a41e9 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/SourceSelectionCard.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/SourceSelectionCard.java @@ -4,7 +4,6 @@ package org.gcube.portlets.user.td.csvimportwidget.client; import org.gcube.portlets.user.td.wizardwidget.client.WizardCard; - import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportSession; import org.gcube.portlets.user.td.gwtservice.shared.source.FileSource; import org.gcube.portlets.user.td.gwtservice.shared.source.WorkspaceSource; @@ -16,6 +15,7 @@ import com.google.gwt.user.client.Command; 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.form.Radio; /** @@ -95,7 +95,7 @@ public class SourceSelectionCard extends WizardCard { } }); - setContent(sourceSelectionPanel); + setCenterWidget(sourceSelectionPanel, new MarginData(0)); }