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-portlet@148745 82a268e6-3cf1-43bd-a215-b396298e98cf

.classpath

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/tabular-data-manager-2.15.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/tabular-data-manager-2.16.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/tabular-data-manager-2.15.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/tabular-data-manager-2.16.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -45,5 +45,5 @@
 	</classpathentry>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA.jar" sourcepath="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA-sources.jar"/>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA-sources.jar"/>
-	<classpathentry kind="output" path="target/tabular-data-manager-2.15.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/tabular-data-manager-2.16.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>

distro/changelog.xml

@@ -1,4 +1,8 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-16-0"
+		date="2017-06-12">
+		<Change>Support Java 8 compatibility [ticket #8580]</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-15-0"
 		date="2017-04-01">
 		<Change>Updated to DataMiner [ticket #6078]</Change>
@@ -41,7 +45,8 @@
 		<Change>Added Notifications [issue #197]</Change>
 		<Change>Added support to Storage Id [issue #180]</Change>
 		<Change>Added different colors for columns of different type [issue
-			#251]</Change>
+			#251]
+		</Change>
 		<Change>Added to long text [issue #108]</Change>
 		<Change>Updated Templates</Change>
 		<Change>Updated Commons Event</Change>

pom.xml

@@ -13,7 +13,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>tabular-data-manager</artifactId>
-	<version>2.15.0-SNAPSHOT</version>
+	<version>2.16.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 
 
@@ -43,6 +43,9 @@
 		<distroDirectory>distro</distroDirectory>
 		<configDirectory>config</configDirectory>
 
+		<!-- JAVA -->
+		<maven.compiler.source>1.7</maven.compiler.source>
+		
 		<!-- GWT configuration -->
 		<gwtVersion>2.6.1</gwtVersion>
 		<gwtLogVersion>3.3.2</gwtLogVersion>

src/main/java/org/gcube/portlets/user/td/client/PortalViewport.java

@@ -15,8 +15,8 @@ import com.sencha.gxt.widget.core.client.container.Viewport.ViewportAppearance;
 
 /**
  * 
- * @author "Giancarlo Panichi" 
+ * @author Giancarlo Panichi
- * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public class PortalViewport extends SimpleContainer {
@@ -24,13 +24,12 @@ public class PortalViewport extends SimpleContainer {
 	protected int rightScrollBarSize = 17;
 
 	protected boolean enableScroll;
-	
 
 	/**
 	 * Creates a viewport layout container with the default appearance.
 	 */
 	public PortalViewport() {
-		this(GWT.<ViewportAppearance> create(ViewportAppearance.class));
+		this(GWT.<ViewportAppearance>create(ViewportAppearance.class));
 	}
 
 	/**
@@ -45,15 +44,14 @@ public class PortalViewport extends SimpleContainer {
 
 			SafeHtmlBuilder sb = new SafeHtmlBuilder();
 			appearance.render(sb);
-			XElement element=XDOM.create(sb.toSafeHtml());
+			XElement element = XDOM.create(sb.toSafeHtml());
-			setElement((Element)element);
+			setElement((Element) element);
 			monitorWindowResize = true;
 			forceLayoutOnResize = true;
 			getFocusSupport().setIgnore(false);
 			resize();
 		} catch (Exception e) {
-			Log.error("PortalViewport: constructor error "
+			Log.error("PortalViewport: constructor error " + e.getLocalizedMessage());
-					+ e.getLocalizedMessage());
 		}
 	}
 
@@ -102,21 +100,19 @@ public class PortalViewport extends SimpleContainer {
 
 	protected void resize() {
 		int viewWidth;
-		if(enableScroll){
+		if (enableScroll) {
-			viewWidth= calculateWidth() - rightScrollBarSize;
+			viewWidth = calculateWidth() - rightScrollBarSize;
 		} else {
 			viewWidth = calculateWidth();
 		}
-		
+
 		int viewHeight = calculateHeight();
-		Log.info("TDM resize viewWidth: " + viewWidth + " viewHeight: "
+		Log.info("TDM resize viewWidth: " + viewWidth + " viewHeight: " + viewHeight + " clientWidth: "
-				+ viewHeight + " clientWidth: " + Window.getClientWidth()
+				+ Window.getClientWidth() + " clientHeight: " + Window.getClientHeight());
-				+ " clientHeight: " + Window.getClientHeight());
 		try {
 			setPixelSize(viewWidth, viewHeight);
 		} catch (Exception e) {
-			Log.error("PortalViewport: error in resize() at setPixelSize "
+			Log.error("PortalViewport: error in resize() at setPixelSize " + e.getLocalizedMessage());
-					+ e.getLocalizedMessage());
 		}
 	}
 
@@ -127,16 +123,12 @@ public class PortalViewport extends SimpleContainer {
 	protected void onWindowResize(int width, int height) {
 		int viewWidth = calculateWidth();
 		int viewHeight = calculateHeight();
-		Log.trace("TDM onWindowResize viewWidth: " + viewWidth
+		Log.trace("TDM onWindowResize viewWidth: " + viewWidth + " viewHeight: " + viewHeight + " clientWidth: "
-				+ " viewHeight: " + viewHeight + " clientWidth: "
+				+ Window.getClientWidth() + " clientHeight: " + Window.getClientHeight());
-				+ Window.getClientWidth() + " clientHeight: "
-				+ Window.getClientHeight());
 		setPixelSize(viewWidth, viewHeight);
 	}
 
-	/**
+	
-	 * Update window size
-	 */
 	/*
 	 * public void resize(){
 	 * 
@@ -156,23 +148,25 @@ public class PortalViewport extends SimpleContainer {
 	 * int rootWidth = Window.getClientWidth() - 2* leftBorder; //-
 	 * rightScrollBar;
 	 * 
-	 * System.out.println("New workspace dimension Height: "+rootHeight+" Width: "
+	 * System.out.println("New workspace dimension Height: "
-	 * +rootWidth);
+	 * +rootHeight+" Width: " +rootWidth);
 	 * 
 	 * this.setHeight(rootHeight); this.setWidth(rootWidth); }
 	 */
 
+	/**
+	 * 
+	 * @return Width
+	 */
 	protected int calculateWidth() {
 		int leftBorder = getAbsoluteLeft();
-		Log.info("TDM width: "
+		Log.info("TDM width: " + String.valueOf(Window.getClientWidth() - 2 * leftBorder));
-				+ String.valueOf(Window.getClientWidth() - 2 * leftBorder));
 		return Window.getClientWidth() - 2 * leftBorder;
 	}
 
 	protected int calculateHeight() {
 		int topBorder = getAbsoluteTop();
-		Log.info("TDM height: "
+		Log.info("TDM height: " + String.valueOf(Window.getClientHeight() - topBorder - 34));
-				+ String.valueOf(Window.getClientHeight() - topBorder - 34));
 		return Window.getClientHeight() - topBorder - 34;
 	}
 

src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java

@@ -105,8 +105,8 @@ import com.sencha.gxt.widget.core.client.event.DialogHideEvent.DialogHideHandler
 
 /**
  * 
- * @author "Giancarlo Panichi" <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  * 
  */
 public class TabularDataController {

src/main/java/org/gcube/portlets/user/td/client/TabularDataControllerMessages.java

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

src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java

@@ -20,8 +20,8 @@ import com.sencha.gxt.widget.core.client.container.Viewport;
 
 /**
  * 
- * @author "Giancarlo Panichi" <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  * 
  */
 public class TabularDataPortlet implements EntryPoint {

src/main/java/org/gcube/portlets/user/td/client/custom/Gxt2ZIndexXDOM.java

@@ -3,8 +3,8 @@ package org.gcube.portlets.user.td.client.custom;
 /**
  * Fix for z-index bug between GXT3 and GXT2
  * 
- * @author giancarlo email: <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  *
  */
 public class Gxt2ZIndexXDOM extends

src/main/java/org/gcube/portlets/user/td/client/logs/TDMLogs.java

@@ -30,6 +30,11 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent;
 import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
 import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
 
+/**
+ * 
+ * @author Giancarlo Panichi
+ *
+ */
 public class TDMLogs extends Window {
 	protected static final String TDMLogsServlet = "TDLogsServlet";
 	protected static final String WIDTH = "700px";

src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java

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

src/main/java/org/gcube/portlets/user/td/client/ribbon/AnalyseToolBar.java

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

src/main/java/org/gcube/portlets/user/td/client/ribbon/AnalyseToolBarMessages.java

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

src/main/java/org/gcube/portlets/user/td/client/ribbon/CurationToolBar.java

@@ -28,8 +28,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
 
 /**
  * 
- * @author "Giancarlo Panichi" <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  * 
  */
 public class CurationToolBar {

src/main/java/org/gcube/portlets/user/td/client/ribbon/CurationToolBarMessages.java

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

src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java

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

src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBarMessages.java

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

src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java

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

src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBarMessages.java

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

src/main/java/org/gcube/portlets/user/td/client/ribbon/RuleToolBar.java

@@ -27,8 +27,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
 
 /**
  * 
- * @author "Giancarlo Panichi" <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  * 
  */
 public class RuleToolBar {

src/main/java/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages.java

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

src/main/java/org/gcube/portlets/user/td/client/ribbon/TabularDataRibbon.java

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

src/main/java/org/gcube/portlets/user/td/client/ribbon/TabularDataRibbonMessages.java

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

src/main/java/org/gcube/portlets/user/td/client/ribbon/TemplateToolBar.java

@@ -27,8 +27,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
 
 /**
  * 
- * @author "Giancarlo Panichi" <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  * 
  */
 public class TemplateToolBar {

src/main/java/org/gcube/portlets/user/td/client/ribbon/TemplateToolBarMessages.java

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

src/main/java/org/gcube/portlets/user/td/client/rstudio/RStudio.java

@@ -20,8 +20,8 @@ import com.google.web.bindery.event.shared.EventBus;
  * RStudio Widget
  * 
  * 
- * @author "Giancarlo Panichi" <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  * 
  */
 public class RStudio {

src/main/java/org/gcube/portlets/user/td/client/template/TemplateApplyDialog.java

@@ -26,8 +26,8 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
 
 /**
  * 
- * @author "Giancarlo Panichi" <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  *
  */
 public class TemplateApplyDialog extends Window implements

src/main/java/org/gcube/portlets/user/td/client/template/TemplateApplyPanel.java

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

src/main/java/org/gcube/portlets/user/td/client/template/TemplateDataProperties.java

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

src/main/java/org/gcube/portlets/user/td/client/template/TemplateDeleteDialog.java

@@ -18,8 +18,8 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
 
 /**
  * 
- * @author "Giancarlo Panichi" <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  *
  */
 public class TemplateDeleteDialog extends Window {

src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenDialog.java

@@ -12,8 +12,8 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
 
 /**
  * 
- * @author "Giancarlo Panichi" <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  *
  */
 public class TemplateOpenDialog extends Window {

src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenPanel.java

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

src/main/java/org/gcube/portlets/user/td/client/template/TemplateShareDialog.java

@@ -16,8 +16,8 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
 
 /**
  * 
- * @author "Giancarlo Panichi" <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  *
  */
 public class TemplateShareDialog extends Window {

src/main/java/org/gcube/portlets/user/td/client/template/TemplateSharePanel.java

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

src/main/java/org/gcube/portlets/user/td/server/portlet/TabularDataPortlet.java

@@ -17,8 +17,8 @@ import org.slf4j.LoggerFactory;
 
 /**
  * 
- * @author Giancarlo Panichi email: <a
+ * @author Giancarlo Panichi Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  *
  */
 public class TabularDataPortlet extends GenericPortlet {

src/test/java/org/gcube/portlets/user/td/TestTabularDataPortlet.java

@@ -7,8 +7,8 @@ package org.gcube.portlets.user.td;
 
 /**
  * 
- * @author "Giancarlo Panichi" 
+ * @author Giancarlo Panichi 
- * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public class TestTabularDataPortlet {