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