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
This commit is contained in:
Giancarlo Panichi 2017-05-16 14:35:52 +00:00
parent d160ee01c7
commit 48cfb767b9
58 changed files with 320 additions and 415 deletions

View File

@ -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>

View File

@ -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>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -6,8 +6,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expressi
/**
*
* @author giancarlo email: <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
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,
C_Expression exp) {
public C_ExpressionContainer(Contains id, boolean conditionAllRows, 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="
+ conditionAllRows + ", exp=" + exp + "]";
return "C_ExpressionContainer [id=" + id + ", conditionAllRows=" + conditionAllRows + ", exp=" + exp + "]";
}
}

View File

@ -7,8 +7,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class ExpressionWrapper implements Serializable {
@ -21,28 +21,27 @@ public class ExpressionWrapper implements Serializable {
private boolean replaceByValue;
private String replaceValue;
private C_ExpressionContainer replaceExpressionContainer;
/**
*
*/
public ExpressionWrapper() {
super();
this.expressionType=ExpressionWrapperType.EXPRESSION_NULL;
this.expressionType = ExpressionWrapperType.EXPRESSION_NULL;
}
/**
*
* @param trId
* @param columnId
* @param columnName
* TR Id
* @param columnData
* Column data
* @param conditionExpressionContainer
* Condition expression container
*/
public ExpressionWrapper(TRId trId,
ColumnData columnData,
C_ExpressionContainer conditionExpressionContainer) {
public ExpressionWrapper(TRId trId, ColumnData columnData, C_ExpressionContainer conditionExpressionContainer) {
super();
this.expressionType = ExpressionWrapperType.CONDITION_COLUMN_EXPRESSION;
this.trId = trId;
this.columnData = columnData;
@ -51,16 +50,8 @@ public class ExpressionWrapper implements Serializable {
this.replaceValue = null;
this.replaceExpressionContainer = null;
}
/**
*
* @param replaceValue
* @param trId
* @param columnId
* @param columnName
*/
public ExpressionWrapper(String replaceValue,TRId trId,
ColumnData columnData) {
public ExpressionWrapper(String replaceValue, TRId trId, ColumnData columnData) {
super();
this.expressionType = ExpressionWrapperType.REPLACE_COLUMN_EXPRESSION;
this.trId = trId;
@ -70,16 +61,8 @@ public class ExpressionWrapper implements Serializable {
this.replaceValue = replaceValue;
this.replaceExpressionContainer = null;
}
/**
*
* @param replaceExpressionContainer
* @param trId
* @param columnId
* @param columnName
*/
public ExpressionWrapper(C_ExpressionContainer replaceExpressionContainer,TRId trId,
ColumnData columnData) {
public ExpressionWrapper(C_ExpressionContainer replaceExpressionContainer, TRId trId, ColumnData columnData) {
super();
this.expressionType = ExpressionWrapperType.REPLACE_COLUMN_EXPRESSION;
this.trId = trId;
@ -89,43 +72,20 @@ public class ExpressionWrapper implements Serializable {
this.replaceValue = null;
this.replaceExpressionContainer = replaceExpressionContainer;
}
/**
*
* @param trId
* @param columnId
* @param columnName
* @param conditionExpressionContainer
* @param replaceExpressionContainer
*/
public ExpressionWrapper(TRId trId,
ColumnData columnData,
C_ExpressionContainer conditionExpressionContainer,
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;
}
/**
*
* @param trId
* @param columnId
* @param columnName
* @param conditionExpressionContainer
* @param replaceValue
*/
public ExpressionWrapper(TRId trId,
ColumnData columnData,
C_ExpressionContainer conditionExpressionContainer,
public ExpressionWrapper(TRId trId, ColumnData columnData, C_ExpressionContainer conditionExpressionContainer,
String replaceValue) {
super();
this.expressionType = ExpressionWrapperType.CONDITION_AND_REPLACE_COLUMN_EXPRESSION;
@ -136,24 +96,19 @@ public class ExpressionWrapper implements Serializable {
this.replaceValue = replaceValue;
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
+ ", trId=" + trId + ", columnData=" + columnData
+ ", conditionExpressionContainer="
+ conditionExpressionContainer + ", replaceByValue="
+ replaceByValue + ", replaceValue=" + replaceValue
+ ", replaceExpressionContainer=" + replaceExpressionContainer
+ "]";
return "ExpressionWrapper [expressionType=" + expressionType + ", trId=" + trId + ", columnData=" + columnData
+ ", conditionExpressionContainer=" + conditionExpressionContainer + ", replaceByValue="
+ replaceByValue + ", replaceValue=" + replaceValue + ", replaceExpressionContainer="
+ replaceExpressionContainer + "]";
}
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -5,26 +5,21 @@ import java.util.ArrayList;
/**
*
* @author giancarlo
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class OperationResult implements Serializable {
private static final long serialVersionUID = 7612440231512398232L;
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="
+ collateralTRIds + "]";
return "OperationResult [trId=" + trId + ", collateralTRIds=" + collateralTRIds + "]";
}
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -2,8 +2,8 @@ package org.gcube.portlets.user.td.widgetcommonevent.shared.mime;
/**
*
* @author giancarlo
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
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;
}

View File

@ -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>
@ -59,7 +59,7 @@ package org.gcube.portlets.user.td.widgetcommonevent.shared.operations;
* <tr><td>ValidateDataSet</td><td>5012</td></tr>
* <tr><td>ValidateGeneric</td><td>5013</td></tr>
* <tr><td>ExtractCodelist</td><td>11001</td></tr>
* </table>
* </table>
*
* @author "Giancarlo Panichi"
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>

View File

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

View File

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

View File

@ -7,8 +7,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
/**
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class ColumnData implements Serializable {
@ -23,17 +23,17 @@ public class ColumnData implements Serializable {
private String dataTypeName;
private String label;
private String locale;
private TRId trId;
private boolean viewColumn;
private ColumnViewData columnViewData;
private PeriodDataType periodDataType;
// Relationship for Dimension and Timedimension columns
private RelationshipData relationship;
// validation columns that validate this column
private ArrayList<String> validationColumnReferences;
@ -41,36 +41,14 @@ public class ColumnData implements Serializable {
private boolean validationColumn;
// if this is a validation column then contains the columns validated
private ArrayList<String> validatedColumns;
public ColumnData(){
public ColumnData() {
}
/**
*
* @param id
* @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,
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;
}
@ -191,12 +168,11 @@ public class ColumnData implements Serializable {
public ArrayList<String> getValidationColumnReferences() {
return validationColumnReferences;
}
public void setValidationColumnReferences(
ArrayList<String> validationColumnReferences) {
public void setValidationColumnReferences(ArrayList<String> validationColumnReferences) {
this.validationColumnReferences = validationColumnReferences;
}
public String getLocale() {
return locale;
}
@ -212,7 +188,7 @@ public class ColumnData implements Serializable {
public void setRelationship(RelationshipData relationship) {
this.relationship = relationship;
}
public PeriodDataType getPeriodDataType() {
return periodDataType;
}
@ -221,20 +197,14 @@ public class ColumnData implements Serializable {
this.periodDataType = periodDataType;
}
@Override
public String toString() {
return "ColumnData [id=" + id + ", columnId=" + columnId + ", name="
+ name + ", typeName=" + typeName + ", typeCode=" + typeCode
+ ", dataTypeName=" + dataTypeName + ", label=" + label
+ ", locale=" + locale + ", trId=" + trId + ", viewColumn="
+ viewColumn + ", columnViewData=" + columnViewData
+ ", periodDataType=" + periodDataType + ", relationship="
+ relationship + ", validationColumnReferences="
+ validationColumnReferences + ", validationColumn="
+ validationColumn + ", validatedColumns=" + validatedColumns
+ "]";
return "ColumnData [id=" + id + ", columnId=" + columnId + ", name=" + name + ", typeName=" + typeName
+ ", typeCode=" + typeCode + ", dataTypeName=" + dataTypeName + ", label=" + label + ", locale="
+ locale + ", trId=" + trId + ", viewColumn=" + viewColumn + ", columnViewData=" + columnViewData
+ ", periodDataType=" + periodDataType + ", relationship=" + relationship
+ ", validationColumnReferences=" + validationColumnReferences + ", validationColumn="
+ validationColumn + ", validatedColumns=" + validatedColumns + "]";
}
}

View File

@ -5,17 +5,13 @@ import java.util.List;
/**
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public enum ColumnDataType {
Boolean("Boolean"), Geometry("Geometry"), Integer("Integer"), Numeric(
"Numeric"), Date("Date"), Text("Text");
Boolean("Boolean"), Geometry("Geometry"), Integer("Integer"), Numeric("Numeric"), Date("Date"), Text("Text");
/**
* @param text
*/
private ColumnDataType(final String id) {
this.id = id;
}
@ -30,20 +26,15 @@ public enum ColumnDataType {
public String getLabel() {
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) {
return columnDataType;
@ -51,11 +42,10 @@ public enum ColumnDataType {
}
return null;
}
public static List<ColumnDataType> asList() {
List<ColumnDataType> list=Arrays.asList(values());
List<ColumnDataType> list = Arrays.asList(values());
return list;
}
}

View File

@ -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;
@ -22,7 +22,7 @@ public class ColumnMockUp implements Serializable {
private String localeName;
private boolean hasExpression;
private C_Expression expression;
protected PeriodDataType timeDimensionType;
protected ColumnData codelistColumnReference;
@ -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,
ColumnDataType columnDataType, String label) {
public ColumnMockUp(String id, String columnId, ColumnDataType columnDataType, String label) {
super();
this.id = id;
this.columnId = columnId;
@ -54,20 +56,24 @@ public class ColumnMockUp implements Serializable {
this.timeDimensionType = null;
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,
ColumnDataType columnDataType, String label) {
public ColumnMockUp(String id, String columnId, ColumnTypeCode columnType, ColumnDataType columnDataType,
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,
String label, ColumnTypeCode columnType, String defaultValue) {
public ColumnMockUp(String id, String columnId, 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,
String label, ColumnTypeCode columnType, C_Expression expression) {
public ColumnMockUp(String id, String columnId, 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,
String label, ColumnTypeCode columnType, ColumnDataType columnDataType, String defaultValue) {
public ColumnMockUp(String id, String columnId, String label, ColumnTypeCode columnType,
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,
String label, ColumnTypeCode columnType, ColumnDataType columnDataType, C_Expression expression) {
public ColumnMockUp(String id, String columnId, String label, ColumnTypeCode columnType,
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,
String label, ColumnTypeCode columnType, String localeName, String defaultValue) {
public ColumnMockUp(String id, String columnId, String label, ColumnTypeCode columnType, String localeName,
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 columnId TODO
* @param id
* 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,
String label, ColumnTypeCode columnType, String localeName, C_Expression expression) {
public ColumnMockUp(String id, String columnId, String label, ColumnTypeCode columnType, String localeName,
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,
String label, ColumnTypeCode columnType, ColumnData codelistColumnReference, String defaultValue) {
public ColumnMockUp(String id, String columnId, String label, ColumnTypeCode columnType,
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,
String label, ColumnTypeCode columnType, PeriodDataType timeDimensionType, String defaultValue) {
public ColumnMockUp(String id, String columnId, String label, ColumnTypeCode columnType,
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
+ ", columnType=" + columnType + ", columnDataType="
+ columnDataType + ", defaultValue=" + defaultValue
+ ", label=" + label + ", localeName=" + localeName
+ ", hasExpression=" + hasExpression + ", expression="
+ expression + ", timeDimensionType=" + timeDimensionType
+ ", codelistColumnReference=" + codelistColumnReference + "]";
return "ColumnMockUp [id=" + id + ", columnId=" + columnId + ", columnType=" + columnType + ", columnDataType="
+ columnDataType + ", defaultValue=" + defaultValue + ", label=" + label + ", localeName=" + localeName
+ ", hasExpression=" + hasExpression + ", expression=" + expression + ", timeDimensionType="
+ timeDimensionType + ", codelistColumnReference=" + codelistColumnReference + "]";
}
}

View File

@ -2,18 +2,14 @@ package org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column;
/**
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public enum ColumnTypeCode {
ANNOTATION("ANNOTATION"), ATTRIBUTE("ATTRIBUTE"), CODE("CODE"), CODEDESCRIPTION(
"CODEDESCRIPTION"), CODENAME("CODENAME"), DIMENSION("DIMENSION"), MEASURE(
"MEASURE"), TIMEDIMENSION("TIMEDIMENSION");
ANNOTATION("ANNOTATION"), ATTRIBUTE("ATTRIBUTE"), CODE("CODE"), CODEDESCRIPTION("CODEDESCRIPTION"), CODENAME(
"CODENAME"), DIMENSION("DIMENSION"), MEASURE("MEASURE"), TIMEDIMENSION("TIMEDIMENSION");
/**
* @param text
*/
private ColumnTypeCode(final String id) {
this.id = id;
}
@ -24,8 +20,8 @@ public enum ColumnTypeCode {
public String toString() {
return id;
}
public String getId(){
public String getId() {
return id;
}
@ -53,22 +49,17 @@ 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) {
return columnTypeCode;
}
}
return null;
}
}

View File

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

View File

@ -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 {

View File

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

View File

@ -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 {

View File

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

View File

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

View File

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