From 7d94bf5e5b5b983b8bb1eb8543f1bee1c9cc9104 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Mon, 15 May 2017 16:05:28 +0000 Subject: [PATCH] ref 8580:TDM - TabMan - Support Java 8 compatibility https://support.d4science.org/issues/8580 Updated compatibility to Java 8 git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-mainbox-widget@148698 82a268e6-3cf1-43bd-a215-b396298e98cf --- distro/changelog.xml | 25 +++++++++++++------ pom.xml | 2 +- .../user/td/mainboxwidget/client/MainBox.java | 12 ++++----- .../td/mainboxwidget/client/MainBoxEntry.java | 4 +-- .../td/mainboxwidget/client/MainBoxPanel.java | 4 +-- .../client/MainBoxPanelState.java | 4 +-- .../client/grid/GridContextMenu.java | 4 +-- .../client/grid/GridContextMenuMessages.java | 4 +-- .../client/grid/GridHeaderColumnMenu.java | 4 +-- .../grid/GridHeaderColumnMenuMessages.java | 4 +-- .../client/resources/MainboxResources.java | 4 +-- .../client/rpc/TabularDataService.java | 4 +-- .../client/rpc/TabularDataServiceAsync.java | 4 +-- .../client/tdx/TDXGridPanel.java | 4 +-- .../td/mainboxwidget/client/tdx/TDXPanel.java | 4 +-- .../client/tdx/TDXTabPanelDialog.java | 4 +-- .../client/tdx/TDXTabPanelMessages.java | 17 +++---------- .../client/utils/InfoMessageBox.java | 4 +-- .../mainboxwidget/client/utils/UtilsGXT3.java | 4 +-- .../client/welcome/WelcomePanel.java | 4 +-- .../server/TabularDataServiceImpl.java | 4 +-- 21 files changed, 63 insertions(+), 61 deletions(-) diff --git a/distro/changelog.xml b/distro/changelog.xml index ab12bbf..694a2c6 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,24 +1,35 @@ - + + Support Java 8 compatibility [ticket #8580] + + Updated to PortalContext [issue #6548] - + Updated i18N support - + Added Resources support as ListView[issue #209] Fixed Layout - + Updated i18n support Added Downscale to menu - + Updated to GWT 2.6.1 Updated to GXT 3.1.1 - Added support Tabular Resource on Multi Scope [issue #3237] + Added support Tabular Resource on Multi Scope [issue #3237] + - + First Release \ No newline at end of file diff --git a/pom.xml b/pom.xml index a0b5c91..7fb75a6 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.gcube.portlets.user tabular-data-mainbox-widget - 1.5.0-SNAPSHOT + 1.6.0-SNAPSHOT tabular-data-mainbox-widget tabular-data-mainbox-widget implements a tab panel to shows resources and table diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBox.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBox.java index 093a8b8..b0f9f56 100644 --- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBox.java +++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBox.java @@ -34,8 +34,8 @@ import com.sencha.gxt.widget.core.client.event.BeforeCloseEvent.BeforeCloseHandl /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MainBox extends TabPanel { @@ -360,8 +360,8 @@ public class MainBox extends TabPanel { /** * Retrieve ColumnName of column selected * - * @param columnSelected - * @return + * @param columnSelected Column selected + * @return Column name */ public String getColumnName(int columnSelected) { String columnName = null; @@ -377,8 +377,8 @@ public class MainBox extends TabPanel { /** * Retrieve ColumnLocalId of column selected * - * @param columnSelected - * @return + * @param columnSelected Column selected + * @return Column local id */ public String getColumnLocalId(int columnSelected) { String columnName = null; diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBoxEntry.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBoxEntry.java index 237dc7d..c08ce22 100644 --- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBoxEntry.java +++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBoxEntry.java @@ -19,8 +19,8 @@ import com.sencha.gxt.widget.core.client.container.Viewport; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MainBoxEntry implements EntryPoint { diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBoxPanel.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBoxPanel.java index 4faa09b..6a4c67f 100644 --- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBoxPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBoxPanel.java @@ -15,8 +15,8 @@ import com.sencha.gxt.widget.core.client.ContentPanel; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MainBoxPanel extends ContentPanel { diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBoxPanelState.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBoxPanelState.java index 62b64c4..d3e6569 100644 --- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBoxPanelState.java +++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/MainBoxPanelState.java @@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.mainboxwidget.client; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum MainBoxPanelState { diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridContextMenu.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridContextMenu.java index 8970cfa..f6eabc2 100644 --- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridContextMenu.java +++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridContextMenu.java @@ -19,8 +19,8 @@ import com.sencha.gxt.widget.core.client.menu.MenuItem; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * * Defines the context menu of grid */ diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridContextMenuMessages.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridContextMenuMessages.java index 93bf7ac..e15663c 100644 --- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridContextMenuMessages.java +++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridContextMenuMessages.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 GridContextMenuMessages extends Messages { diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridHeaderColumnMenu.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridHeaderColumnMenu.java index 5721e47..e77ac67 100644 --- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridHeaderColumnMenu.java +++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridHeaderColumnMenu.java @@ -12,8 +12,8 @@ import com.sencha.gxt.widget.core.client.menu.MenuItem; /** * Defines the menu for column on the grid * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class GridHeaderColumnMenu { diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridHeaderColumnMenuMessages.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridHeaderColumnMenuMessages.java index 6c3824c..43a21bb 100644 --- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridHeaderColumnMenuMessages.java +++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/grid/GridHeaderColumnMenuMessages.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 GridHeaderColumnMenuMessages extends Messages { diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/resources/MainboxResources.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/resources/MainboxResources.java index d2092d4..7d3697d 100644 --- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/resources/MainboxResources.java +++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/resources/MainboxResources.java @@ -9,8 +9,8 @@ import com.google.gwt.resources.client.ImageResource; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface MainboxResources extends ClientBundle { diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/rpc/TabularDataService.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/rpc/TabularDataService.java index a36007a..c3bf127 100644 --- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/rpc/TabularDataService.java +++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/rpc/TabularDataService.java @@ -5,8 +5,8 @@ import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ @RemoteServiceRelativePath("tds") diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/rpc/TabularDataServiceAsync.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/rpc/TabularDataServiceAsync.java index 6727212..14cc698 100644 --- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/rpc/TabularDataServiceAsync.java +++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/rpc/TabularDataServiceAsync.java @@ -10,8 +10,8 @@ import com.google.gwt.user.client.rpc.AsyncCallback; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface TabularDataServiceAsync { diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/tdx/TDXGridPanel.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/tdx/TDXGridPanel.java index 7f29688..00241f2 100644 --- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/tdx/TDXGridPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/tdx/TDXGridPanel.java @@ -19,8 +19,8 @@ import com.sencha.gxt.widget.core.client.info.Info; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class TDXGridPanel extends FramedPanel { diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/tdx/TDXPanel.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/tdx/TDXPanel.java index 968ff6a..b4e3530 100644 --- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/tdx/TDXPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/tdx/TDXPanel.java @@ -8,8 +8,8 @@ import com.sencha.gxt.widget.core.client.FramedPanel; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class TDXPanel extends FramedPanel { diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/tdx/TDXTabPanelDialog.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/tdx/TDXTabPanelDialog.java index 9a4125b..f2da425 100644 --- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/tdx/TDXTabPanelDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/tdx/TDXTabPanelDialog.java @@ -11,8 +11,8 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; /** * Delete Column Dialog * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class TDXTabPanelDialog extends Window { diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/tdx/TDXTabPanelMessages.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/tdx/TDXTabPanelMessages.java index 25ad30e..b13edcf 100644 --- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/tdx/TDXTabPanelMessages.java +++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/tdx/TDXTabPanelMessages.java @@ -4,25 +4,16 @@ import com.google.gwt.i18n.client.Messages; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface TDXTabPanelMessages extends Messages { - /** - * - * @return - */ @DefaultMessage("Table") String tabGridLabel(); - - /** - * - * @return - */ + @DefaultMessage("Resources") String tabResourcesLabel(); - - + } diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/utils/InfoMessageBox.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/utils/InfoMessageBox.java index c1219ee..e0cf06b 100644 --- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/utils/InfoMessageBox.java +++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/utils/InfoMessageBox.java @@ -4,8 +4,8 @@ import com.sencha.gxt.widget.core.client.box.MessageBox; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class InfoMessageBox extends MessageBox { diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/utils/UtilsGXT3.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/utils/UtilsGXT3.java index 02e983b..b42934e 100644 --- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/utils/UtilsGXT3.java +++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/utils/UtilsGXT3.java @@ -10,8 +10,8 @@ import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class UtilsGXT3 { diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/welcome/WelcomePanel.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/welcome/WelcomePanel.java index a118ed5..64f5d4b 100644 --- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/welcome/WelcomePanel.java +++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/client/welcome/WelcomePanel.java @@ -10,8 +10,8 @@ import com.sencha.gxt.widget.core.client.container.MarginData; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class WelcomePanel extends FramedPanel { diff --git a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/server/TabularDataServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/server/TabularDataServiceImpl.java index 7779ab0..979400c 100644 --- a/src/main/java/org/gcube/portlets/user/td/mainboxwidget/server/TabularDataServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/td/mainboxwidget/server/TabularDataServiceImpl.java @@ -15,8 +15,8 @@ import com.google.gwt.user.server.rpc.RemoteServiceServlet; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ @SuppressWarnings("serial")