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 51fcafe..361ee57 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
@@ -4,6 +4,7 @@
package org.gcube.portlets.user.td.sdmximportwidget.client;
import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
+import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsLockedException;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException;
import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXImportSession;
import org.gcube.portlets.user.td.gwtservice.shared.source.SDMXRegistrySource;
@@ -23,14 +24,10 @@ import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
import com.google.gwt.user.client.ui.HasVerticalAlignment;
import com.sencha.gxt.core.client.util.Margins;
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.BoxLayoutContainer.BoxLayoutData;
import com.sencha.gxt.widget.core.client.container.HtmlLayoutContainer;
import com.sencha.gxt.widget.core.client.container.VBoxLayoutContainer;
import com.sencha.gxt.widget.core.client.container.VBoxLayoutContainer.VBoxLayoutAlign;
-import com.sencha.gxt.widget.core.client.event.HideEvent;
-import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler;
-
/**
*
@@ -149,10 +146,17 @@ public class SDMXOperationInProgressCard extends WizardCard implements
new SessionExpiredEvent(
SessionExpiredType.EXPIREDONSERVER));
} else {
+ if (caught instanceof TDGWTIsLockedException) {
+ Log.error(caught.getLocalizedMessage());
+ showErrorAndHide("Error Locked",
+ caught.getLocalizedMessage(), caught);
+ } else {
+
+ showErrorAndHide("Error in importSDMX",
+ "An error occured in importSDMX",
+ caught);
+ }
- showErrorAndHide("Error in importSDMX",
- "An error occured in importSDMX", "",
- caught);
}
}
});
@@ -218,13 +222,9 @@ public class SDMXOperationInProgressCard extends WizardCard implements
new SessionExpiredEvent(
SessionExpiredType.EXPIREDONSERVER));
} else {
- AlertMessageBox d = new AlertMessageBox("Error in SDMX Import",
- reason);
- d.addHideHandler(new HideHandler() {
- public void onHide(HideEvent event) {
- }
- });
- d.show();
+ showErrorAndHide("Error in SDMX Import",
+ reason,caught);
+
}
forceLayout();
}
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmximportwidget/client/util/ErrorMessageBox.java b/src/main/java/org/gcube/portlets/user/td/sdmximportwidget/client/util/ErrorMessageBox.java
deleted file mode 100644
index eba08b6..0000000
--- a/src/main/java/org/gcube/portlets/user/td/sdmximportwidget/client/util/ErrorMessageBox.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- *
- */
-package org.gcube.portlets.user.td.sdmximportwidget.client.util;
-
-import com.google.gwt.core.client.Callback;
-import com.google.gwt.user.client.ui.Label;
-import com.sencha.gxt.widget.core.client.Dialog;
-import com.sencha.gxt.widget.core.client.Dialog.PredefinedButton;
-import com.sencha.gxt.widget.core.client.box.MessageBox;
-import com.sencha.gxt.widget.core.client.event.HideEvent;
-import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler;
-
-/**
- *
- * @author "Giancarlo Panichi"
- * g.panichi@isti.cnr.it
- *
- */
-public class ErrorMessageBox {
-
-
- private static final String DETAILS = "Details";
-
-
- public static void showError(String title, String failureReason, final String failureDetails)
- {
- showError(title, failureReason, failureDetails, new NOPCallBack