ref #11879: TDM - Update to StorageHUB

https://support.d4science.org/issues/#11879

Updated to StorageHub



git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-codelistmapping-import-widget@169483 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2018-06-27 12:28:07 +00:00
parent 03d7ae1885
commit 22392b9d0a
25 changed files with 56 additions and 91 deletions

View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" output="target/tabular-data-codelistmapping-import-widget-1.8.0-SNAPSHOT/WEB-INF/classes" path="src/main/java"> <classpathentry kind="src" output="target/tabular-data-codelistmapping-import-widget-1.9.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry excluding="**" kind="src" output="target/tabular-data-codelistmapping-import-widget-1.8.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources"> <classpathentry excluding="**" kind="src" output="target/tabular-data-codelistmapping-import-widget-1.9.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
@ -33,5 +33,5 @@
<attribute name="org.eclipse.jst.component.nondependency" value=""/> <attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="output" path="target/tabular-data-codelistmapping-import-widget-1.8.0-SNAPSHOT/WEB-INF/classes"/> <classpathentry kind="output" path="target/tabular-data-codelistmapping-import-widget-1.9.0-SNAPSHOT/WEB-INF/classes"/>
</classpath> </classpath>

View File

@ -1,4 +1,8 @@
<ReleaseNotes> <ReleaseNotes>
<Changeset component="org.gcube.portlets-user.tabular-data-codelistmapping-import-widget.1-9-0"
date="2018-07-01">
<Change>Updated to StorageHub [task #11879]</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.tabular-data-codelistmapping-import-widget.1-8-0" <Changeset component="org.gcube.portlets-user.tabular-data-codelistmapping-import-widget.1-8-0"
date="2017-02-15"> date="2017-02-15">
<Change>Updated to new PortalContext [task #6548]</Change> <Change>Updated to new PortalContext [task #6548]</Change>

10
pom.xml
View File

@ -13,7 +13,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
<artifactId>tabular-data-codelistmapping-import-widget</artifactId> <artifactId>tabular-data-codelistmapping-import-widget</artifactId>
<version>1.8.0-SNAPSHOT</version> <version>1.9.0-SNAPSHOT</version>
<name>tabular-data-codelistmapping-import-widget</name> <name>tabular-data-codelistmapping-import-widget</name>
<description>tabular-data-codelistmapping-import-widget allows import from url, file and workspace of maps for codelist</description> <description>tabular-data-codelistmapping-import-widget allows import from url, file and workspace of maps for codelist</description>
@ -129,13 +129,7 @@
<dependency> <dependency>
<groupId>org.gcube.portlets.widgets</groupId> <groupId>org.gcube.portlets.widgets</groupId>
<artifactId>workspace-explorer</artifactId> <artifactId>workspace-explorer</artifactId>
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> <version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>home-library</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

View File

@ -34,8 +34,8 @@ import com.sencha.gxt.widget.core.client.form.FormPanel;
/** /**
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class CodelistMappingFileUploadPanel extends FormPanel { public class CodelistMappingFileUploadPanel extends FormPanel {

View File

@ -10,7 +10,7 @@ import com.google.web.bindery.event.shared.EventBus;
/** /**
* *
* @author giancarlo * @author giancarlo
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class CodelistMappingImportWizardTD extends WizardWindow { public class CodelistMappingImportWizardTD extends WizardWindow {
@ -18,10 +18,7 @@ public class CodelistMappingImportWizardTD extends WizardWindow {
private static final int HEIGHTWIZARD=520; private static final int HEIGHTWIZARD=520;
private CodelistMappingSession codelistMappingSession; private CodelistMappingSession codelistMappingSession;
/**
* The id of the {@link CSVTarget} to use.
* @param targetId
*/
public CodelistMappingImportWizardTD(TRId trId, String title, EventBus eventBus) { public CodelistMappingImportWizardTD(TRId trId, String title, EventBus eventBus) {
super(title,eventBus); super(title,eventBus);

View File

@ -10,7 +10,7 @@ import com.google.web.bindery.event.shared.SimpleEventBus;
/** /**
* *
* @author giancarlo * @author giancarlo
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class CodelistMappingImportWizardTDEntry implements EntryPoint { public class CodelistMappingImportWizardTDEntry implements EntryPoint {

View File

@ -4,8 +4,8 @@ import com.google.gwt.i18n.client.Messages;
/** /**
* *
* @author giancarlo email: <a * @author giancarlo
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public interface CodelistMappingMessages extends Messages { public interface CodelistMappingMessages extends Messages {

View File

@ -32,8 +32,8 @@ import com.sencha.gxt.widget.core.client.container.VBoxLayoutContainer.VBoxLayou
/** /**
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class CodelistMappingOperationInProgressCard extends WizardCard public class CodelistMappingOperationInProgressCard extends WizardCard

View File

@ -23,8 +23,8 @@ import com.sencha.gxt.widget.core.client.form.TextField;
/** /**
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class CodelistMappingTableDetailCard extends WizardCard { public class CodelistMappingTableDetailCard extends WizardCard {

View File

@ -12,8 +12,8 @@ import com.google.gwt.user.client.Command;
/** /**
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class CodelistMappingUploadFileCard extends WizardCard { public class CodelistMappingUploadFileCard extends WizardCard {

View File

@ -21,8 +21,8 @@ import com.sencha.gxt.widget.core.client.form.TextField;
/** /**
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class CodelistMappingUrlSelectionCard extends WizardCard { public class CodelistMappingUrlSelectionCard extends WizardCard {

View File

@ -33,8 +33,8 @@ import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.Verti
/** /**
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class CodelistMappingWorkSpaceSelectionCard extends WizardCard { public class CodelistMappingWorkSpaceSelectionCard extends WizardCard {

View File

@ -21,8 +21,8 @@ import com.sencha.gxt.widget.core.client.form.FormPanel;
/** /**
* *
* @author "Giancarlo Panichi" email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class ColumnSelectionCard extends WizardCard { public class ColumnSelectionCard extends WizardCard {

View File

@ -23,8 +23,8 @@ import com.sencha.gxt.widget.core.client.form.Radio;
/** /**
* *
* @author "Giancarlo Panichi" <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class SourceSelectionCard extends WizardCard { public class SourceSelectionCard extends WizardCard {

View File

@ -11,8 +11,7 @@ import com.sencha.gxt.data.shared.PropertyAccess;
/** /**
* *
* @author "Giancarlo Panichi" * @author Giancarlo Panichi
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* *
*/ */
public interface TabResourceProperties extends PropertyAccess<TabResource> { public interface TabResourceProperties extends PropertyAccess<TabResource> {

View File

@ -28,8 +28,8 @@ import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler;
/** /**
* *
* @author giancarlo email: <a * @author Giancarlo Panichi
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class TabResourcesSelectionCard extends WizardCard { public class TabResourcesSelectionCard extends WizardCard {

View File

@ -64,8 +64,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
/** /**
* *
* @author giancarlo * @author Giancarlo Panichi
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class TabResourcesSelectionPanel extends ContentPanel implements public class TabResourcesSelectionPanel extends ContentPanel implements

View File

@ -7,8 +7,8 @@ import com.google.gwt.resources.client.CssResource;
/** /**
* *
* @author "Giancarlo Panichi" * @author Giancarlo Panichi
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public interface CodelistMappingImportCSS extends CssResource { public interface CodelistMappingImportCSS extends CssResource {

View File

@ -44,7 +44,7 @@ import com.sencha.gxt.widget.core.client.grid.Grid;
/** /**
* *
* @author giancarlo * @author giancarlo
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class ColumnDataGridPanel extends ContentPanel implements public class ColumnDataGridPanel extends ContentPanel implements

View File

@ -10,7 +10,7 @@ import com.sencha.gxt.data.shared.PropertyAccess;
/** /**
* *
* @author giancarlo * @author giancarlo
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public interface ColumnDataProperties extends PropertyAccess<ColumnData> { public interface ColumnDataProperties extends PropertyAccess<ColumnData> {

View File

@ -9,40 +9,29 @@ import com.google.gwt.core.shared.GWT;
import com.sencha.gxt.widget.core.client.ProgressBar; import com.sencha.gxt.widget.core.client.ProgressBar;
/** /**
* Updates a {@link ProgressBar} progress and text based on {@link CodelistMappingImportProgressListener} events.
* *
* @author "Giancarlo Panichi" * @author Giancarlo Panichi
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class FileUploadProgressBarUpdater implements FileUploadProgressListener { public class FileUploadProgressBarUpdater implements FileUploadProgressListener {
private static FileUploadProgressMessages msgs = GWT.create(FileUploadProgressMessages.class); private static FileUploadProgressMessages msgs = GWT.create(FileUploadProgressMessages.class);
private ProgressBar progressBar; private ProgressBar progressBar;
/**
* Creates a new {@link ProgressBar} updater.
* @param progressBar the {@link ProgressBar} to update.
*/
public FileUploadProgressBarUpdater(ProgressBar progressBar) { public FileUploadProgressBarUpdater(ProgressBar progressBar) {
this.progressBar = progressBar; this.progressBar = progressBar;
this.progressBar.updateProgress(0, msgs.pleaseWait()); this.progressBar.updateProgress(0, msgs.pleaseWait());
} }
/**
* {@inheritDoc}
*/
public void operationComplete() { public void operationComplete() {
Log.info("File upload complete"); Log.info("File upload complete");
progressBar.updateProgress(1, msgs.fileUploadCompleted()); progressBar.updateProgress(1, msgs.fileUploadCompleted());
} }
/**
* {@inheritDoc}
*/
public void operationFailed(Throwable caught, String reason, String failureDetails) { public void operationFailed(Throwable caught, String reason, String failureDetails) {
Log.info("File upload failed"); Log.info("File upload failed");
progressBar.updateText(msgs.fileUploadFailed()); progressBar.updateText(msgs.fileUploadFailed());

View File

@ -8,8 +8,8 @@ import com.allen_sauer.gwt.log.client.Log;
/** /**
* *
* @author "Giancarlo Panichi" * @author Giancarlo Panichi
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public class FileUploadProgressCardUpdater implements FileUploadProgressListener { public class FileUploadProgressCardUpdater implements FileUploadProgressListener {

View File

@ -9,8 +9,8 @@ package org.gcube.portlets.user.td.codelistmappingimportwidget.client.progress;
/** /**
* Defines a listener for operation progress. * Defines a listener for operation progress.
* *
* @author "Giancarlo Panichi" * @author Giancarlo Panichi
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public interface FileUploadProgressListener { public interface FileUploadProgressListener {
@ -34,8 +34,10 @@ public interface FileUploadProgressListener {
/** /**
* Called when the operation is failed. * 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); public void operationFailed(Throwable caught, String reason, String failureDetails);
} }

View File

@ -5,7 +5,7 @@ import com.google.gwt.i18n.client.Messages;
/** /**
* *
* @author giancarlo * @author giancarlo
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> *
* *
*/ */
public interface FileUploadProgressMessages extends Messages { public interface FileUploadProgressMessages extends Messages {

View File

@ -14,13 +14,9 @@ import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.rpc.AsyncCallback; 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 * @author Giancarlo Panichi
* information are spread to the subscribed *
* {@link CodelistMappingImportProgressListener}.
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* *
*/ */
public class FileUploadProgressUpdater extends Timer { public class FileUploadProgressUpdater extends Timer {
@ -29,9 +25,7 @@ public class FileUploadProgressUpdater extends Timer {
private static FileUploadProgressMessages msgs = GWT private static FileUploadProgressMessages msgs = GWT
.create(FileUploadProgressMessages.class); .create(FileUploadProgressMessages.class);
/**
* {@inheritDoc}
*/
@Override @Override
public void run() { public void run() {
Log.debug("requesting operation progress"); Log.debug("requesting operation progress");
@ -112,24 +106,10 @@ public class FileUploadProgressUpdater extends Timer {
listener.operationFailed(caught, failure, failureDetails); 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) { public void addListener(FileUploadProgressListener listener) {
listeners.add(listener); listeners.add(listener);
} }
/**
* Removes the specified {@link CodelistMappingImportProgressListener} from
* this {@link FileUploadProgressUpdater}.
*
* @param listener
* the listener to remove.
*/
public void removeListener(FileUploadProgressListener listener) { public void removeListener(FileUploadProgressListener listener) {
listeners.remove(listener); listeners.remove(listener);
} }