From f0ab53d8232aa830f1a26f531e793b85acbd2218 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 5 Jun 2014 10:03:02 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@96731 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../shared/tr/column/SplitColumnSession.java | 73 ++++++++----------- 1 file changed, 31 insertions(+), 42 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/SplitColumnSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/SplitColumnSession.java index 12aa05b..f83a912 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/SplitColumnSession.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/SplitColumnSession.java @@ -1,82 +1,71 @@ package org.gcube.portlets.user.td.gwtservice.shared.tr.column; import java.io.Serializable; +import java.util.ArrayList; import org.gcube.data.analysis.tabulardata.expression.Expression; import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * + * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * */ public class SplitColumnSession implements Serializable { - + private static final long serialVersionUID = -1896235499708614266L; - + protected ColumnData columnData; - protected String value; - protected Expression expression; - - - public SplitColumnSession(){ - + protected String label; + protected ArrayList expressions; + + public SplitColumnSession() { + } - + /** * * @param columnData - * @param value - * @param expression + * @param label + * @param expressions */ - public SplitColumnSession(ColumnData columnData, String value, Expression expression){ - this.columnData=columnData; - this.value=value; - this.expression=expression; - - } + public SplitColumnSession(ColumnData columnData, String label, + ArrayList expressions) { + this.columnData = columnData; + this.label = label; + this.expressions = expressions; + } public ColumnData getColumnData() { return columnData; } - public void setColumnData(ColumnData columnData) { this.columnData = columnData; } - - public String getValue() { - return value; + public String getLabel() { + return label; } - - public void setValue(String value) { - this.value = value; + public void setLabel(String label) { + this.label = label; } - - public Expression getExpression() { - return expression; + public ArrayList getExpressions() { + return expressions; } - - public void setExpression(Expression expression) { - this.expression = expression; + public void setExpressions(ArrayList expressions) { + this.expressions = expressions; } - @Override public String toString() { - return "SplitColumnSession [columnData=" + columnData + ", value=" - + value + ", expression=" + expression + "]"; + return "SplitColumnSession [columnData=" + columnData + ", label=" + + label + ", expressions=" + expressions + "]"; } - - - - - - + }