diff --git a/.classpath b/.classpath index 3de64d4..16ab819 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -33,5 +33,5 @@ - + diff --git a/distro/changelog.xml b/distro/changelog.xml index ead4a37..3c1296b 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,8 @@ + + Updated to StorageHub [task #11879] + Updated to new PortalContext [task #6548] diff --git a/pom.xml b/pom.xml index 7211900..3c35631 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ 4.0.0 org.gcube.portlets.user tabular-data-codelistmapping-import-widget - 1.8.0-SNAPSHOT + 1.9.0-SNAPSHOT tabular-data-codelistmapping-import-widget tabular-data-codelistmapping-import-widget allows import from url, file and workspace of maps for codelist @@ -129,13 +129,7 @@ org.gcube.portlets.widgets workspace-explorer - [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) - provided - - - - org.gcube.common - home-library + [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) provided 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 577cec7..7f19baa 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 @@ -34,8 +34,8 @@ import com.sencha.gxt.widget.core.client.form.FormPanel; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class CodelistMappingFileUploadPanel extends FormPanel { diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingImportWizardTD.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingImportWizardTD.java index b741938..3d2e2d0 100644 --- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingImportWizardTD.java +++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingImportWizardTD.java @@ -10,7 +10,7 @@ import com.google.web.bindery.event.shared.EventBus; /** * * @author giancarlo - * email: g.panichi@isti.cnr.it + * * */ public class CodelistMappingImportWizardTD extends WizardWindow { @@ -18,10 +18,7 @@ public class CodelistMappingImportWizardTD extends WizardWindow { private static final int HEIGHTWIZARD=520; private CodelistMappingSession codelistMappingSession; - /** - * The id of the {@link CSVTarget} to use. - * @param targetId - */ + public CodelistMappingImportWizardTD(TRId trId, String title, EventBus eventBus) { super(title,eventBus); diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingImportWizardTDEntry.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingImportWizardTDEntry.java index 08996b2..fe3151d 100644 --- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingImportWizardTDEntry.java +++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingImportWizardTDEntry.java @@ -10,7 +10,7 @@ import com.google.web.bindery.event.shared.SimpleEventBus; /** * * @author giancarlo - * email: g.panichi@isti.cnr.it + * * */ public class CodelistMappingImportWizardTDEntry implements EntryPoint { diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingMessages.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingMessages.java index 53e618c..d4f7751 100644 --- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingMessages.java +++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingMessages.java @@ -4,8 +4,8 @@ import com.google.gwt.i18n.client.Messages; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author giancarlo + * * */ public interface CodelistMappingMessages extends Messages { 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 96c569f..9cdee4a 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 @@ -32,8 +32,8 @@ import com.sencha.gxt.widget.core.client.container.VBoxLayoutContainer.VBoxLayou /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class CodelistMappingOperationInProgressCard extends WizardCard 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 fb0dc37..6dba807 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 @@ -23,8 +23,8 @@ import com.sencha.gxt.widget.core.client.form.TextField; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class CodelistMappingTableDetailCard extends WizardCard { diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingUploadFileCard.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingUploadFileCard.java index 2166dc3..e657234 100644 --- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingUploadFileCard.java +++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingUploadFileCard.java @@ -12,8 +12,8 @@ import com.google.gwt.user.client.Command; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class CodelistMappingUploadFileCard extends WizardCard { diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingUrlSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingUrlSelectionCard.java index cf29add..4ff2590 100644 --- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingUrlSelectionCard.java +++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingUrlSelectionCard.java @@ -21,8 +21,8 @@ import com.sencha.gxt.widget.core.client.form.TextField; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class CodelistMappingUrlSelectionCard extends WizardCard { 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 4c3fba4..d2ddab1 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 @@ -33,8 +33,8 @@ import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.Verti /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class CodelistMappingWorkSpaceSelectionCard extends WizardCard { diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/ColumnSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/ColumnSelectionCard.java index f6fafda..8e1cd5b 100644 --- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/ColumnSelectionCard.java +++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/ColumnSelectionCard.java @@ -21,8 +21,8 @@ import com.sencha.gxt.widget.core.client.form.FormPanel; /** * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ColumnSelectionCard extends WizardCard { diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/SourceSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/SourceSelectionCard.java index 3ef3f36..e60aba0 100644 --- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/SourceSelectionCard.java +++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/SourceSelectionCard.java @@ -23,8 +23,8 @@ import com.sencha.gxt.widget.core.client.form.Radio; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SourceSelectionCard extends WizardCard { diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourceProperties.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourceProperties.java index 663f6ac..18f935e 100644 --- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourceProperties.java +++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourceProperties.java @@ -11,8 +11,7 @@ import com.sencha.gxt.data.shared.PropertyAccess; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi * */ public interface TabResourceProperties extends PropertyAccess { diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourcesSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourcesSelectionCard.java index 14f3ac5..43b76d4 100644 --- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourcesSelectionCard.java +++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/TabResourcesSelectionCard.java @@ -28,8 +28,8 @@ import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class TabResourcesSelectionCard extends WizardCard { 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 aa6f8d5..dc690ac 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 @@ -64,8 +64,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class TabResourcesSelectionPanel extends ContentPanel implements diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/dataresource/CodelistMappingImportCSS.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/dataresource/CodelistMappingImportCSS.java index 04da495..4ec0e96 100644 --- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/dataresource/CodelistMappingImportCSS.java +++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/dataresource/CodelistMappingImportCSS.java @@ -7,8 +7,8 @@ import com.google.gwt.resources.client.CssResource; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface CodelistMappingImportCSS extends CssResource { 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 ed0ffd6..5419572 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 @@ -44,7 +44,7 @@ import com.sencha.gxt.widget.core.client.grid.Grid; /** * * @author giancarlo - * email: g.panichi@isti.cnr.it + * * */ public class ColumnDataGridPanel extends ContentPanel implements diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/grid/ColumnDataProperties.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/grid/ColumnDataProperties.java index 3b0b6a9..30d19db 100644 --- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/grid/ColumnDataProperties.java +++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/grid/ColumnDataProperties.java @@ -10,7 +10,7 @@ import com.sencha.gxt.data.shared.PropertyAccess; /** * * @author giancarlo - * email: g.panichi@isti.cnr.it + * * */ public interface ColumnDataProperties extends PropertyAccess { diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/progress/FileUploadProgressBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/progress/FileUploadProgressBarUpdater.java index 5b1c8eb..33077bf 100644 --- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/progress/FileUploadProgressBarUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/progress/FileUploadProgressBarUpdater.java @@ -9,40 +9,29 @@ import com.google.gwt.core.shared.GWT; import com.sencha.gxt.widget.core.client.ProgressBar; /** - * Updates a {@link ProgressBar} progress and text based on {@link CodelistMappingImportProgressListener} events. * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class FileUploadProgressBarUpdater implements FileUploadProgressListener { private static FileUploadProgressMessages msgs = GWT.create(FileUploadProgressMessages.class); private ProgressBar progressBar; - /** - * Creates a new {@link ProgressBar} updater. - * @param progressBar the {@link ProgressBar} to update. - */ + public FileUploadProgressBarUpdater(ProgressBar progressBar) { this.progressBar = progressBar; this.progressBar.updateProgress(0, msgs.pleaseWait()); } - - - /** - * {@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"); progressBar.updateText(msgs.fileUploadFailed()); diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/progress/FileUploadProgressCardUpdater.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/progress/FileUploadProgressCardUpdater.java index dc78562..3abee97 100644 --- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/progress/FileUploadProgressCardUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/progress/FileUploadProgressCardUpdater.java @@ -8,8 +8,8 @@ import com.allen_sauer.gwt.log.client.Log; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class FileUploadProgressCardUpdater implements FileUploadProgressListener { diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/progress/FileUploadProgressListener.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/progress/FileUploadProgressListener.java index 51adc17..5971a08 100644 --- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/progress/FileUploadProgressListener.java +++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/progress/FileUploadProgressListener.java @@ -9,8 +9,8 @@ package org.gcube.portlets.user.td.codelistmappingimportwidget.client.progress; /** * Defines a listener for operation progress. * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface FileUploadProgressListener { @@ -34,8 +34,10 @@ public interface FileUploadProgressListener { /** * Called when the operation is failed. - * @param caught the failure exception. - * @param reason the failure reason. + * + * @param caught Error + * @param reason Reason + * @param failureDetails Error details */ public void operationFailed(Throwable caught, String reason, String failureDetails); } diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/progress/FileUploadProgressMessages.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/progress/FileUploadProgressMessages.java index 83bde84..44c1a56 100644 --- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/progress/FileUploadProgressMessages.java +++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/progress/FileUploadProgressMessages.java @@ -5,7 +5,7 @@ import com.google.gwt.i18n.client.Messages; /** * * @author giancarlo - * email: g.panichi@isti.cnr.it + * * */ public interface FileUploadProgressMessages extends Messages { diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/progress/FileUploadProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/progress/FileUploadProgressUpdater.java index c25e857..3d657e7 100644 --- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/progress/FileUploadProgressUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/progress/FileUploadProgressUpdater.java @@ -14,13 +14,9 @@ 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 CodelistMappingImportProgressListener}. - * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * + * @author Giancarlo Panichi + * * */ public class FileUploadProgressUpdater extends Timer { @@ -29,9 +25,7 @@ public class FileUploadProgressUpdater extends Timer { private static FileUploadProgressMessages msgs = GWT .create(FileUploadProgressMessages.class); - /** - * {@inheritDoc} - */ + @Override public void run() { Log.debug("requesting operation progress"); @@ -112,24 +106,10 @@ public class FileUploadProgressUpdater extends Timer { listener.operationFailed(caught, failure, failureDetails); } - /** - * Add a new {@link CodelistMappingImportProgressListener} to this - * {@link FileUploadProgressUpdater}. - * - * @param listener - * the listener to add. - */ public void addListener(FileUploadProgressListener listener) { listeners.add(listener); } - /** - * Removes the specified {@link CodelistMappingImportProgressListener} from - * this {@link FileUploadProgressUpdater}. - * - * @param listener - * the listener to remove. - */ public void removeListener(FileUploadProgressListener listener) { listeners.remove(listener); }