From 32ccfbb5ba6be83349412fe79caaa06f139d6a05 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 26 May 2015 12:42:43 +0000 Subject: [PATCH] 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 --- .../expression/C_ExpressionContainer.java | 41 +++++-------------- .../client/type/RibbonType.java | 8 ++-- 2 files changed, 15 insertions(+), 34 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/C_ExpressionContainer.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/C_ExpressionContainer.java index 92a4147..66a18c9 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/C_ExpressionContainer.java +++ b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/C_ExpressionContainer.java @@ -4,11 +4,10 @@ import java.io.Serializable; import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression; - /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author giancarlo email: g.panichi@isti.cnr.it * */ 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 + "]"; } - - - - } diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/RibbonType.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/RibbonType.java index 8547f8a..cb69123 100644 --- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/RibbonType.java +++ b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/type/RibbonType.java @@ -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,