From 8535a11627bf88bdf886e2e803896c17d9006498 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 5 Jun 2014 14:25:25 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@96795 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../shared/tr/column/MergeColumnSession.java | 42 +++++++------------ .../shared/tr/column/SplitColumnSession.java | 6 +-- 2 files changed, 18 insertions(+), 30 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/MergeColumnSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/MergeColumnSession.java index dab290f..832c13c 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/MergeColumnSession.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/MergeColumnSession.java @@ -7,41 +7,40 @@ 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 MergeColumnSession implements Serializable { - + private static final long serialVersionUID = -1896235499708614266L; - + protected ColumnData columnData; protected String label; protected Expression expression; - - - public MergeColumnSession(){ - + + public MergeColumnSession() { + } - + /** * * @param columnData * @param label * @param expression */ - public MergeColumnSession(ColumnData columnData, String label, Expression expression){ - this.columnData=columnData; - this.label=label; - this.expression=expression; - + public MergeColumnSession(ColumnData columnData, String label, + Expression expression) { + this.columnData = columnData; + this.label = label; + this.expression = expression; + } - + public ColumnData getColumnData() { return columnData; } - public void setColumnData(ColumnData columnData) { this.columnData = columnData; } @@ -50,7 +49,6 @@ public class MergeColumnSession implements Serializable { return expression; } - public void setExpression(Expression expression) { this.expression = expression; } @@ -69,12 +67,4 @@ public class MergeColumnSession implements Serializable { + label + ", expression=" + expression + "]"; } - - - - - - - - } 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 2d43532..34ddf99 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 @@ -32,8 +32,8 @@ public class SplitColumnSession implements Serializable { * @param label2 * @param expressions */ - public SplitColumnSession(ColumnData columnData, String label1,String label2, - ArrayList expressions) { + public SplitColumnSession(ColumnData columnData, String label1, + String label2, ArrayList expressions) { this.columnData = columnData; this.label1 = label1; this.label2 = label2; @@ -80,6 +80,4 @@ public class SplitColumnSession implements Serializable { + expressions + "]"; } - - }