gCubeSystem
/
tabular-data-gwt-service
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor Update 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@96794 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-06-05 14:24:13 +00:00
parent f0ab53d823
commit 01cb53545c
2 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/MergeColumnSession.java
View File

@ -16,7 +16,7 @@ public class MergeColumnSession implements Serializable {
private static final long serialVersionUID = -1896235499708614266L; private static final long serialVersionUID = -1896235499708614266L;
protected ColumnData columnData; protected ColumnData columnData;
protected String value; protected String label;
protected Expression expression; protected Expression expression;
@ -27,12 +27,12 @@ public class MergeColumnSession implements Serializable {
/** /**
* *
* @param columnData * @param columnData
* @param value * @param label
* @param expression * @param expression
*/ */
public MergeColumnSession(ColumnData columnData, String value, Expression expression){ public MergeColumnSession(ColumnData columnData, String label, Expression expression){
this.columnData=columnData; this.columnData=columnData;
this.value=value; this.label=label;
this.expression=expression; this.expression=expression;
} }
@ -46,17 +46,6 @@ public class MergeColumnSession implements Serializable {
this.columnData = columnData; this.columnData = columnData;
} }
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
public Expression getExpression() { public Expression getExpression() {
return expression; return expression;
} }
@ -66,12 +55,21 @@ public class MergeColumnSession implements Serializable {
this.expression = expression; this.expression = expression;
} }
@Override public String getLabel() {
public String toString() { return label;
return "MergeColumnSession [columnData=" + columnData + ", value="
+ value + ", expression=" + expression + "]";
} }
public void setLabel(String label) {
this.label = label;
}
@Override
public String toString() {
return "MergeColumnSession [columnData=" + columnData + ", label="
+ label + ", expression=" + expression + "]";
}

34
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/SplitColumnSession.java
View File

@ -17,7 +17,8 @@ public class SplitColumnSession implements Serializable {
private static final long serialVersionUID = -1896235499708614266L; private static final long serialVersionUID = -1896235499708614266L;
protected ColumnData columnData; protected ColumnData columnData;
protected String label; protected String label1;
protected String label2;
protected ArrayList<Expression> expressions; protected ArrayList<Expression> expressions;
public SplitColumnSession() { public SplitColumnSession() {
@ -27,13 +28,15 @@ public class SplitColumnSession implements Serializable {
/** /**
* *
* @param columnData * @param columnData
* @param label * @param label1
* @param label2
* @param expressions * @param expressions
*/ */
public SplitColumnSession(ColumnData columnData, String label, public SplitColumnSession(ColumnData columnData, String label1,String label2,
ArrayList<Expression> expressions) { ArrayList<Expression> expressions) {
this.columnData = columnData; this.columnData = columnData;
this.label = label; this.label1 = label1;
this.label2 = label2;
this.expressions = expressions; this.expressions = expressions;
} }
@ -46,12 +49,20 @@ public class SplitColumnSession implements Serializable {
this.columnData = columnData; this.columnData = columnData;
} }
public String getLabel() { public String getLabel1() {
return label; return label1;
} }
public void setLabel(String label) { public void setLabel1(String label1) {
this.label = label; this.label1 = label1;
}
public String getLabel2() {
return label2;
}
public void setLabel2(String label2) {
this.label2 = label2;
} }
public ArrayList<Expression> getExpressions() { public ArrayList<Expression> getExpressions() {
@ -64,8 +75,11 @@ public class SplitColumnSession implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "SplitColumnSession [columnData=" + columnData + ", label=" return "SplitColumnSession [columnData=" + columnData + ", label1="
+ label + ", expressions=" + expressions + "]"; + label1 + ", label2=" + label2 + ", expressions="
+ expressions + "]";
} }
} }