From cc1a48841a1f0ceab480a1ce7b936ca49e671870 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 27 Jun 2018 14:06:35 +0000 Subject: [PATCH] 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-json-export-widget@169497 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 6 +++--- distro/changelog.xml | 3 +++ pom.xml | 13 ++++--------- .../client/DestinationSelectionCard.java | 4 ++-- .../jsonexportwidget/client/DownloadFileCard.java | 4 ++-- .../client/JSONExportConfigCard.java | 4 ++-- .../jsonexportwidget/client/JSONExportWidgetTD.java | 10 +++------- .../client/JSONExportWidgetTDEntry.java | 4 ++-- .../client/JSONExportWizardTDMessages.java | 4 ++-- .../client/JSONOperationInProgressCard.java | 4 ++-- .../client/JSONWorkSpaceSelectionCard.java | 9 +++------ .../client/grid/ColumnDataGridPanel.java | 9 +++------ .../client/grid/ColumnDataProperties.java | 4 ++-- 13 files changed, 33 insertions(+), 45 deletions(-) diff --git a/.classpath b/.classpath index 709bcac..57ee2b5 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -33,5 +33,5 @@ - + diff --git a/distro/changelog.xml b/distro/changelog.xml index bbffd2a..3abcc6b 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,7 @@ + + Updated to StorageHub [task #11879] + Updated to new PortalContext [ticket #428] diff --git a/pom.xml b/pom.xml index ebc6fcf..288073f 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ 4.0.0 org.gcube.portlets.user tabular-data-json-export-widget - 1.5.0-SNAPSHOT + 1.6.0-SNAPSHOT tabular-data-json-export-widget tabular-data-json-export-widget allows json export inside file and workspace @@ -126,19 +126,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 - - + diff --git a/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/DestinationSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/DestinationSelectionCard.java index 905e7a1..840eba3 100644 --- a/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/DestinationSelectionCard.java +++ b/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/DestinationSelectionCard.java @@ -28,8 +28,8 @@ import com.sencha.gxt.widget.core.client.form.Radio; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class DestinationSelectionCard extends WizardCard { diff --git a/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/DownloadFileCard.java b/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/DownloadFileCard.java index ce35045..35ac8df 100644 --- a/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/DownloadFileCard.java +++ b/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/DownloadFileCard.java @@ -13,8 +13,8 @@ import com.google.gwt.user.client.Command; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class DownloadFileCard extends WizardCard { diff --git a/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/JSONExportConfigCard.java b/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/JSONExportConfigCard.java index 2420c3e..448689b 100644 --- a/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/JSONExportConfigCard.java +++ b/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/JSONExportConfigCard.java @@ -36,8 +36,8 @@ import com.sencha.gxt.widget.core.client.tips.ToolTipConfig; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class JSONExportConfigCard extends WizardCard { diff --git a/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/JSONExportWidgetTD.java b/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/JSONExportWidgetTD.java index aa95033..3d233b9 100644 --- a/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/JSONExportWidgetTD.java +++ b/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/JSONExportWidgetTD.java @@ -11,8 +11,8 @@ import com.google.web.bindery.event.shared.EventBus; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class JSONExportWidgetTD extends WizardWindow { @@ -23,11 +23,7 @@ public class JSONExportWidgetTD extends WizardWindow { - /** - * - * @param title - * @param eventBus - */ + public JSONExportWidgetTD(String title, EventBus eventBus) { super(title,eventBus); setWidth(WIZARDWIDTH); diff --git a/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/JSONExportWidgetTDEntry.java b/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/JSONExportWidgetTDEntry.java index d0debc1..9c83e06 100644 --- a/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/JSONExportWidgetTDEntry.java +++ b/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/JSONExportWidgetTDEntry.java @@ -7,8 +7,8 @@ import com.google.web.bindery.event.shared.SimpleEventBus; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class JSONExportWidgetTDEntry implements EntryPoint { diff --git a/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/JSONExportWizardTDMessages.java b/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/JSONExportWizardTDMessages.java index a920a32..c3df8b4 100644 --- a/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/JSONExportWizardTDMessages.java +++ b/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/JSONExportWizardTDMessages.java @@ -5,8 +5,8 @@ import com.google.gwt.i18n.client.Messages; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface JSONExportWizardTDMessages extends Messages { diff --git a/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/JSONOperationInProgressCard.java b/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/JSONOperationInProgressCard.java index 48e8742..5bdaa39 100644 --- a/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/JSONOperationInProgressCard.java +++ b/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/JSONOperationInProgressCard.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 JSONOperationInProgressCard extends WizardCard implements diff --git a/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/JSONWorkSpaceSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/JSONWorkSpaceSelectionCard.java index a8026fc..580749a 100644 --- a/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/JSONWorkSpaceSelectionCard.java +++ b/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/JSONWorkSpaceSelectionCard.java @@ -29,8 +29,8 @@ import com.sencha.gxt.widget.core.client.form.validator.EmptyValidator; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class JSONWorkSpaceSelectionCard extends WizardCard { @@ -45,10 +45,7 @@ public class JSONWorkSpaceSelectionCard extends WizardCard { private WorkspaceExplorerSelectPanel workspaceExplorer; - /** - * - * @param exportSession - */ + public JSONWorkSpaceSelectionCard(final JSONExportSession exportSession) { super(msgs.jsonWorkspaceSelectionCardHead(), ""); this.exportSession = exportSession; diff --git a/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/grid/ColumnDataGridPanel.java b/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/grid/ColumnDataGridPanel.java index c79672f..f45354a 100644 --- a/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/grid/ColumnDataGridPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/grid/ColumnDataGridPanel.java @@ -42,8 +42,8 @@ import com.sencha.gxt.widget.core.client.grid.Grid; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ColumnDataGridPanel extends ContentPanel implements @@ -60,10 +60,7 @@ public class ColumnDataGridPanel extends ContentPanel implements private WizardCard parent; - /** - * - * @param parent - */ + public ColumnDataGridPanel(WizardCard parent) { this.parent = parent; Log.debug("ColumnDataGridPanel"); diff --git a/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/grid/ColumnDataProperties.java b/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/grid/ColumnDataProperties.java index bb2c2a0..90ad8ea 100644 --- a/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/grid/ColumnDataProperties.java +++ b/src/main/java/org/gcube/portlets/user/td/jsonexportwidget/client/grid/ColumnDataProperties.java @@ -9,8 +9,8 @@ import com.sencha.gxt.data.shared.PropertyAccess; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface ColumnDataProperties extends