diff --git a/distro/changelog.xml b/distro/changelog.xml index ae072f0..682103b 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,12 +1,17 @@ + + Support Java 8 compatibility [ticket #8580] + - Added support for template export in SDMX [issue #8033] + Added support for template export in SDMX [issue #8033] + Updated support to Spanish - Added extension to name of resource by mime type [issue #258] + Added extension to name of resource by mime type [issue #258] + Added support to Notifications [issue #197] Updated support to Resources [issue #209] Updated support to Table Expression [issue #81] diff --git a/pom.xml b/pom.xml index 10805cb..fb38441 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.gcube.portlets.user tabular-data-widget-common-event - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT tabular-data-widget-common-event tabular-data-widget-common-event contains events that are common to all widgets in tabular data manager diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/CommonMessages.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/CommonMessages.java index eb42df9..88c3441 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/CommonMessages.java +++ b/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: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface CommonMessages extends Messages { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/WidgetCommonEventEntry.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/WidgetCommonEventEntry.java index e159763..7add565 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/WidgetCommonEventEntry.java +++ b/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" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class WidgetCommonEventEntry implements EntryPoint { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/BackgroundRequestEvent.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/BackgroundRequestEvent.java index f0ad55e..e8a37e0 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/BackgroundRequestEvent.java +++ b/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" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class BackgroundRequestEvent extends GwtEvent { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/ChangeTableRequestEvent.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/ChangeTableRequestEvent.java index 8a7a474..cb48458 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/ChangeTableRequestEvent.java +++ b/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" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ChangeTableRequestEvent extends GwtEvent { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/DataViewActiveEvent.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/DataViewActiveEvent.java index 292b055..3b91e9a 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/DataViewActiveEvent.java +++ b/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" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class DataViewActiveEvent extends diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/DataViewRequestEvent.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/DataViewRequestEvent.java index dfaee58..64a3c71 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/DataViewRequestEvent.java +++ b/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" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class DataViewRequestEvent extends diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/ExpressionWrapperEvent.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/ExpressionWrapperEvent.java index 2f5abb5..91afb95 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/ExpressionWrapperEvent.java +++ b/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" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ExpressionWrapperEvent extends GwtEvent { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/GridContextMenuItemEvent.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/GridContextMenuItemEvent.java index 5524287..1350337 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/GridContextMenuItemEvent.java +++ b/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" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * * Used to manage the events of menu grid */ diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/GridHeaderColumnMenuItemEvent.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/GridHeaderColumnMenuItemEvent.java index 666777c..5ceea28 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/GridHeaderColumnMenuItemEvent.java +++ b/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" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * * Used to manage the events of menu grid */ diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/RibbonEvent.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/RibbonEvent.java index 155359b..147f927 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/RibbonEvent.java +++ b/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" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class RibbonEvent extends GwtEvent { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/SessionExpiredEvent.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/SessionExpiredEvent.java index a76ad4b..e104c88 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/SessionExpiredEvent.java +++ b/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" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SessionExpiredEvent extends GwtEvent { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/UIStateEvent.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/UIStateEvent.java index e6540e8..68f0ce1 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/UIStateEvent.java +++ b/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" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class UIStateEvent extends GwtEvent { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/WidgetRequestEvent.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/WidgetRequestEvent.java index 7f42da8..f82c0ca 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/event/WidgetRequestEvent.java +++ b/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" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class WidgetRequestEvent extends diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/C_ExpressionContainer.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/C_ExpressionContainer.java index 66a18c9..54ba213 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/C_ExpressionContainer.java +++ b/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: g.panichi@isti.cnr.it + * @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 + "]"; } } diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/ExpressionWrapper.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/ExpressionWrapper.java index ef189ce..564afc5 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/ExpressionWrapper.java +++ b/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" g.panichi@isti.cnr.it + * @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 + "]"; } - - - - - - - - - } diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/ExpressionWrapperType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/ExpressionWrapperType.java index e757ce2..610d80c 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/ExpressionWrapperType.java +++ b/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" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum ExpressionWrapperType { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/BackgroundRequestType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/BackgroundRequestType.java index 0d07d61..ff0a403 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/BackgroundRequestType.java +++ b/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" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum BackgroundRequestType { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/ChangeTableRequestType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/ChangeTableRequestType.java index 12b567e..ff321b6 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/ChangeTableRequestType.java +++ b/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" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum ChangeTableRequestType { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/ChangeTableWhy.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/ChangeTableWhy.java index 09b3531..631cbfe 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/ChangeTableWhy.java +++ b/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 - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum ChangeTableWhy { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/DataViewActiveType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/DataViewActiveType.java index dd8d99e..9863489 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/DataViewActiveType.java +++ b/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" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum DataViewActiveType { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/DataViewRequestType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/DataViewRequestType.java index b305ded..1917549 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/DataViewRequestType.java +++ b/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" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum DataViewRequestType { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/GridHeaderColumnMenuItemType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/GridHeaderColumnMenuItemType.java index 63dc02c..b1e1fe0 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/GridHeaderColumnMenuItemType.java +++ b/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" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * * Types of events generated by the grid menu */ diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/RibbonType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/RibbonType.java index 416220b..c6c1f46 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/RibbonType.java +++ b/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" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum RibbonType { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/SessionExpiredType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/SessionExpiredType.java index bfee5c5..d4b3646 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/SessionExpiredType.java +++ b/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" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum SessionExpiredType { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/UIStateType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/UIStateType.java index f9c04fc..ada330f 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/UIStateType.java +++ b/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" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum UIStateType { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/WidgetRequestType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/WidgetRequestType.java index 7ee1917..ffb6354 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/WidgetRequestType.java +++ b/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" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum WidgetRequestType { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/CellData.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/CellData.java index 24b57ba..f7ce284 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/CellData.java +++ b/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" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class CellData implements Serializable { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/Constants.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/Constants.java index 930bb47..4717496 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/Constants.java +++ b/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: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class Constants { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/GridHeaderOperationId.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/GridHeaderOperationId.java index 982dc71..8d3a08e 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/GridHeaderOperationId.java +++ b/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" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * * Operations that can be launched from the grid menu */ diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/GridOperationId.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/GridOperationId.java index 1d28242..e85f963 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/GridOperationId.java +++ b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/GridOperationId.java @@ -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; } } - diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/OperationResult.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/OperationResult.java index f03c3ad..97ca167 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/OperationResult.java +++ b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/OperationResult.java @@ -5,26 +5,21 @@ import java.util.ArrayList; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class OperationResult implements Serializable { - + private static final long serialVersionUID = 7612440231512398232L; private TRId trId; private ArrayList collateralTRIds; - - public OperationResult(){ - + + public OperationResult() { + } - - /** - * - * @param trId - * @param collateralTRIds - */ + public OperationResult(TRId trId, ArrayList 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 + "]"; } - - - } diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/RequestProperties.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/RequestProperties.java index 2a35e3a..f6d8428 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/RequestProperties.java +++ b/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 { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/RequestPropertiesParameterType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/RequestPropertiesParameterType.java index 9e47b81..e137a18 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/RequestPropertiesParameterType.java +++ b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/RequestPropertiesParameterType.java @@ -2,31 +2,23 @@ package org.gcube.portlets.user.td.widgetcommonevent.shared; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @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; } - + } diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/TRId.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/TRId.java index fbd06a8..3c33f40 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/TRId.java +++ b/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" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class TRId implements Serializable { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/charts/ChartType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/charts/ChartType.java index 62c69f3..72549bc 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/charts/ChartType.java +++ b/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 - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum ChartType { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/dataview/DataView.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/dataview/DataView.java index c54cc70..b993694 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/dataview/DataView.java +++ b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/dataview/DataView.java @@ -4,8 +4,8 @@ import java.io.Serializable; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class DataView implements Serializable { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/dataview/DataViewType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/dataview/DataViewType.java index aa365c9..b9274f3 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/dataview/DataViewType.java +++ b/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 - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum DataViewType { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/dataview/TabularResourceDataView.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/dataview/TabularResourceDataView.java index 241d464..573f088 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/dataview/TabularResourceDataView.java +++ b/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: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class TabularResourceDataView extends DataView { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/expression/C_Expression.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/expression/C_Expression.java index 907bf46..b102f05 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/expression/C_Expression.java +++ b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/expression/C_Expression.java @@ -4,8 +4,8 @@ import java.io.Serializable; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class C_Expression implements Serializable { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/geospatial/GeospatialCoordinatesType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/geospatial/GeospatialCoordinatesType.java index 0998bd3..5fe68be 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/geospatial/GeospatialCoordinatesType.java +++ b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/geospatial/GeospatialCoordinatesType.java @@ -5,8 +5,8 @@ import java.util.List; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum GeospatialCoordinatesType { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/grid/model/RowRaw.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/grid/model/RowRaw.java index bb9edd1..9770b77 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/grid/model/RowRaw.java +++ b/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" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class RowRaw implements Serializable { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/mime/MimeTypeSupport.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/mime/MimeTypeSupport.java index 16d7533..b7d40c0 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/mime/MimeTypeSupport.java +++ b/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 - * email: g.panichi@isti.cnr.it + * @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; } diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/operations/OperationsId.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/operations/OperationsId.java index 25aa3fa..1f7f807 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/operations/OperationsId.java +++ b/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 * - * + *
* * * @@ -41,7 +41,7 @@ package org.gcube.portlets.user.td.widgetcommonevent.shared.operations; * * * - * + * * * * @@ -59,7 +59,7 @@ package org.gcube.portlets.user.td.widgetcommonevent.shared.operations; * * * - *
CSVImport100
CSVExport101
SDMXCodelistImport200
RemoveDuplicateTuples3007
Normalize3008
TimeAggregation3009
DownscaleCSquare/td>3010
DownscaleCSquare3010
ReplaceColumnByExpression3101
ReplaceById3102
FilterByExpression3201
ValidateDataSet5012
ValidateGeneric5013
ExtractCodelist11001
+ * * * @author "Giancarlo Panichi" * g.panichi@isti.cnr.it diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/thumbnail/ThumbnailTD.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/thumbnail/ThumbnailTD.java index 39ff43a..fbbb8e6 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/thumbnail/ThumbnailTD.java +++ b/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 { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/TabResourceType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/TabResourceType.java index 6c4651d..31e20cd 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/TabResourceType.java +++ b/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 - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum TabResourceType { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnData.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnData.java index 0ab05b4..ddb1e4d 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnData.java +++ b/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" g.panichi@isti.cnr.it + * @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 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 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 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 validationColumnReferences, boolean validationColumn, ArrayList 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 getValidationColumnReferences() { return validationColumnReferences; } - - public void setValidationColumnReferences( - ArrayList validationColumnReferences) { + + public void setValidationColumnReferences(ArrayList 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 + "]"; } - - + } diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnDataType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnDataType.java index 5a60574..3af7966 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnDataType.java +++ b/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" g.panichi@isti.cnr.it + * @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 asList() { - List list=Arrays.asList(values()); + List list = Arrays.asList(values()); return list; } - } diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnMockUp.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnMockUp.java index 7054412..57f1e90 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnMockUp.java +++ b/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; @@ -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 + "]"; } - - - - - } diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnTypeCode.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnTypeCode.java index 9c9c91d..2610b2a 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnTypeCode.java +++ b/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" g.panichi@isti.cnr.it + * @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; - + } } diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnViewData.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnViewData.java index b569e56..8e1e002 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ColumnViewData.java +++ b/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" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ColumnViewData implements Serializable { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/DimensionReferenceData.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/DimensionReferenceData.java index 9fc1ba7..d704e23 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/DimensionReferenceData.java +++ b/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 { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/PeriodDataType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/PeriodDataType.java index 672b5f6..66301e1 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/PeriodDataType.java +++ b/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: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class PeriodDataType implements Serializable, Comparable { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/RelationshipData.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/RelationshipData.java index e8fa7fa..a4b1626 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/RelationshipData.java +++ b/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 { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ValueDataFormat.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ValueDataFormat.java index dd10e47..ff53621 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/tr/column/ValueDataFormat.java +++ b/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: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ValueDataFormat implements Serializable { diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/uriresolver/ApplicationType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/uriresolver/ApplicationType.java index 2ed3a1a..026e84c 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/uriresolver/ApplicationType.java +++ b/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 - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum ApplicationType { diff --git a/src/test/java/org/gcube/portlets/user/td/widgetcommonevent/client/GwtTestWidgetCommonEvent.java b/src/test/java/org/gcube/portlets/user/td/widgetcommonevent/client/GwtTestWidgetCommonEvent.java index 7df440f..3b2cf2a 100644 --- a/src/test/java/org/gcube/portlets/user/td/widgetcommonevent/client/GwtTestWidgetCommonEvent.java +++ b/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" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class GwtTestWidgetCommonEvent extends GWTTestCase {