gCubeSystem
/
tabular-data-widget-common-event
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated ColumnData 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-widget-common-event@113958 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2015-04-13 10:58:02 +00:00
parent a1bf4935cd
commit 848f8d27c1
1 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/ExpressionWrapper.java
View File

@ -3,7 +3,7 @@ package org.gcube.portlets.user.td.widgetcommonevent.client.expression;
import java.io.Serializable;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
/**
*
@ -16,8 +16,7 @@ public class ExpressionWrapper implements Serializable {
private static final long serialVersionUID = 3877772253100442685L;
private ExpressionWrapperType expressionType;
private TRId trId;
private String columnId;
private String columnName;
private ColumnData columnData;
private C_ExpressionContainer conditionExpressionContainer;
private boolean replaceByValue;
private String replaceValue;
@ -40,14 +39,13 @@ public class ExpressionWrapper implements Serializable {
* @param conditionExpressionContainer
*/
public ExpressionWrapper(TRId trId,
String columnId, String columnName,
ColumnData columnData,
C_ExpressionContainer conditionExpressionContainer) {
super();
this.expressionType = ExpressionWrapperType.CONDITION_COLUMN_EXPRESSION;
this.trId = trId;
this.columnId = columnId;
this.columnName = columnName;
this.columnData = columnData;
this.conditionExpressionContainer = conditionExpressionContainer;
this.replaceByValue = false;
this.replaceValue = null;
@ -62,12 +60,11 @@ public class ExpressionWrapper implements Serializable {
* @param columnName
*/
public ExpressionWrapper(String replaceValue,TRId trId,
String columnId, String columnName) {
ColumnData columnData) {
super();
this.expressionType = ExpressionWrapperType.REPLACE_COLUMN_EXPRESSION;
this.trId = trId;
this.columnId = columnId;
this.columnName = columnName;
this.columnData = columnData;
this.conditionExpressionContainer = null;
this.replaceByValue = true;
this.replaceValue = replaceValue;
@ -82,12 +79,11 @@ public class ExpressionWrapper implements Serializable {
* @param columnName
*/
public ExpressionWrapper(C_ExpressionContainer replaceExpressionContainer,TRId trId,
String columnId, String columnName) {
ColumnData columnData) {
super();
this.expressionType = ExpressionWrapperType.REPLACE_COLUMN_EXPRESSION;
this.trId = trId;
this.columnId = columnId;
this.columnName = columnName;
this.columnData = columnData;
this.conditionExpressionContainer = null;
this.replaceByValue = false;
this.replaceValue = null;
@ -105,14 +101,13 @@ public class ExpressionWrapper implements Serializable {
* @param replaceExpressionContainer
*/
public ExpressionWrapper(TRId trId,
String columnId, String columnName,
ColumnData columnData,
C_ExpressionContainer conditionExpressionContainer,
C_ExpressionContainer replaceExpressionContainer) {
super();
this.expressionType = ExpressionWrapperType.CONDITION_AND_REPLACE_COLUMN_EXPRESSION;
this.trId = trId;
this.columnId = columnId;
this.columnName = columnName;
this.columnData=columnData;
this.conditionExpressionContainer = conditionExpressionContainer;
this.replaceByValue = false;
this.replaceValue = null;
@ -129,14 +124,13 @@ public class ExpressionWrapper implements Serializable {
* @param replaceValue
*/
public ExpressionWrapper(TRId trId,
String columnId, String columnName,
ColumnData columnData,
C_ExpressionContainer conditionExpressionContainer,
String replaceValue) {
super();
this.expressionType = ExpressionWrapperType.CONDITION_AND_REPLACE_COLUMN_EXPRESSION;
this.trId = trId;
this.columnId = columnId;
this.columnName = columnName;
this.columnData = columnData;
this.conditionExpressionContainer = conditionExpressionContainer;
this.replaceByValue = true;
this.replaceValue = replaceValue;
@ -164,24 +158,13 @@ public class ExpressionWrapper implements Serializable {
this.trId = trId;
}
public String getColumnId() {
return columnId;
public ColumnData getColumnData() {
return columnData;
}
public void setColumnId(String columnId) {
this.columnId = columnId;
}
public String getColumnName() {
return columnName;
}
public void setColumnName(String columnName) {
this.columnName = columnName;
public void setColumnData(ColumnData columnData) {
this.columnData = columnData;
}
@ -230,13 +213,16 @@ public class ExpressionWrapper implements Serializable {
@Override
public String toString() {
return "ExpressionWrapper [expressionType=" + expressionType
+ ", trId=" + trId + ", columnId=" + columnId + ", columnName="
+ columnName + ", conditionExpressionContainer="
+ ", trId=" + trId + ", columnData=" + columnData
+ ", conditionExpressionContainer="
+ conditionExpressionContainer + ", replaceByValue="
+ replaceByValue + ", replaceValue=" + replaceValue
+ ", replaceExpressionContainer=" + replaceExpressionContainer
+ "]";
}