diff --git a/pom.xml b/pom.xml
index e3ad50a..f1164c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
4.0.0
org.gcube.portlets.user
tabular-data-csv-import-widget
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
tabular-data-csv-import-widget
tabular-data-csv-import-widget allows csv import from file and workspace
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 15c58a7..8fee97f 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
@@ -35,7 +35,7 @@ import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler;
*
*/
public class CSVOperationInProgressCard extends WizardCard implements
-CSVImportProgressListener {
+ CSVImportProgressListener {
public static final int STATUS_POLLING_DELAY = 1000;
protected CSVOperationInProgressCard thisCard;
@@ -52,7 +52,7 @@ CSVImportProgressListener {
operationInProgressPanel.setVBoxLayoutAlign(VBoxLayoutAlign.CENTER);
final FlexTable description = new FlexTable();
- //FlexCellFormatter cellFormatter = description.getFlexCellFormatter();
+ // FlexCellFormatter cellFormatter = description.getFlexCellFormatter();
description.setCellSpacing(10);
description.setCellPadding(4);
description.setBorderWidth(0);
@@ -69,7 +69,6 @@ CSVImportProgressListener {
"File: ");
description.setText(2, 1, importSession.getTabResource().getName());
-
FramedPanel summary = new FramedPanel();
summary.setHeadingText("Import Summary");
summary.setWidth(400);
@@ -82,26 +81,31 @@ CSVImportProgressListener {
new Margins(10, 5, 10, 5)));
progressUpdater = new CSVImportProgressUpdater();
- progressUpdater.addListener(new CSVImportProgressBarUpdater(progressBar));
+ progressUpdater
+ .addListener(new CSVImportProgressBarUpdater(progressBar));
progressUpdater.addListener(this);
setContent(operationInProgressPanel);
}
- //columnToImportMask
+
+ // columnToImportMask
public void importCSV() {
- TDGWTServiceAsync.INSTANCE.startCSVImport(importSession, new AsyncCallback() {
+ TDGWTServiceAsync.INSTANCE.startCSVImport(importSession,
+ new AsyncCallback() {
-
public void onSuccess(Void result) {
progressUpdater.scheduleRepeating(STATUS_POLLING_DELAY);
}
public void onFailure(Throwable caught) {
- showErrorAndHide("Error in importCSV",
- "An error occured in importCSV: "+caught.getLocalizedMessage(), caught.getStackTrace().toString(), caught);
+ showErrorAndHide(
+ "Error in importCSV",
+ "An error occured in importCSV: "
+ + caught.getLocalizedMessage(), caught
+ .getStackTrace().toString(), caught);
}
});
}
@@ -116,7 +120,6 @@ CSVImportProgressListener {
importCSV();
}
-
public void operationInitializing() {
}
@@ -149,7 +152,6 @@ CSVImportProgressListener {
getWizardWindow().setEnableNextButton(true);
}
-
public void operationFailed(Throwable caught, String reason,
String failureDetails) {
AlertMessageBox d = new AlertMessageBox("Error in CSV Import", reason);
@@ -160,4 +162,30 @@ CSVImportProgressListener {
d.show();
}
+ @Override
+ public void operationStopped(final TRId trId, String reason, String details) {
+ // final String tableId,final String tableResourceId) {
+
+ Command sayComplete = new Command() {
+ public void execute() {
+ try {
+ getWizardWindow().close(false);
+ Log.info("fire Complete: tabular resource " + trId.getId());
+ Log.info("fire Complete: tableId " + trId.getTableId());
+
+ getWizardWindow().fireCompleted(trId);
+
+ } catch (Exception e) {
+ Log.error("fire Complete :" + e.getLocalizedMessage());
+ }
+ }
+ };
+
+ getWizardWindow().setNextButtonCommand(sayComplete);
+
+ setNextButtonVisible(true);
+ getWizardWindow().setEnableNextButton(true);
+
+ }
+
}
diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/CSVImportProgressBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/CSVImportProgressBarUpdater.java
index f8458ee..1ea4976 100644
--- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/CSVImportProgressBarUpdater.java
+++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/CSVImportProgressBarUpdater.java
@@ -35,6 +35,7 @@ public class CSVImportProgressBarUpdater implements CSVImportProgressListener {
/**
* {@inheritDoc}
*/
+ @Override
public void operationComplete(TRId trId) {
Log.info("Import completed");
progressBar.updateProgress(1, "Import completed.");
@@ -44,16 +45,19 @@ public class CSVImportProgressBarUpdater implements CSVImportProgressListener {
/**
* {@inheritDoc}
*/
+ @Override
public void operationFailed(Throwable caught, String reason, String failureDetails) {
Log.info("Import failed");
progressBar.updateText("Import failed.");
}
+ @Override
public void operationInitializing() {
Log.info("Inport Inizializing");
progressBar.updateProgress(0, "Initializing...");
}
+ @Override
public void operationUpdate(float elaborated) {
Log.info("Import elaborated: "+elaborated);
if (elaborated == 0) progressBar.updateProgress(0, "Initializing...");
@@ -65,5 +69,13 @@ public class CSVImportProgressBarUpdater implements CSVImportProgressListener {
if (elaborated == 1) progressBar.updateProgress(1, "Completing...");
}
+
+ @Override
+ public void operationStopped(TRId trId,String reason, String details) {
+ Log.debug("Operation Stopped: ["+trId.toString()+", "+reason+", "+details+"]");
+ progressBar.updateText("Stopped");
+
+ }
+
}
diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/CSVImportProgressListener.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/CSVImportProgressListener.java
index c5370de..93523fe 100644
--- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/CSVImportProgressListener.java
+++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/CSVImportProgressListener.java
@@ -39,4 +39,14 @@ public interface CSVImportProgressListener {
* @param reason the failure reason.
*/
public void operationFailed(Throwable caught, String reason, String failureDetails);
+
+ /**
+ * Called when the operation is stopped
+ *
+ * @param trId
+ * @param reason
+ * @param details
+ */
+ public void operationStopped(TRId trId, String reason, String details);
+
}
diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/CSVImportProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/CSVImportProgressUpdater.java
index 77d6941..a3490fb 100644
--- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/CSVImportProgressUpdater.java
+++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/CSVImportProgressUpdater.java
@@ -12,9 +12,6 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.sencha.gxt.widget.core.client.box.AlertMessageBox;
-import com.sencha.gxt.widget.core.client.event.HideEvent;
-import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler;
/**
* This {@link Timer} retrieves {@link OperationProgress} from the specified
@@ -68,7 +65,7 @@ public class CSVImportProgressUpdater extends Timer {
break;
case STOPPED:
cancel();
- errorMessage(result);
+ stopMessage(result);
break;
case FAILED:
cancel();
@@ -108,6 +105,21 @@ public class CSVImportProgressUpdater extends Timer {
fireOperationFailed(th, failure, details);
}
+
+ protected void stopMessage(CSVImportMonitor result) {
+ Log.info("CSV Import Stopped");
+ String failure = null;
+ String details = null;
+ if (result.getError() != null) {
+ failure = "Stopped";
+ details = result.getError().getLocalizedMessage();
+ } else {
+ failure = "Stopped";
+ details = "Stopped import CSV";
+ }
+
+ fireOperationStopped(result.getTrId(),failure, details);
+ }
protected String getStack(Throwable e) {
String message = e.getLocalizedMessage() + " ->
";
@@ -137,6 +149,11 @@ public class CSVImportProgressUpdater extends Timer {
for (CSVImportProgressListener listener : listeners)
listener.operationFailed(caught, failure, failureDetails);
}
+
+ protected void fireOperationStopped(TRId trId, String reason, String details) {
+ for (CSVImportProgressListener listener : listeners)
+ listener.operationStopped(trId,reason, details);
+ }
/**
* Add a new {@link CSVImportProgressListener} to this