From 16d6abbb3720bb4816b6cba7c01f0c010be818a8 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 4 Dec 2014 16:41:34 +0000 Subject: [PATCH] Fixed Error Management git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-codelistmapping-import-widget@101898 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../CodelistMappingFileUploadPanel.java | 2 +- ...odelistMappingOperationInProgressCard.java | 25 ++++++++++--------- .../CodelistMappingTableDetailCard.java | 12 ++++----- ...CodelistMappingWorkSpaceSelectionCard.java | 9 ++++--- .../client/TabResourcesSelectionPanel.java | 9 +++---- .../client/grid/ColumnDataGridPanel.java | 4 ++- 6 files changed, 32 insertions(+), 29 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingFileUploadPanel.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingFileUploadPanel.java index c3a243c..73e574e 100644 --- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingFileUploadPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingFileUploadPanel.java @@ -163,7 +163,7 @@ public class CodelistMappingFileUploadPanel extends FormPanel { public void operationFailed(Throwable caught, String reason, String failureDetails) { card.showErrorAndHide("Error uploading the xml file", reason, - caught); + "", caught); } public void operationComplete() { diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingOperationInProgressCard.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingOperationInProgressCard.java index 099c61f..1c260b5 100644 --- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingOperationInProgressCard.java +++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingOperationInProgressCard.java @@ -65,8 +65,8 @@ public class CodelistMappingOperationInProgressCard extends WizardCard description.setHTML(2, 0, "Name: "); - description.setText(2, 1, codelistMappingSession.getResourceTDDescriptor() - .getName()); + description.setText(2, 1, codelistMappingSession + .getResourceTDDescriptor().getName()); FramedPanel summary = new FramedPanel(); summary.setHeadingText("Import Summary"); @@ -102,19 +102,20 @@ public class CodelistMappingOperationInProgressCard extends WizardCard } else { if (caught instanceof TDGWTIsLockedException) { Log.error(caught.getLocalizedMessage()); - showErrorAndHide("Error Locked", - caught.getLocalizedMessage(), caught); + showErrorAndHide("Error", + caught.getLocalizedMessage(), "", + caught); } else { if (caught instanceof TDGWTIsFinalException) { Log.error(caught.getLocalizedMessage()); - showErrorAndHide("Error Final", - caught.getLocalizedMessage(), + showErrorAndHide("Error", + caught.getLocalizedMessage(), "", caught); } else { showErrorAndHide( "Error in import codelist mapping", - "An error occured in import codelist mapping: " - + caught.getLocalizedMessage(), + "An error occured in import codelist mapping: ", + caught.getLocalizedMessage(), caught); } } @@ -127,7 +128,6 @@ public class CodelistMappingOperationInProgressCard extends WizardCard public void setup() { getWizardWindow().setEnableBackButton(false); setBackButtonVisible(false); - setNextButtonVisible(false); getWizardWindow().setEnableNextButton(false); getWizardWindow().setNextButtonToFinish(); importCodelistMapping(); @@ -188,14 +188,15 @@ public class CodelistMappingOperationInProgressCard extends WizardCard if (caught instanceof TDGWTIsLockedException) { Log.error(caught.getLocalizedMessage()); showErrorAndHide("Error Locked", caught.getLocalizedMessage(), - caught); + "", caught); } else { if (caught instanceof TDGWTIsFinalException) { Log.error(caught.getLocalizedMessage()); showErrorAndHide("Error Final", - caught.getLocalizedMessage(), caught); + caught.getLocalizedMessage(), "", caught); } else { - showErrorAndHide("Error in Codelist Mapping Import", reason, caught); + showErrorAndHide("Error in Codelist Mapping Import", + reason, details, caught); } } } diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingTableDetailCard.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingTableDetailCard.java index 2fc5502..a3cfbbe 100644 --- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingTableDetailCard.java +++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingTableDetailCard.java @@ -183,19 +183,19 @@ public class CodelistMappingTableDetailCard extends WizardCard implements if (caught instanceof TDGWTIsLockedException) { Log.error(caught.getLocalizedMessage()); showErrorAndHide("Error Locked", - caught.getLocalizedMessage(), caught); + caught.getLocalizedMessage(), "", caught); } else { if (caught instanceof TDGWTIsFinalException) { Log.error(caught.getLocalizedMessage()); showErrorAndHide("Error Final", caught.getLocalizedMessage(), - caught); + "", caught); } else { showErrorAndHide( "Error in import codelist mapping", "An error occured in import codelist mapping: " + caught.getLocalizedMessage(), - caught); + "", caught); } } } @@ -226,15 +226,15 @@ public class CodelistMappingTableDetailCard extends WizardCard implements if (caught instanceof TDGWTIsLockedException) { Log.error(caught.getLocalizedMessage()); showErrorAndHide("Error Locked", caught.getLocalizedMessage(), - caught); + "", caught); } else { if (caught instanceof TDGWTIsFinalException) { Log.error(caught.getLocalizedMessage()); showErrorAndHide("Error Final", - caught.getLocalizedMessage(), caught); + caught.getLocalizedMessage(), "", caught); } else { getWizardWindow().fireFailed("Error", - "Error in Codelist Mapping Import", caught); + "Error in Codelist Mapping Import", "", caught); } } diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingWorkSpaceSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingWorkSpaceSelectionCard.java index 1b2b09e..d035dd6 100644 --- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingWorkSpaceSelectionCard.java +++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingWorkSpaceSelectionCard.java @@ -140,18 +140,19 @@ public class CodelistMappingWorkSpaceSelectionCard extends WizardCard { if (caught instanceof TDGWTIsLockedException) { Log.error(caught.getLocalizedMessage()); showErrorAndHide("Error Locked", - caught.getLocalizedMessage(), caught); + caught.getLocalizedMessage(), "", + caught); } else { if (caught instanceof TDGWTIsFinalException) { Log.error(caught.getLocalizedMessage()); showErrorAndHide("Error Final", - caught.getLocalizedMessage(), + caught.getLocalizedMessage(), "", caught); } else { showErrorAndHide( "Error", - "Error retrieving the file from the workspace: " - + caught.getLocalizedMessage(), + "Error retrieving the file from the workspace: ", + caught.getLocalizedMessage(), caught); } } diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourcesSelectionPanel.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourcesSelectionPanel.java index 96bacf5..f892424 100644 --- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourcesSelectionPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourcesSelectionPanel.java @@ -277,19 +277,18 @@ public class TabResourcesSelectionPanel extends ContentPanel implements if (caught instanceof TDGWTIsLockedException) { Log.error(caught.getLocalizedMessage()); parent.showErrorAndHide("Error Locked", - caught.getLocalizedMessage(), caught); + caught.getLocalizedMessage(), "", caught); } else { if (caught instanceof TDGWTIsFinalException) { Log.error(caught.getLocalizedMessage()); parent.showErrorAndHide("Error Final", caught.getLocalizedMessage(), - caught); + "", caught); } else { Log.debug("Error retrieving tabular resource: " + caught.getLocalizedMessage()); - UtilsGXT3 - .alert("Error!", - "Error retrieving tabular resources on server!"); + parent.showErrorAndHide("Error", + "Error retrieving tabular resources on server: ",caught.getLocalizedMessage(),caught); } } } diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/grid/ColumnDataGridPanel.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/grid/ColumnDataGridPanel.java index 38e74ab..b7c23c4 100644 --- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/grid/ColumnDataGridPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/grid/ColumnDataGridPanel.java @@ -144,10 +144,12 @@ 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: " + caught.getLocalizedMessage()); + parent.showErrorAndHide("Error","No load columns:", + caught.getLocalizedMessage(), caught); } }