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

81: Allow the creation and use of expressions on multi column in TDM portlet 

Task-Url: https://support.d4science.org/issues/81

Updated readable expression, now is part of C_Expression

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-widget-common-event@114900 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2015-05-26 12:42:43 +00:00
parent aa0a833ae2
commit 32ccfbb5ba
2 changed files with 15 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/C_ExpressionContainer.java
View File

@ -4,11 +4,10 @@ import java.io.Serializable;
import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
/**
*
* @author giancarlo
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author giancarlo email: <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class C_ExpressionContainer implements Serializable {
@ -22,9 +21,7 @@ public class C_ExpressionContainer implements Serializable {
private Contains id;
private boolean conditionAllRows;
private C_Expression exp;
private String readableExpression;
/**
*
*/
@ -36,26 +33,21 @@ public class C_ExpressionContainer implements Serializable {
*
* @param id
* @param exp
* @param readableExpression
*/
public C_ExpressionContainer(Contains id, C_Expression exp,
String readableExpression) {
public C_ExpressionContainer(Contains id, C_Expression exp) {
super();
this.id = id;
this.conditionAllRows=false;
this.conditionAllRows = false;
this.exp = exp;
this.readableExpression = readableExpression;
}
public C_ExpressionContainer(Contains id, boolean conditionAllRows, C_Expression exp,
String readableExpression) {
public C_ExpressionContainer(Contains id, boolean conditionAllRows,
C_Expression exp) {
super();
this.id = id;
this.conditionAllRows=conditionAllRows;
this.conditionAllRows = conditionAllRows;
this.exp = exp;
this.readableExpression = readableExpression;
}
public Contains getId() {
return id;
@ -80,24 +72,11 @@ public class C_ExpressionContainer implements Serializable {
public void setExp(C_Expression exp) {
this.exp = exp;
}
public String getReadableExpression() {
return readableExpression;
}
public void setReadableExpression(String readableExpression) {
this.readableExpression = readableExpression;
}
@Override
public String toString() {
return "C_ExpressionContainer [id=" + id + ", conditionAllRows="
+ conditionAllRows + ", exp=" + exp + ", readableExpression="
+ readableExpression + "]";
+ conditionAllRows + ", exp=" + exp + "]";
}
}

8
src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/RibbonType.java
View File

@ -29,12 +29,14 @@ public enum RibbonType {
DISCARD_ALL,
LOGS,
HELP,
RULE_NEW,
RULE_MODIFY,
RULE_DELETE,
RULE_APPLY,
RULE_SHARE,
RULES_ACTIVE,
RULE_SHARE,
RULE_ON_COLUMN_NEW,
RULE_ON_COLUMN_APPLY,
RULE_ON_TABLE_NEW,
RULE_ON_TABLE_APPLY,
DUPLICATE_DETECTION,
TABLE_TYPE,
COLUMN_POSITION,