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,