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-widget-common-event@148726 82a268e6-3cf1-43bd-a215-b396298e98cf

distro/changelog.xml

@@ -1,12 +1,17 @@
 <ReleaseNotes>
+	<Changeset component="${groupId}.${artifactId}.1-11-0" date="2017-06-12">
+		<Change>Support Java 8 compatibility [ticket #8580]</Change>
+	</Changeset>
 	<Changeset component="${groupId}.${artifactId}.1-10-0" date="2017-04-01">
-		<Change>Added support for template export in SDMX [issue #8033]</Change>
+		<Change>Added support for template export in SDMX [issue #8033]
+		</Change>
 	</Changeset>
 	<Changeset component="${groupId}.${artifactId}.1-9-0" date="2015-10-15">
 		<Change>Updated support to Spanish</Change>
 	</Changeset>
 	<Changeset component="${groupId}.${artifactId}.1-8-0" date="2015-07-03">
-		<Change>Added extension to name of resource by mime type [issue #258]</Change>
+		<Change>Added extension to name of resource by mime type [issue #258]
+		</Change>
 		<Change>Added support to Notifications [issue #197]</Change>
 		<Change>Updated support to Resources [issue #209]</Change>
 		<Change>Updated support to Table Expression [issue #81]</Change>

pom.xml

@@ -14,7 +14,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>tabular-data-widget-common-event</artifactId>
-	<version>1.10.0-SNAPSHOT</version>
+	<version>1.11.0-SNAPSHOT</version>
 
 	<name>tabular-data-widget-common-event</name>
 	<description>tabular-data-widget-common-event contains events that are common to all widgets in tabular data manager</description>

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/CommonMessages.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 CommonMessages extends Messages {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/WidgetCommonEventEntry.java

@@ -5,8 +5,8 @@ import com.google.gwt.core.client.EntryPoint;
 
 /**
  * 
- * @author "Giancarlo Panichi" 
+ * @author Giancarlo Panichi 
- * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public class WidgetCommonEventEntry implements EntryPoint {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/BackgroundRequestEvent.java

@@ -10,8 +10,8 @@ import com.google.gwt.event.shared.HasHandlers;
 
 /**
  * 
- * @author "Giancarlo Panichi" 
+ * @author Giancarlo Panichi 
- * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public class BackgroundRequestEvent extends GwtEvent<BackgroundRequestEvent.BackgroundRequestEventHandler> {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/ChangeTableRequestEvent.java

@@ -12,8 +12,8 @@ import com.google.gwt.event.shared.HasHandlers;
 
 /**
  * 
- * @author "Giancarlo Panichi" 
+ * @author Giancarlo Panichi 
- * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public class ChangeTableRequestEvent extends GwtEvent<ChangeTableRequestEvent.ChangeTableRequestEventHandler> {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/DataViewActiveEvent.java

@@ -12,8 +12,8 @@ import com.google.gwt.event.shared.HasHandlers;
 
 /**
  * 
- * @author "Giancarlo Panichi" <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  * 
  */
 public class DataViewActiveEvent extends

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/DataViewRequestEvent.java

@@ -10,8 +10,8 @@ import com.google.gwt.event.shared.HasHandlers;
 
 /**
  * 
- * @author "Giancarlo Panichi" <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  * 
  */
 public class DataViewRequestEvent extends

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/ExpressionWrapperEvent.java

@@ -9,8 +9,8 @@ import com.google.gwt.event.shared.HasHandlers;
 
 /**
  * 
- * @author "Giancarlo Panichi" 
+ * @author Giancarlo Panichi 
- * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public class ExpressionWrapperEvent extends GwtEvent<ExpressionWrapperEvent.ExpressionWrapperEventHandler> {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/GridContextMenuItemEvent.java

@@ -14,8 +14,8 @@ import com.google.gwt.event.shared.HasHandlers;
 
 /**
  * 
- * @author "Giancarlo Panichi" 
+ * @author Giancarlo Panichi 
- * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  * Used to manage the events of menu grid
  */

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/GridHeaderColumnMenuItemEvent.java

@@ -10,8 +10,8 @@ import com.google.gwt.event.shared.HasHandlers;
 
 /**
  * 
- * @author "Giancarlo Panichi" 
+ * @author Giancarlo Panichi 
- * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  * Used to manage the events of menu grid
  */

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/RibbonEvent.java

@@ -9,8 +9,8 @@ import com.google.gwt.event.shared.HasHandlers;
 
 /**
  * 
- * @author "Giancarlo Panichi" 
+ * @author Giancarlo Panichi 
- * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public class RibbonEvent extends GwtEvent<RibbonEvent.RibbonEventHandler> {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/SessionExpiredEvent.java

@@ -9,8 +9,8 @@ import com.google.gwt.event.shared.HasHandlers;
 
 /**
  * 
- * @author "Giancarlo Panichi" 
+ * @author Giancarlo Panichi 
- * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public class SessionExpiredEvent extends GwtEvent<SessionExpiredEvent.SessionExpiredEventHandler> {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/UIStateEvent.java

@@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers;
 
 /**
  * 
- * @author "Giancarlo Panichi" <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  *
  */
 public class UIStateEvent extends GwtEvent<UIStateEvent.UIStateHandler> {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/WidgetRequestEvent.java

@@ -11,8 +11,8 @@ import com.google.gwt.event.shared.HasHandlers;
 
 /**
  * 
- * @author "Giancarlo Panichi" <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  * 
  */
 public class WidgetRequestEvent extends

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/C_ExpressionContainer.java

@@ -6,8 +6,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi
 
 /**
  * 
- * @author giancarlo email: <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  *
  */
 public class C_ExpressionContainer implements Serializable {
@@ -32,7 +32,9 @@ public class C_ExpressionContainer implements Serializable {
 	/**
 	 * 
 	 * @param id
+	 *            Id
 	 * @param exp
+	 *            Expression
 	 */
 	public C_ExpressionContainer(Contains id, C_Expression exp) {
 		super();
@@ -41,8 +43,7 @@ public class C_ExpressionContainer implements Serializable {
 		this.exp = exp;
 	}
 
-	public C_ExpressionContainer(Contains id, boolean conditionAllRows,
+	public C_ExpressionContainer(Contains id, boolean conditionAllRows, C_Expression exp) {
-			C_Expression exp) {
 		super();
 		this.id = id;
 		this.conditionAllRows = conditionAllRows;
@@ -75,8 +76,7 @@ public class C_ExpressionContainer implements Serializable {
 
 	@Override
 	public String toString() {
-		return "C_ExpressionContainer [id=" + id + ", conditionAllRows="
+		return "C_ExpressionContainer [id=" + id + ", conditionAllRows=" + conditionAllRows + ", exp=" + exp + "]";
-				+ conditionAllRows + ", exp=" + exp + "]";
 	}
 
 }

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/ExpressionWrapper.java

@@ -7,8 +7,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
 
 /**
  * 
- * @author "Giancarlo Panichi" <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  *
  */
 public class ExpressionWrapper implements Serializable {
@@ -27,20 +27,19 @@ public class ExpressionWrapper implements Serializable {
 	 */
 	public ExpressionWrapper() {
 		super();
-		this.expressionType=ExpressionWrapperType.EXPRESSION_NULL;
+		this.expressionType = ExpressionWrapperType.EXPRESSION_NULL;
 	}
 
-	
 	/**
 	 * 
 	 * @param trId
-	 * @param columnId
+	 *            TR Id
-	 * @param columnName
+	 * @param columnData
+	 *            Column data
 	 * @param conditionExpressionContainer
+	 *            Condition expression container
 	 */
-	public ExpressionWrapper(TRId trId,
+	public ExpressionWrapper(TRId trId, ColumnData columnData, C_ExpressionContainer conditionExpressionContainer) {
-			ColumnData columnData,
-			C_ExpressionContainer conditionExpressionContainer) {
 		super();
 
 		this.expressionType = ExpressionWrapperType.CONDITION_COLUMN_EXPRESSION;
@@ -52,15 +51,7 @@ public class ExpressionWrapper implements Serializable {
 		this.replaceExpressionContainer = null;
 	}
 
-	/**
+	public ExpressionWrapper(String replaceValue, TRId trId, ColumnData columnData) {
-	 * 
-	 * @param replaceValue
-	 * @param trId
-	 * @param columnId
-	 * @param columnName
-	 */
-	public ExpressionWrapper(String replaceValue,TRId trId,
-			ColumnData columnData) {
 		super();
 		this.expressionType = ExpressionWrapperType.REPLACE_COLUMN_EXPRESSION;
 		this.trId = trId;
@@ -71,15 +62,7 @@ public class ExpressionWrapper implements Serializable {
 		this.replaceExpressionContainer = null;
 	}
 
-	/**
+	public ExpressionWrapper(C_ExpressionContainer replaceExpressionContainer, TRId trId, ColumnData columnData) {
-	 * 
-	 * @param replaceExpressionContainer
-	 * @param trId
-	 * @param columnId
-	 * @param columnName
-	 */
-	public ExpressionWrapper(C_ExpressionContainer replaceExpressionContainer,TRId trId,
-			ColumnData columnData) {
 		super();
 		this.expressionType = ExpressionWrapperType.REPLACE_COLUMN_EXPRESSION;
 		this.trId = trId;
@@ -90,42 +73,19 @@ public class ExpressionWrapper implements Serializable {
 		this.replaceExpressionContainer = replaceExpressionContainer;
 	}
 
-	
+	public ExpressionWrapper(TRId trId, ColumnData columnData, C_ExpressionContainer conditionExpressionContainer,
-	
-	/**
-	 * 
-	 * @param trId
-	 * @param columnId
-	 * @param columnName
-	 * @param conditionExpressionContainer
-	 * @param replaceExpressionContainer
-	 */
-	public ExpressionWrapper(TRId trId,
-			ColumnData columnData,
-			C_ExpressionContainer conditionExpressionContainer,
 			C_ExpressionContainer replaceExpressionContainer) {
 		super();
 		this.expressionType = ExpressionWrapperType.CONDITION_AND_REPLACE_COLUMN_EXPRESSION;
 		this.trId = trId;
-		this.columnData=columnData;
+		this.columnData = columnData;
 		this.conditionExpressionContainer = conditionExpressionContainer;
 		this.replaceByValue = false;
 		this.replaceValue = null;
 		this.replaceExpressionContainer = replaceExpressionContainer;
 	}
 
-	
+	public ExpressionWrapper(TRId trId, ColumnData columnData, C_ExpressionContainer conditionExpressionContainer,
-	/**
-	 * 
-	 * @param trId
-	 * @param columnId
-	 * @param columnName
-	 * @param conditionExpressionContainer
-	 * @param replaceValue
-	 */
-	public ExpressionWrapper(TRId trId,
-			ColumnData columnData,
-			C_ExpressionContainer conditionExpressionContainer,
 			String replaceValue) {
 		super();
 		this.expressionType = ExpressionWrapperType.CONDITION_AND_REPLACE_COLUMN_EXPRESSION;
@@ -137,23 +97,18 @@ public class ExpressionWrapper implements Serializable {
 		this.replaceExpressionContainer = null;
 	}
 
-	
-
 	public ExpressionWrapperType getExpressionType() {
 		return expressionType;
 	}
 
-
 	public void setExpressionType(ExpressionWrapperType expressionType) {
 		this.expressionType = expressionType;
 	}
 
-
 	public TRId getTrId() {
 		return trId;
 	}
 
-
 	public void setTrId(TRId trId) {
 		this.trId = trId;
 	}
@@ -162,72 +117,48 @@ public class ExpressionWrapper implements Serializable {
 		return columnData;
 	}
 
-
 	public void setColumnData(ColumnData columnData) {
 		this.columnData = columnData;
 	}
 
-
 	public C_ExpressionContainer getConditionExpressionContainer() {
 		return conditionExpressionContainer;
 	}
 
-
+	public void setConditionExpressionContainer(C_ExpressionContainer conditionExpressionContainer) {
-	public void setConditionExpressionContainer(
-			C_ExpressionContainer conditionExpressionContainer) {
 		this.conditionExpressionContainer = conditionExpressionContainer;
 	}
 
-
 	public boolean isReplaceByValue() {
 		return replaceByValue;
 	}
 
-
 	public void setReplaceByValue(boolean replaceByValue) {
 		this.replaceByValue = replaceByValue;
 	}
 
-
 	public String getReplaceValue() {
 		return replaceValue;
 	}
 
-
 	public void setReplaceValue(String replaceValue) {
 		this.replaceValue = replaceValue;
 	}
 
-
 	public C_ExpressionContainer getReplaceExpressionContainer() {
 		return replaceExpressionContainer;
 	}
 
-
+	public void setReplaceExpressionContainer(C_ExpressionContainer replaceExpressionContainer) {
-	public void setReplaceExpressionContainer(
-			C_ExpressionContainer replaceExpressionContainer) {
 		this.replaceExpressionContainer = replaceExpressionContainer;
 	}
 
-
 	@Override
 	public String toString() {
-		return "ExpressionWrapper [expressionType=" + expressionType
+		return "ExpressionWrapper [expressionType=" + expressionType + ", trId=" + trId + ", columnData=" + columnData
-				+ ", trId=" + trId + ", columnData=" + columnData
+				+ ", conditionExpressionContainer=" + conditionExpressionContainer + ", replaceByValue="
-				+ ", conditionExpressionContainer="
+				+ replaceByValue + ", replaceValue=" + replaceValue + ", replaceExpressionContainer="
-				+ conditionExpressionContainer + ", replaceByValue="
+				+ replaceExpressionContainer + "]";
-				+ replaceByValue + ", replaceValue=" + replaceValue
-				+ ", replaceExpressionContainer=" + replaceExpressionContainer
-				+ "]";
 	}
 
-
-	
-	
-	
-	
-	
-
-	
-
 }

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/ExpressionWrapperType.java

@@ -5,8 +5,8 @@ package org.gcube.portlets.user.td.widgetcommonevent.client.expression;
 
 /**
  * 
- * @author "Giancarlo Panichi" 
+ * @author Giancarlo Panichi 
- * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public enum ExpressionWrapperType {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/BackgroundRequestType.java

@@ -5,8 +5,8 @@ package org.gcube.portlets.user.td.widgetcommonevent.client.type;
 
 /**
  * 
- * @author "Giancarlo Panichi" 
+ * @author Giancarlo Panichi 
- * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public enum BackgroundRequestType {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/ChangeTableRequestType.java

@@ -5,8 +5,8 @@ package org.gcube.portlets.user.td.widgetcommonevent.client.type;
 
 /**
  * 
- * @author "Giancarlo Panichi" 
+ * @author Giancarlo Panichi 
- * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public enum ChangeTableRequestType {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/ChangeTableWhy.java

@@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.widgetcommonevent.client.type;
 
 /**
  * 
- * @author giancarlo
+ * @author Giancarlo Panichi
- * email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public enum ChangeTableWhy {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/DataViewActiveType.java

@@ -5,8 +5,8 @@ package org.gcube.portlets.user.td.widgetcommonevent.client.type;
 
 /**
  * 
- * @author "Giancarlo Panichi" 
+ * @author Giancarlo Panichi 
- * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public enum DataViewActiveType {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/DataViewRequestType.java

@@ -5,8 +5,8 @@ package org.gcube.portlets.user.td.widgetcommonevent.client.type;
 
 /**
  * 
- * @author "Giancarlo Panichi" 
+ * @author Giancarlo Panichi 
- * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public enum DataViewRequestType {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/GridHeaderColumnMenuItemType.java

@@ -5,8 +5,8 @@ package org.gcube.portlets.user.td.widgetcommonevent.client.type;
 
 /**
  * 
- * @author "Giancarlo Panichi" 
+ * @author Giancarlo Panichi 
- * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  * Types of events generated by the grid menu
  */

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/RibbonType.java

@@ -5,8 +5,8 @@ package org.gcube.portlets.user.td.widgetcommonevent.client.type;
 
 /**
  * 
- * @author "Giancarlo Panichi" 
+ * @author Giancarlo Panichi 
- * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public enum RibbonType {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/SessionExpiredType.java

@@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.widgetcommonevent.client.type;
 
 /**
  * 
- * @author "Giancarlo Panichi" 
+ * @author Giancarlo Panichi 
- * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public enum SessionExpiredType {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/UIStateType.java

@@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.widgetcommonevent.client.type;
 
 /**
  * 
- * @author "Giancarlo Panichi" 
+ * @author Giancarlo Panichi 
- * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public enum UIStateType {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/WidgetRequestType.java

@@ -5,8 +5,8 @@ package org.gcube.portlets.user.td.widgetcommonevent.client.type;
 
 /**
  * 
- * @author "Giancarlo Panichi" 
+ * @author Giancarlo Panichi 
- * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public enum WidgetRequestType {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/CellData.java

@@ -5,8 +5,8 @@ import java.io.Serializable;
 /**
  * Cell basic information
  * 
- * @author "Giancarlo Panichi" <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  * 
  */
 public class CellData implements Serializable {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/Constants.java

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

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/GridHeaderOperationId.java

@@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.widgetcommonevent.shared;
 
 /**
  * 
- * @author "Giancarlo Panichi" <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  * 
  *         Operations that can be launched from the grid menu
  */

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/GridOperationId.java

@@ -1,14 +1,13 @@
 package org.gcube.portlets.user.td.widgetcommonevent.shared;
 
-public enum GridOperationId {
+/**
-	ROWADD("1"),
+ * 
-	ROWEDIT("2"),
+ * @author Giancarlo Panichi
-	ROWDELETE("3"),
+ *
-	REPLACE("4");
-	
-	/**
-	 * @param text
  */
+public enum GridOperationId {
+	ROWADD("1"), ROWEDIT("2"), ROWDELETE("3"), REPLACE("4");
+
 	private GridOperationId(final String id) {
 		this.id = id;
 	}
@@ -20,4 +19,3 @@ public enum GridOperationId {
 		return id;
 	}
 }
-

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/OperationResult.java

@@ -5,8 +5,8 @@ import java.util.ArrayList;
 
 /**
  * 
- * @author giancarlo
+ * @author Giancarlo Panichi
- * email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public class OperationResult implements Serializable {
@@ -16,15 +16,10 @@ public class OperationResult implements Serializable {
 	private TRId trId;
 	private ArrayList<TRId> collateralTRIds;
 
-	public OperationResult(){
+	public OperationResult() {
 
 	}
 
-	/**
-	 * 
-	 * @param trId
-	 * @param collateralTRIds
-	 */
 	public OperationResult(TRId trId, ArrayList<TRId> collateralTRIds) {
 		super();
 		this.trId = trId;
@@ -49,11 +44,7 @@ public class OperationResult implements Serializable {
 
 	@Override
 	public String toString() {
-		return "OperationResult [trId=" + trId + ", collateralTRIds="
+		return "OperationResult [trId=" + trId + ", collateralTRIds=" + collateralTRIds + "]";
-				+ collateralTRIds + "]";
 	}
 
-		
-	
-	
 }

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/RequestProperties.java

@@ -5,7 +5,7 @@ import java.util.HashMap;
 
 /**
  * 
- * @author "Giancarlo Panichi"
+ * @author Giancarlo Panichi
  *
  */
 public class RequestProperties implements Serializable {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/RequestPropertiesParameterType.java

@@ -2,22 +2,14 @@ package org.gcube.portlets.user.td.widgetcommonevent.shared;
 
 /**
  * 
- * @author giancarlo
+ * @author Giancarlo Panichi
- * email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public enum RequestPropertiesParameterType {
-	Coordinates("Coordinates"),
+	Coordinates("Coordinates"), InvocationS("InvocationS"), RefColumn("RefColumn"), ColumnId("ColumnId"), TaskId(
-	InvocationS ("InvocationS"),
+			"TaskId"), ConditionCode("ConditionCode"), ValidationColumnColumnId("ValidationColumnColumnId");
-	RefColumn("RefColumn"),
-	ColumnId("ColumnId"),
-	TaskId("TaskId"),
-	ConditionCode("ConditionCode"),
-	ValidationColumnColumnId("ValidationColumnColumnId");
 
-	/**
-	 * @param text
-	 */
 	private RequestPropertiesParameterType(final String id) {
 		this.id = id;
 	}

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/TRId.java

@@ -7,8 +7,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.TabResourceType;
 /**
  * Tabular Resoure Identification
  * 
- * @author "Giancarlo Panichi" <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  * 
  */
 public class TRId implements Serializable {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/charts/ChartType.java

@@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.widgetcommonevent.shared.charts;
 
 /**
  * 
- * @author giancarlo
+ * @author Giancarlo Panichi
- * email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public enum ChartType {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/dataview/DataView.java

@@ -4,8 +4,8 @@ import java.io.Serializable;
 
 /**
  * 
- * @author giancarlo
+ * @author Giancarlo Panichi
- * email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public class DataView implements Serializable {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/dataview/DataViewType.java

@@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.widgetcommonevent.shared.dataview;
 
 /**
  * 
- * @author giancarlo
+ * @author Giancarlo Panichi
- * email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public enum DataViewType {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/dataview/TabularResourceDataView.java

@@ -4,8 +4,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
 
 /**
  * 
- * @author giancarlo email: <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  *
  */
 public class TabularResourceDataView extends DataView {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/expression/C_Expression.java

@@ -4,8 +4,8 @@ import java.io.Serializable;
 
 /**
  * 
- * @author giancarlo
+ * @author Giancarlo Panichi
- * email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public class C_Expression implements Serializable {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/geospatial/GeospatialCoordinatesType.java

@@ -5,8 +5,8 @@ import java.util.List;
 
 /**
  * 
- * @author "Giancarlo Panichi" <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  *
  */
 public enum GeospatialCoordinatesType {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/grid/model/RowRaw.java

@@ -7,8 +7,8 @@ import java.util.Map;
  * 
  * 
  * 
- * @author "Giancarlo Panichi" <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  * 
  */
 public class RowRaw implements Serializable {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/mime/MimeTypeSupport.java

@@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.widgetcommonevent.shared.mime;
 
 /**
  * 
- * @author giancarlo
+ * @author Giancarlo Panichi
- * email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public enum MimeTypeSupport {
@@ -719,11 +719,7 @@ public enum MimeTypeSupport {
 	private final String extension;
 	private final String mimeName;
 	
-	/**
+	
-	 * 
-	 * @param extension
-	 * @param mimeName
-	 */
 	private MimeTypeSupport(final String extension, final String mimeName) {
 		this.extension=extension;
 		this.mimeName=mimeName;
@@ -735,18 +731,10 @@ public enum MimeTypeSupport {
 		
 	}
 	
-	/**
-	 * 
-	 * @return
-	 */
 	public String getExtension(){
 		return extension;
 	}
 	
-	/**
-	 * 
-	 * @return
-	 */
 	public String getMimeName(){
 		return mimeName;
 	}

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/operations/OperationsId.java

@@ -5,7 +5,7 @@ package org.gcube.portlets.user.td.widgetcommonevent.shared.operations;
  * 
  * Tabular Data Service Operations Id
  * 
- * <table>
+ * <table summary="Operations Id">
  * <tr><td>CSVImport</td><td>100</td></tr> 
  * <tr><td>CSVExport</td><td>101</td></tr>
  * <tr><td>SDMXCodelistImport</td><td>200</td></tr>	
@@ -41,7 +41,7 @@ package org.gcube.portlets.user.td.widgetcommonevent.shared.operations;
  * <tr><td>RemoveDuplicateTuples</td><td>3007</td></tr>
  * <tr><td>Normalize</td><td>3008</td></tr>
  * <tr><td>TimeAggregation</td><td>3009</td></tr>
- * <tr><td>DownscaleCSquare/td><td>3010</td></tr>
+ * <tr><td>DownscaleCSquare</td><td>3010</td></tr>
  * <tr><td>ReplaceColumnByExpression</td><td>3101</td></tr>
  * <tr><td>ReplaceById</td><td>3102</td></tr> 
  * <tr><td>FilterByExpression</td><td>3201</td></tr>

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/thumbnail/ThumbnailTD.java

@@ -5,7 +5,7 @@ import java.io.Serializable;
 /**
  * Thumbnail for Tabular Data Manager
  * 
- * @author "Giancarlo Panichi"
+ * @author Giancarlo Panichi
  * 
  */
 public class ThumbnailTD implements Serializable {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/TabResourceType.java

@@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.widgetcommonevent.shared.tr;
 
 /**
  * 
- * @author giancarlo
+ * @author Giancarlo Panichi
- * email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public enum TabResourceType {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnData.java

@@ -7,8 +7,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
 
 /**
  * 
- * @author "Giancarlo Panichi" <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  * 
  */
 public class ColumnData implements Serializable {
@@ -42,35 +42,13 @@ public class ColumnData implements Serializable {
 	// if this is a validation column then contains the columns validated
 	private ArrayList<String> validatedColumns;
 
-	
+	public ColumnData() {
-	public ColumnData(){
 
 	}
 
-	/**
+	public ColumnData(String id, String columnId, String name, String typeName, String typeCode, String dataTypeName,
-	 * 
+			String label, String locale, TRId trId, boolean viewColumn, ColumnViewData columnViewData,
-	 * @param id
+			PeriodDataType periodDataType, RelationshipData relationship, ArrayList<String> validationColumnReferences,
-	 * @param columnId
-	 * @param name
-	 * @param typeName
-	 * @param typeCode
-	 * @param dataTypeName
-	 * @param label
-	 * @param locale
-	 * @param trId
-	 * @param viewColumn
-	 * @param columnViewData
-	 * @param periodDataType
-	 * @param relationship
-	 * @param validationColumnReferences
-	 * @param validationColumn
-	 * @param validatedColumns
-	 */
-	public ColumnData(String id, String columnId, String name, String typeName,
-			String typeCode, String dataTypeName, String label, String locale,
-			TRId trId, boolean viewColumn, ColumnViewData columnViewData,
-			PeriodDataType periodDataType, RelationshipData relationship,
-			ArrayList<String> validationColumnReferences,
 			boolean validationColumn, ArrayList<String> validatedColumns) {
 		super();
 		this.id = id;
@@ -91,7 +69,6 @@ public class ColumnData implements Serializable {
 		this.validatedColumns = validatedColumns;
 	}
 
-
 	public String getColumnId() {
 		return columnId;
 	}
@@ -192,8 +169,7 @@ public class ColumnData implements Serializable {
 		return validationColumnReferences;
 	}
 
-	public void setValidationColumnReferences(
+	public void setValidationColumnReferences(ArrayList<String> validationColumnReferences) {
-			ArrayList<String> validationColumnReferences) {
 		this.validationColumnReferences = validationColumnReferences;
 	}
 
@@ -221,20 +197,14 @@ public class ColumnData implements Serializable {
 		this.periodDataType = periodDataType;
 	}
 
-
 	@Override
 	public String toString() {
-		return "ColumnData [id=" + id + ", columnId=" + columnId + ", name="
+		return "ColumnData [id=" + id + ", columnId=" + columnId + ", name=" + name + ", typeName=" + typeName
-				+ name + ", typeName=" + typeName + ", typeCode=" + typeCode
+				+ ", typeCode=" + typeCode + ", dataTypeName=" + dataTypeName + ", label=" + label + ", locale="
-				+ ", dataTypeName=" + dataTypeName + ", label=" + label
+				+ locale + ", trId=" + trId + ", viewColumn=" + viewColumn + ", columnViewData=" + columnViewData
-				+ ", locale=" + locale + ", trId=" + trId + ", viewColumn="
+				+ ", periodDataType=" + periodDataType + ", relationship=" + relationship
-				+ viewColumn + ", columnViewData=" + columnViewData
+				+ ", validationColumnReferences=" + validationColumnReferences + ", validationColumn="
-				+ ", periodDataType=" + periodDataType + ", relationship="
+				+ validationColumn + ", validatedColumns=" + validatedColumns + "]";
-				+ relationship + ", validationColumnReferences="
-				+ validationColumnReferences + ", validationColumn="
-				+ validationColumn + ", validatedColumns=" + validatedColumns
-				+ "]";
 	}
 
-	
 }

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnDataType.java

@@ -5,17 +5,13 @@ import java.util.List;
 
 /**
  * 
- * @author "Giancarlo Panichi" <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  *
  */
 public enum ColumnDataType {
-	Boolean("Boolean"), Geometry("Geometry"), Integer("Integer"), Numeric(
+	Boolean("Boolean"), Geometry("Geometry"), Integer("Integer"), Numeric("Numeric"), Date("Date"), Text("Text");
-			"Numeric"), Date("Date"), Text("Text");
 
-	/**
-	 * @param text
-	 */
 	private ColumnDataType(final String id) {
 		this.id = id;
 	}
@@ -31,18 +27,13 @@ public enum ColumnDataType {
 		return id;
 	}
 
-	public String getId(){
+	public String getId() {
 		return id;
 	}
 
-	
-	/**
-	 * 
-	 * @param id
-	 * @return
-	 */
 	public static ColumnDataType getColumnDataTypeFromId(String id) {
-		if(id==null||id.isEmpty()) return null;
+		if (id == null || id.isEmpty())
+			return null;
 
 		for (ColumnDataType columnDataType : values()) {
 			if (columnDataType.id.compareToIgnoreCase(id) == 0) {
@@ -53,9 +44,8 @@ public enum ColumnDataType {
 	}
 
 	public static List<ColumnDataType> asList() {
-		List<ColumnDataType> list=Arrays.asList(values());
+		List<ColumnDataType> list = Arrays.asList(values());
 		return list;
 	}
 
-
 }

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnMockUp.java

@@ -6,7 +6,7 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi
 
 /**
  * 
- * @author "Giancarlo Panichi"
+ * @author Giancarlo Panichi
  * 
  */
 public class ColumnMockUp implements Serializable {
@@ -14,7 +14,7 @@ public class ColumnMockUp implements Serializable {
 	private static final long serialVersionUID = 7467523779864189492L;
 
 	private String id;// For grid and combo only;
-	private String columnId;//ColumnId for template only;
+	private String columnId;// ColumnId for template only;
 	private ColumnTypeCode columnType;
 	private ColumnDataType columnDataType;
 	private String defaultValue;
@@ -33,14 +33,16 @@ public class ColumnMockUp implements Serializable {
 	/**
 	 * Generic simple column with only ColumnDataType set
 	 * 
-	 * 
 	 * @param id
+	 *            Id
 	 * @param columnId
+	 *            Column id
 	 * @param columnDataType
+	 *            Column data type
 	 * @param label
+	 *            Label
 	 */
-	public ColumnMockUp(String id, String columnId,
+	public ColumnMockUp(String id, String columnId, ColumnDataType columnDataType, String label) {
-			ColumnDataType columnDataType, String label) {
 		super();
 		this.id = id;
 		this.columnId = columnId;
@@ -55,19 +57,23 @@ public class ColumnMockUp implements Serializable {
 		this.codelistColumnReference = null;
 	}
 
-	
 	/**
 	 * ColumnMockUp
 	 * 
 	 * 
 	 * @param id
+	 *            Id
 	 * @param columnId
+	 *            Column id
 	 * @param columnType
+	 *            Column type
 	 * @param columnDataType
+	 *            Column data type
 	 * @param label
+	 *            Label
 	 */
-	public ColumnMockUp(String id, String columnId, ColumnTypeCode columnType,
+	public ColumnMockUp(String id, String columnId, ColumnTypeCode columnType, ColumnDataType columnDataType,
-			ColumnDataType columnDataType, String label) {
+			String label) {
 		super();
 		this.id = id;
 		this.columnId = columnId;
@@ -82,21 +88,24 @@ public class ColumnMockUp implements Serializable {
 		this.codelistColumnReference = null;
 	}
 
-
-
 	/**
 	 * For Code, CodeDescription and Annotation Column
-	 * @param id TODO
+	 * 
-	 * @param columnId TODO
+	 * 
+	 * @param id
+	 *            Id
+	 * @param columnId
+	 *            Column id
 	 * @param label
+	 *            Label
 	 * @param columnType
+	 *            Column data type
 	 * @param defaultValue
-	 * @param localeName
+	 *            Default value
 	 */
-	public ColumnMockUp(String id,String columnId,
+	public ColumnMockUp(String id, String columnId, String label, ColumnTypeCode columnType, String defaultValue) {
-			String label, ColumnTypeCode columnType, String defaultValue) {
 		this.id = id;
-		this.columnId=columnId;
+		this.columnId = columnId;
 		this.label = label;
 		this.columnType = columnType;
 		this.columnDataType = ColumnDataType.Text;
@@ -107,16 +116,21 @@ public class ColumnMockUp implements Serializable {
 
 	/**
 	 * For Code, CodeDescription and Annotation Column
-	 * @param id TODO
+	 * 
-	 * @param columnId TODO
+	 * @param id
+	 *            Id
+	 * @param columnId
+	 *            Column Id
 	 * @param label
+	 *            Label
 	 * @param columnType
-	 * @param expressionWrapper
+	 *            Column Type
+	 * @param expression
+	 *            Expression
 	 */
-	public ColumnMockUp(String id, String columnId,
+	public ColumnMockUp(String id, String columnId, String label, ColumnTypeCode columnType, C_Expression expression) {
-			String label, ColumnTypeCode columnType, C_Expression expression) {
 		this.id = null;
-		this.columnId=null;
+		this.columnId = null;
 		this.label = label;
 		this.columnType = columnType;
 		this.columnDataType = ColumnDataType.Text;
@@ -127,17 +141,24 @@ public class ColumnMockUp implements Serializable {
 
 	/**
 	 * For Attribute and Measure Column
-	 * @param id TODO
+	 * 
-	 * @param columnId TODO
+	 * @param id
+	 *            Id
+	 * @param columnId
+	 *            Column id
 	 * @param label
+	 *            Label
 	 * @param columnType
+	 *            Column type
+	 * @param columnDataType
+	 *            Column data type
 	 * @param defaultValue
-	 * @param localeName
+	 *            Default value
 	 */
-	public ColumnMockUp(String id, String columnId,
+	public ColumnMockUp(String id, String columnId, String label, ColumnTypeCode columnType,
-			String label, ColumnTypeCode columnType, ColumnDataType columnDataType, String defaultValue) {
+			ColumnDataType columnDataType, String defaultValue) {
 		this.id = id;
-		this.columnId=columnId;
+		this.columnId = columnId;
 		this.label = label;
 		this.columnType = columnType;
 		this.columnDataType = columnDataType;
@@ -148,17 +169,25 @@ public class ColumnMockUp implements Serializable {
 
 	/**
 	 * For Attribute and Measure Column
-	 * @param id TODO
+	 * 
-	 * @param columnId TODO
+	 * 
+	 * @param id
+	 *            Id
+	 * @param columnId
+	 *            Column id
 	 * @param label
+	 *            Label
 	 * @param columnType
+	 *            Column type
 	 * @param columnDataType
-	 * @param expressionContainer
+	 *            Column data type
+	 * @param expression
+	 *            Expression
 	 */
-	public ColumnMockUp(String id, String columnId,
+	public ColumnMockUp(String id, String columnId, String label, ColumnTypeCode columnType,
-			String label, ColumnTypeCode columnType, ColumnDataType columnDataType, C_Expression expression) {
+			ColumnDataType columnDataType, C_Expression expression) {
 		this.id = id;
-		this.columnId=columnId;
+		this.columnId = columnId;
 		this.label = label;
 		this.columnType = columnType;
 		this.columnDataType = columnDataType;
@@ -169,17 +198,24 @@ public class ColumnMockUp implements Serializable {
 
 	/**
 	 * For CodeName Column
-	 * @param id TODO
+	 *
-	 * @param columnId TODO
+	 * @param id
+	 *            Id
+	 * @param columnId
+	 *            Column id
 	 * @param label
+	 *            Label
 	 * @param columnType
+	 *            Column type
 	 * @param localeName
+	 *            Locale name
 	 * @param defaultValue
+	 *            Default value
 	 */
-	public ColumnMockUp(String id, String columnId,
+	public ColumnMockUp(String id, String columnId, String label, ColumnTypeCode columnType, String localeName,
-			String label, ColumnTypeCode columnType, String localeName, String defaultValue) {
+			String defaultValue) {
 		this.id = null;
-		this.columnId=null;
+		this.columnId = null;
 		this.label = label;
 		this.columnType = columnType;
 		this.columnDataType = ColumnDataType.Text;
@@ -191,17 +227,23 @@ public class ColumnMockUp implements Serializable {
 
 	/**
 	 * 
-	 * @param id TODO
+	 * @param id
-	 * @param columnId TODO
+	 *            Id
+	 * @param columnId
+	 *            Column id
 	 * @param label
+	 *            Label
 	 * @param columnType
+	 *            Column type
 	 * @param localeName
-	 * @param expressionContainer
+	 *            Locale name
+	 * @param expression
+	 *            Expression
 	 */
-	public ColumnMockUp(String id, String columnId,
+	public ColumnMockUp(String id, String columnId, String label, ColumnTypeCode columnType, String localeName,
-			String label, ColumnTypeCode columnType, String localeName, C_Expression expression) {
+			C_Expression expression) {
 		this.id = id;
-		this.columnId=columnId;
+		this.columnId = columnId;
 		this.label = label;
 		this.columnType = columnType;
 		this.columnDataType = ColumnDataType.Text;
@@ -213,17 +255,25 @@ public class ColumnMockUp implements Serializable {
 
 	/**
 	 * For Dimension
-	 * @param id TODO
+	 * 
-	 * @param columnId TODO
+	 * 
+	 * @param id
+	 *            Id
+	 * @param columnId
+	 *            Column id
 	 * @param label
+	 *            Label
 	 * @param columnType
+	 *            Column type
+	 * @param codelistColumnReference
+	 *            Coldelist column reference
 	 * @param defaultValue
-	 * @param timeDimensionType
+	 *            Default value
 	 */
-	public ColumnMockUp(String id, String columnId,
+	public ColumnMockUp(String id, String columnId, String label, ColumnTypeCode columnType,
-			String label, ColumnTypeCode columnType, ColumnData codelistColumnReference, String defaultValue) {
+			ColumnData codelistColumnReference, String defaultValue) {
 		this.id = id;
-		this.columnId=columnId;
+		this.columnId = columnId;
 		this.label = label;
 		this.columnType = columnType;
 		this.columnDataType = ColumnDataType.Integer;
@@ -236,17 +286,24 @@ public class ColumnMockUp implements Serializable {
 
 	/**
 	 * For TimeDimension
-	 * @param id TODO
+	 * 
-	 * @param columnId TODO
+	 * @param id
+	 *            Id
+	 * @param columnId
+	 *            Column id
 	 * @param label
+	 *            Label
 	 * @param columnType
+	 *            Column type
 	 * @param timeDimensionType
+	 *            Time dimension type
 	 * @param defaultValue
+	 *            Default value
 	 */
-	public ColumnMockUp(String id, String columnId,
+	public ColumnMockUp(String id, String columnId, String label, ColumnTypeCode columnType,
-			String label, ColumnTypeCode columnType, PeriodDataType timeDimensionType, String defaultValue) {
+			PeriodDataType timeDimensionType, String defaultValue) {
 		this.id = id;
-		this.columnId=columnId;
+		this.columnId = columnId;
 		this.label = label;
 		this.columnType = columnType;
 		this.columnDataType = ColumnDataType.Integer;
@@ -347,18 +404,10 @@ public class ColumnMockUp implements Serializable {
 
 	@Override
 	public String toString() {
-		return "ColumnMockUp [id=" + id + ", columnId=" + columnId
+		return "ColumnMockUp [id=" + id + ", columnId=" + columnId + ", columnType=" + columnType + ", columnDataType="
-				+ ", columnType=" + columnType + ", columnDataType="
+				+ columnDataType + ", defaultValue=" + defaultValue + ", label=" + label + ", localeName=" + localeName
-				+ columnDataType + ", defaultValue=" + defaultValue
+				+ ", hasExpression=" + hasExpression + ", expression=" + expression + ", timeDimensionType="
-				+ ", label=" + label + ", localeName=" + localeName
+				+ timeDimensionType + ", codelistColumnReference=" + codelistColumnReference + "]";
-				+ ", hasExpression=" + hasExpression + ", expression="
-				+ expression + ", timeDimensionType=" + timeDimensionType
-				+ ", codelistColumnReference=" + codelistColumnReference + "]";
 	}
 
-	
-
-	
-	
-
 }

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnTypeCode.java

@@ -2,18 +2,14 @@ package org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column;
 
 /**
  * 
- * @author "Giancarlo Panichi" <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  * 
  */
 public enum ColumnTypeCode {
-	ANNOTATION("ANNOTATION"), ATTRIBUTE("ATTRIBUTE"), CODE("CODE"), CODEDESCRIPTION(
+	ANNOTATION("ANNOTATION"), ATTRIBUTE("ATTRIBUTE"), CODE("CODE"), CODEDESCRIPTION("CODEDESCRIPTION"), CODENAME(
-			"CODEDESCRIPTION"), CODENAME("CODENAME"), DIMENSION("DIMENSION"), MEASURE(
+			"CODENAME"), DIMENSION("DIMENSION"), MEASURE("MEASURE"), TIMEDIMENSION("TIMEDIMENSION");
-			"MEASURE"), TIMEDIMENSION("TIMEDIMENSION");
 
-	/**
-	 * @param text
-	 */
 	private ColumnTypeCode(final String id) {
 		this.id = id;
 	}
@@ -25,7 +21,7 @@ public enum ColumnTypeCode {
 		return id;
 	}
 
-	public String getId(){
+	public String getId() {
 		return id;
 	}
 
@@ -53,14 +49,9 @@ public enum ColumnTypeCode {
 
 	}
 
-	
-	/**
-	 * 
-	 * @param id
-	 * @return
-	 */
 	public static ColumnTypeCode getColumnTypeCodeFromId(String id) {
-		if(id==null|| id.isEmpty()) return null;
+		if (id == null || id.isEmpty())
+			return null;
 
 		for (ColumnTypeCode columnTypeCode : values()) {
 			if (columnTypeCode.id.compareToIgnoreCase(id) == 0) {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnViewData.java

@@ -4,8 +4,8 @@ import java.io.Serializable;
 
 /**
  * 
- * @author "Giancarlo Panichi" <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  * 
  */
 public class ColumnViewData implements Serializable {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/DimensionReferenceData.java

@@ -5,7 +5,7 @@ import java.io.Serializable;
 /**
  * Implements the realtionship for Dimension and TimeDimension columns
  * 
- * @author "Giancarlo Panichi"
+ * @author Giancarlo Panichi
  * 
  */
 public class DimensionReferenceData implements Serializable {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/PeriodDataType.java

@@ -5,8 +5,8 @@ import java.util.ArrayList;
 
 /**
  * 
- * @author giancarlo email: <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  *
  */
 public class PeriodDataType implements Serializable, Comparable<PeriodDataType> {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/RelationshipData.java

@@ -5,7 +5,7 @@ import java.io.Serializable;
 /**
  * Implements the realtionship for Dimension and TimeDimension columns
  * 
- * @author "Giancarlo Panichi"
+ * @author Giancarlo Panichi
  * 
  */
 public class RelationshipData implements Serializable {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ValueDataFormat.java

@@ -4,8 +4,8 @@ import java.io.Serializable;
 
 /**
  * 
- * @author giancarlo email: <a
+ * @author Giancarlo Panichi
- *         href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
+ *
  *
  */
 public class ValueDataFormat implements Serializable {

src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/uriresolver/ApplicationType.java

@@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.widgetcommonevent.shared.uriresolver;
 
 /**
  * 
- * @author giancarlo
+ * @author Giancarlo Panichi
- * email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public enum ApplicationType {

src/test/java/org/gcube/portlets/user/td/widgetcommonevent/client/GwtTestWidgetCommonEvent.java

@@ -10,8 +10,8 @@ import com.google.web.bindery.event.shared.SimpleEventBus;
 /**
  * Test Event 
  * 
- * @author "Giancarlo Panichi" 
+ * @author Giancarlo Panichi 
- * <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> 
+ * 
  *
  */
 public class GwtTestWidgetCommonEvent extends GWTTestCase {