diff --git a/.classpath b/.classpath index 3a5b2af..8ed3615 100644 --- a/.classpath +++ b/.classpath @@ -30,7 +30,6 @@ - diff --git a/pom.xml b/pom.xml index a2b1c32..11708cf 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ tabular-data-expression-widget - tabular-data-expression-widget allows to create expression on column of table + tabular-data-expression-widget allows to create expression on tabular resource https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget @@ -312,5 +312,4 @@ - war diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/ExpressionWidget.gwt.xml b/src/main/java/org/gcube/portlets/user/td/expressionwidget/ExpressionWidget.gwt.xml index 71ab088..f0d8141 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/ExpressionWidget.gwt.xml +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/ExpressionWidget.gwt.xml @@ -22,7 +22,7 @@ - + diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionPanel.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionPanel.java index 1b71038..a5a64b1 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionPanel.java @@ -2,7 +2,10 @@ package org.gcube.portlets.user.td.expressionwidget.client; import org.gcube.portlets.user.td.expressionwidget.client.resource.ExpressionResources; import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData; +import org.gcube.portlets.user.td.widgetcommonevent.client.event.ExpressionEvent; +import org.gcube.portlets.user.td.widgetcommonevent.client.type.ExpressionType; import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression; +import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_ExpressionContainer; import com.google.web.bindery.event.shared.EventBus; @@ -189,11 +192,16 @@ public class ColumnExpressionPanel extends FramedPanel { protected void applyRule() { + Log.debug("Apply"); C_Expression exp=conditionWidget.getExpression(); parent.setExpression(exp); - - - + ExpressionEvent expressionEvent= new ExpressionEvent(ExpressionType.CREATECOLUMNEXPRESSION); + C_ExpressionContainer container=new C_ExpressionContainer(); + container.setId(C_ExpressionContainer.Contains.C_Expression); + container.setExp(exp); + expressionEvent.setC_ExpressionContainer(container); + Log.debug(expressionEvent.toString()); + eventBus.fireEvent(expressionEvent); } protected void saveRule() { diff --git a/src/main/resources/org/gcube/portlets/user/td/expressionwidget/ExpressionWidget.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/expressionwidget/ExpressionWidget.gwt.xml index 8349886..80228c1 100644 --- a/src/main/resources/org/gcube/portlets/user/td/expressionwidget/ExpressionWidget.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/td/expressionwidget/ExpressionWidget.gwt.xml @@ -22,7 +22,7 @@ - +