diff --git a/.classpath b/.classpath index 81f88a7..ff9797f 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -33,5 +33,5 @@ - + diff --git a/distro/changelog.xml b/distro/changelog.xml index d56592f..7833bcf 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,9 @@ + + Updated to StorageHub [task #11879] + diff --git a/pom.xml b/pom.xml index 6f6e551..50a634a 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ 4.0.0 org.gcube.portlets.user tabular-data-csv-import-widget - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT tabular-data-csv-import-widget tabular-data-csv-import-widget allows csv import from file and workspace @@ -129,20 +129,14 @@ provided - + org.gcube.portlets.widgets workspace-explorer - [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) + [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) provided - - org.gcube.common - home-library - provided - - com.allen-sauer.gwt.log 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 7a97072..4252bf3 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 @@ -50,8 +50,8 @@ import com.sencha.gxt.widget.core.client.tips.ToolTipConfig; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * + * * */ public class CSVConfigCard extends WizardCard { diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVErrorWindow.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVErrorWindow.java index 130c3ac..06b7ee3 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVErrorWindow.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVErrorWindow.java @@ -20,8 +20,8 @@ import com.sencha.gxt.widget.core.client.grid.Grid; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * + * * */ public class CSVErrorWindow extends Window { diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTD.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTD.java index 167ffca..2aae680 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTD.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTD.java @@ -7,6 +7,8 @@ import com.google.web.bindery.event.shared.EventBus; /** * + * @author Giancarlo Panichi + * */ public class CSVImportWizardTD extends WizardWindow { @@ -15,10 +17,7 @@ public class CSVImportWizardTD extends WizardWindow { protected String WIZARDHEIGHT = "520px"; //private CSVImportWizardTD wizard; - /** - * The id of the {@link CSVTarget} to use. - * @param targetId - */ + public CSVImportWizardTD(String title, EventBus eventBus) { super(title,eventBus); diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTDEntry.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTDEntry.java index 0738e66..29196f6 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTDEntry.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTDEntry.java @@ -4,6 +4,11 @@ import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.core.client.EntryPoint; import com.google.web.bindery.event.shared.SimpleEventBus; +/** + * + * @author Giancarlo Panichi + * + */ public class CSVImportWizardTDEntry implements EntryPoint { diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTDMessages.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTDMessages.java index 34c9e42..1ed6f70 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTDMessages.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTDMessages.java @@ -4,8 +4,8 @@ import com.google.gwt.i18n.client.Messages; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface CSVImportWizardTDMessages extends Messages { 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 53e7a66..3462ae1 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 @@ -32,8 +32,8 @@ import com.sencha.gxt.widget.core.client.container.VBoxLayoutContainer.VBoxLayou /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * + * * */ public class CSVOperationInProgressCard extends WizardCard implements 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 c9c93c3..68baaef 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 @@ -50,8 +50,8 @@ import com.sencha.gxt.widget.core.client.form.TextField; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * + * * */ public class CSVTableDetailCard extends WizardCard { 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 5787924..bcb88a4 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 @@ -13,8 +13,8 @@ import com.sencha.gxt.widget.core.client.container.MarginData; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * + * * */ public class CSVUploadFileCard extends WizardCard { 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 9b93ae2..2cf7395 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 @@ -32,8 +32,8 @@ import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.Verti /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * + * * */ public class CSVWorkSpaceSelectionCard extends WizardCard { diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CsvCheckPanel.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CsvCheckPanel.java index 4daa6d6..12e318c 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CsvCheckPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CsvCheckPanel.java @@ -21,8 +21,7 @@ import com.sencha.gxt.widget.core.client.tips.ToolTipConfig; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi * */ public class CsvCheckPanel extends VerticalPanel { @@ -84,16 +83,11 @@ public class CsvCheckPanel extends VerticalPanel { msgs = GWT.create(CSVImportWizardTDMessages.class); } - /** - * @return - */ + public TextButton getCheckConfiguration() { return btnCheckConfiguration; } - /** - * @return the skipInvalidCheckBox - */ public CheckBox getSkipInvalidCheckBox() { return chBoxSkipInvalid; } 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 8c80dcb..8fdf478 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 @@ -33,8 +33,8 @@ import com.sencha.gxt.widget.core.client.form.FormPanel; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * + * * */ public class FileUploadPanel extends FormPanel { 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 d183fef..a3068fb 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 @@ -22,8 +22,8 @@ import com.sencha.gxt.widget.core.client.form.Radio; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * + * * */ public class SourceSelectionCard extends WizardCard { diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/csvgrid/CSVGrid.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/csvgrid/CSVGrid.java index 0f7bcd7..493142a 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/csvgrid/CSVGrid.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/csvgrid/CSVGrid.java @@ -31,8 +31,8 @@ import com.sencha.gxt.widget.core.client.grid.RowNumberer; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * + * * */ public class CSVGrid extends Grid { diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/csvgrid/CSVGridMessages.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/csvgrid/CSVGridMessages.java index 67fdce5..0cf0f32 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/csvgrid/CSVGridMessages.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/csvgrid/CSVGridMessages.java @@ -5,7 +5,7 @@ import com.google.gwt.i18n.client.Messages; /** * * @author giancarlo - * email: g.panichi@isti.cnr.it + * email: * */ public interface CSVGridMessages extends Messages { diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/csvgrid/CSVGridView.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/csvgrid/CSVGridView.java index 5714500..03ab205 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/csvgrid/CSVGridView.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/csvgrid/CSVGridView.java @@ -21,7 +21,7 @@ import com.sencha.gxt.widget.core.client.menu.Menu; /** * * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * * */ public class CSVGridView extends GridView { diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/csvgrid/CSVJsonReader.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/csvgrid/CSVJsonReader.java index 9987149..e798200 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/csvgrid/CSVJsonReader.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/csvgrid/CSVJsonReader.java @@ -13,7 +13,7 @@ import com.sencha.gxt.data.shared.loader.ListLoadResultBean; /** * * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * * */ public class CSVJsonReader implements DataReader, String> { diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/data/CSVData.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/data/CSVData.java index c884a7b..9098e17 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/data/CSVData.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/data/CSVData.java @@ -12,7 +12,7 @@ import com.google.gwt.core.client.JsArray; /** * * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * * */ public final class CSVData extends JavaScriptObject { diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/data/CSVRow.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/data/CSVRow.java index cd80cef..2633596 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/data/CSVRow.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/data/CSVRow.java @@ -8,7 +8,7 @@ import com.google.gwt.core.client.JavaScriptObject; /** * * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * * */ public final class CSVRow extends JavaScriptObject { diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/dataresource/CSVImportCSS.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/dataresource/CSVImportCSS.java index c0ced7e..c2172a5 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/dataresource/CSVImportCSS.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/dataresource/CSVImportCSS.java @@ -8,7 +8,7 @@ import com.google.gwt.resources.client.CssResource; /** * * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * * */ public interface CSVImportCSS extends CssResource { diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/licence/LicenceDataPropertiesCombo.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/licence/LicenceDataPropertiesCombo.java index 2241b16..94f24e8 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/licence/LicenceDataPropertiesCombo.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/licence/LicenceDataPropertiesCombo.java @@ -11,7 +11,7 @@ import com.sencha.gxt.data.shared.PropertyAccess; /** * * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * * */ public interface LicenceDataPropertiesCombo extends diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressBarUpdater.java index d7a3c74..d00099f 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressBarUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressBarUpdater.java @@ -8,11 +8,8 @@ import com.google.gwt.core.client.GWT; import com.sencha.gxt.widget.core.client.ProgressBar; /** - * Updates a {@link ProgressBar} progress and text based on - * {@link CSVImportProgressListener} events. * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi * */ public class FileUploadProgressBarUpdater implements FileUploadProgressListener { @@ -20,12 +17,6 @@ public class FileUploadProgressBarUpdater implements FileUploadProgressListener private ProgressBar progressBar; private FileUploadProgressMessages msgs; - /** - * Creates a new {@link ProgressBar} updater. - * - * @param progressBar - * the {@link ProgressBar} to update. - */ public FileUploadProgressBarUpdater(ProgressBar progressBar) { initMessages(); this.progressBar = progressBar; @@ -36,18 +27,12 @@ public class FileUploadProgressBarUpdater implements FileUploadProgressListener msgs = GWT.create(FileUploadProgressMessages.class); } - /** - * {@inheritDoc} - */ public void operationComplete() { Log.info("File upload complete"); progressBar.updateProgress(1, msgs.fileUploadCompleted()); } - /** - * {@inheritDoc} - */ public void operationFailed(Throwable caught, String reason, String failureDetails) { Log.info("File upload failed"); diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressCardUpdater.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressCardUpdater.java index 234c853..f3fb408 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressCardUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressCardUpdater.java @@ -3,33 +3,24 @@ */ package org.gcube.portlets.user.td.csvimportwidget.client.progress; - import com.allen_sauer.gwt.log.client.Log; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author "Giancarlo Panichi" + * * */ public class FileUploadProgressCardUpdater implements FileUploadProgressListener { - - - /** - * - */ + public FileUploadProgressCardUpdater() { } - public void operationComplete() { - Log.info("File upload completed"); - + Log.info("File upload completed"); + } - /** - * {@inheritDoc} - */ public void operationFailed(Throwable caught, String reason, String failureDetails) { Log.info("File upload failed"); } @@ -39,7 +30,7 @@ public class FileUploadProgressCardUpdater implements FileUploadProgressListener } public void operationUpdate(float elaborated) { - Log.info("File uploading: "+elaborated); + Log.info("File uploading: " + elaborated); } } diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressListener.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressListener.java index 2f2e186..aca8581 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressListener.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressListener.java @@ -3,39 +3,20 @@ */ package org.gcube.portlets.user.td.csvimportwidget.client.progress; - - - /** * Defines a listener for operation progress. * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author "Giancarlo Panichi" + * * */ public interface FileUploadProgressListener { - - /** - * Called when the operation is starting. - */ + public void operationInitializing(); - - /** - * Called when there is a progress for the operation. - * @param elaborated the elaborated part. - */ + public void operationUpdate(float elaborated); - - - /** - * Called when the operation is complete. - */ + public void operationComplete(); - /** - * Called when the operation is failed. - * @param caught the failure exception. - * @param reason the failure reason. - */ public void operationFailed(Throwable caught, String reason, String failureDetails); } diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressMessages.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressMessages.java index 71515ec..4c78d92 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressMessages.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressMessages.java @@ -4,13 +4,12 @@ import com.google.gwt.i18n.client.Messages; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi * */ public interface FileUploadProgressMessages extends Messages { - // + @DefaultMessage("Please Wait...") String pleaseWait(); diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressUpdater.java index 78c538e..fa09f59 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/progress/FileUploadProgressUpdater.java @@ -14,71 +14,55 @@ import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; /** - * This {@link Timer} retrieves {@link OperationProgress} from the specified - * {@link OperationProgressSource} with the scheduled interval. The retrieved - * information are spread to the subscribed {@link CSVImportProgressListener}. * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi * */ public class FileUploadProgressUpdater extends Timer { private ArrayList listeners = new ArrayList(); - private static FileUploadProgressMessages msgs = GWT - .create(FileUploadProgressMessages.class); + private static FileUploadProgressMessages msgs = GWT.create(FileUploadProgressMessages.class); - /** - * {@inheritDoc} - */ @Override public void run() { Log.debug("requesting operation progress"); - TDGWTServiceAsync.INSTANCE - .getFileUploadMonitor(new AsyncCallback() { + TDGWTServiceAsync.INSTANCE.getFileUploadMonitor(new AsyncCallback() { - public void onFailure(Throwable caught) { - cancel(); - Log.error("Error retrieving the operation state", - caught); - String message = getStack(caught); - fireOperationFailed(caught, - msgs.failedGettingOperarionUpdateds(), message); - } + public void onFailure(Throwable caught) { + cancel(); + Log.error("Error retrieving the operation state", caught); + String message = getStack(caught); + fireOperationFailed(caught, msgs.failedGettingOperarionUpdateds(), message); + } - public void onSuccess(FileUploadMonitor result) { - Log.info("retrieved FileUploadMonitor: " - + result.getState()); - switch (result.getState()) { - case STARTED: - Log.debug("File Upload Started"); - break; - case INPROGRESS: - Log.debug("Progress: " - + result.getElaboratedLenght() + " of " - + result.getTotalLenght()); - fireOperationUpdate(result.getPercentDone()); - break; - case FAILED: - Log.debug("File Upload Failed"); - cancel(); - fireOperationFailed(new Throwable( - msgs.fileUploadFailedHead()), result - .getFailureReason(), result - .getFailureDetails()); - break; - case COMPLETED: - cancel(); - Log.debug("File Upload Completed"); - fireOperationComplete(); - break; - default: - break; - } + public void onSuccess(FileUploadMonitor result) { + Log.info("retrieved FileUploadMonitor: " + result.getState()); + switch (result.getState()) { + case STARTED: + Log.debug("File Upload Started"); + break; + case INPROGRESS: + Log.debug("Progress: " + result.getElaboratedLenght() + " of " + result.getTotalLenght()); + fireOperationUpdate(result.getPercentDone()); + break; + case FAILED: + Log.debug("File Upload Failed"); + cancel(); + fireOperationFailed(new Throwable(msgs.fileUploadFailedHead()), result.getFailureReason(), + result.getFailureDetails()); + break; + case COMPLETED: + cancel(); + Log.debug("File Upload Completed"); + fireOperationComplete(); + break; + default: + break; + } - } + } - }); + }); } @@ -105,30 +89,15 @@ public class FileUploadProgressUpdater extends Timer { listener.operationComplete(); } - protected void fireOperationFailed(Throwable caught, String failure, - String failureDetails) { + protected void fireOperationFailed(Throwable caught, String failure, String failureDetails) { for (FileUploadProgressListener listener : listeners) listener.operationFailed(caught, failure, failureDetails); } - /** - * Add a new {@link CSVImportProgressListener} to this - * {@link FileUploadProgressUpdater}. - * - * @param listener - * the listener to add. - */ public void addListener(FileUploadProgressListener listener) { listeners.add(listener); } - /** - * Removes the specified {@link CSVImportProgressListener} from this - * {@link FileUploadProgressUpdater}. - * - * @param listener - * the listener to remove. - */ public void removeListener(FileUploadProgressListener listener) { listeners.remove(listener); }