Shared C_Expression

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget@91758 82a268e6-3cf1-43bd-a215-b396298e98cf

src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionDialog.java

@@ -1,12 +1,13 @@
 package org.gcube.portlets.user.td.expressionwidget.client;
 
 import org.gcube.portlets.user.td.expressionwidget.client.resource.ExpressionResources;
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
 import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeCode;
+import com.google.web.bindery.event.shared.EventBus;
 
 import com.allen_sauer.gwt.log.client.Log;
 import com.google.gwt.user.client.rpc.AsyncCallback;
@@ -21,9 +22,10 @@ public class ColumnExpressionDialog extends Window {
 	protected ColumnData column=null;
 	protected TRId trId;
 	protected String columnName = null;
+	protected EventBus eventBus;
 
 	public ColumnExpressionDialog(String columnId,
-			ColumnTypeCode columnTypeCode, ColumnDataType dataTypeName) {
+			ColumnTypeCode columnTypeCode, ColumnDataType dataTypeName, EventBus eventBus) {
 		setWidth(WIDTH);
 		setHeight(HEIGHT);
 		setBodyBorder(false);
@@ -31,6 +33,7 @@ public class ColumnExpressionDialog extends Window {
 		setHeadingText("New Rule");
 		getHeader().setIcon(ExpressionResources.INSTANCE.rule());
 		
+		this.eventBus=eventBus;
 		column = new ColumnData();
 		column.setColumnId(columnId);
 		column.setDataTypeName(dataTypeName.toString());
@@ -39,7 +42,7 @@ public class ColumnExpressionDialog extends Window {
 		
 	}
 
-	public ColumnExpressionDialog(TRId trId, String columnName) {
+	public ColumnExpressionDialog(TRId trId, String columnName, EventBus eventBus) {
 		setWidth(WIDTH);
 		setHeight(HEIGHT);
 		setBodyBorder(false);
@@ -47,6 +50,7 @@ public class ColumnExpressionDialog extends Window {
 		setHeadingText("New Rule");
 		getHeader().setIcon(ExpressionResources.INSTANCE.rule());
 		
+		this.eventBus = eventBus;
 		this.trId = trId;
 		this.columnName = columnName;
 		load(trId, columnName);
@@ -61,7 +65,7 @@ public class ColumnExpressionDialog extends Window {
 				|| column.getTypeCode().compareTo(ColumnTypeCode.CODENAME.toString())==0
 				|| column.getTypeCode().compareTo(ColumnTypeCode.MEASURE.toString())==0) {
 			columnExpressionPanel = new ColumnExpressionPanel(this,
-				column);
+				column, eventBus);
 			add(columnExpressionPanel);
 		} else {
 			HTML errorMessage=new HTML("This type of column is not supported for now!");

src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionPanel.java

@@ -1,8 +1,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.expressionwidget.shared.model.C_Expression;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
+
+import com.google.web.bindery.event.shared.EventBus;
 
 import com.allen_sauer.gwt.log.client.Log;
 import com.sencha.gxt.cell.core.client.ButtonCell.IconAlign;
@@ -32,6 +34,7 @@ import com.sencha.gxt.widget.core.client.form.TextField;
 public class ColumnExpressionPanel extends FramedPanel {
 	protected String WIDTH = "640px";
 	protected String HEIGHT = "520px";
+	protected EventBus eventBus;
 	
 	protected ColumnExpressionDialog parent;
 	
@@ -45,9 +48,10 @@ public class ColumnExpressionPanel extends FramedPanel {
 	 * @param trId
 	 * @param columnName
 	 */
-	public ColumnExpressionPanel(ColumnExpressionDialog parent, ColumnData column) {
+	public ColumnExpressionPanel(ColumnExpressionDialog parent, ColumnData column, EventBus eventBus) {
 		this.parent=parent;
 		this.column = column;
+		this.eventBus=eventBus;
 		create();
 	}
 
@@ -187,6 +191,9 @@ public class ColumnExpressionPanel extends FramedPanel {
 	protected void applyRule() {
 		C_Expression exp=conditionWidget.getExpression();
 		parent.setExpression(exp);
+		
+		
+		
 	}
 	
 	protected void saveRule() {

src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ConditionWidget.java

@@ -9,9 +9,9 @@ import org.gcube.portlets.user.td.expressionwidget.client.operation.Operation;
 import org.gcube.portlets.user.td.expressionwidget.client.operation.OperationProperties;
 import org.gcube.portlets.user.td.expressionwidget.client.operation.OperationsStore;
 import org.gcube.portlets.user.td.expressionwidget.client.resource.ExpressionResources;
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.OperatorTypeMap;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 
 import com.allen_sauer.gwt.log.client.Log;
 import com.google.gwt.core.client.GWT;

src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ExpressionWidgetEntry.java

@@ -8,13 +8,18 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeC
 import com.allen_sauer.gwt.log.client.Log;
 import com.google.gwt.core.client.EntryPoint;
 import com.google.gwt.user.client.ui.RootPanel;
+import com.google.web.bindery.event.shared.EventBus;
+import com.google.web.bindery.event.shared.SimpleEventBus;
+
+
 
 public class ExpressionWidgetEntry  implements EntryPoint  {
-
+	protected EventBus eventBus;
 	
 	public void onModuleLoad() {
+		EventBus eventBus= new SimpleEventBus();
 		
-		ColumnExpressionDialog expressionDialog=new ColumnExpressionDialog("0", ColumnTypeCode.ATTRIBUTE, ColumnDataType.Integer);
+		ColumnExpressionDialog expressionDialog=new ColumnExpressionDialog("0", ColumnTypeCode.ATTRIBUTE, ColumnDataType.Integer, eventBus);
 		RootPanel.get().add(expressionDialog);
 		
 		Log.info("Hello!");

src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionService.java

@@ -6,7 +6,7 @@ package org.gcube.portlets.user.td.expressionwidget.client.rpc;
 
 
 import org.gcube.portlets.user.td.expressionwidget.shared.expression.ExpressionServiceException;
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;

src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionServiceAsync.java

@@ -3,7 +3,7 @@
  */
 package org.gcube.portlets.user.td.expressionwidget.client.rpc;
 
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.AsyncCallback;

src/main/java/org/gcube/portlets/user/td/expressionwidget/server/CExpressionMapServlet.java

@@ -14,7 +14,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 import org.gcube.data.analysis.tabulardata.expression.Expression;
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/org/gcube/portlets/user/td/expressionwidget/server/C_ExpressionParser.java

@@ -45,7 +45,6 @@ import org.gcube.data.analysis.tabulardata.model.datatype.value.TDNumeric;
 import org.gcube.data.analysis.tabulardata.model.datatype.value.TDText;
 import org.gcube.data.analysis.tabulardata.model.datatype.value.TDTypeValue;
 import org.gcube.data.analysis.tabulardata.model.table.TableId;
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.comparable.C_Equals;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.comparable.C_GreaterOrEquals;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.comparable.C_GreaterThan;
@@ -70,6 +69,7 @@ import org.gcube.portlets.user.td.expressionwidget.shared.model.logical.C_IsNull
 import org.gcube.portlets.user.td.expressionwidget.shared.model.logical.C_Not;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.logical.C_Or;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.logical.C_ValueIsIn;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/expression/C_ExpressionContainer.java

@@ -1,39 +0,0 @@
-package org.gcube.portlets.user.td.expressionwidget.shared.expression;
-
-import java.io.Serializable;
-
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
-
-public class C_ExpressionContainer implements Serializable {
-
-	private static final long serialVersionUID = -4021332410069520707L;
-
-	protected enum Contains {
-		C_Expression, Rule;
-	}
-
-	protected Contains id;
-	protected C_Expression exp;
-
-	public Contains getId() {
-		return id;
-	}
-
-	public void setId(Contains id) {
-		this.id = id;
-	}
-
-	public C_Expression getExp() {
-		return exp;
-	}
-
-	public void setExp(C_Expression exp) {
-		this.exp = exp;
-	}
-
-	@Override
-	public String toString() {
-		return "C_ExpressionContainer [id=" + id + ", exp=" + exp + "]";
-	}
-
-}

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/C_Expression.java

@@ -1,23 +0,0 @@
-package org.gcube.portlets.user.td.expressionwidget.shared.model;
-
-import java.io.Serializable;
-
-public class C_Expression implements Serializable{
-
-	
-	private static final long serialVersionUID = 7818512507606450235L;
-	
-	protected String id="Expression";
-
-	public String getId() {
-		return id;
-	}
-
-
-	@Override
-	public String toString() {
-		return "Expression [id=" + id + "]";
-	}
-	
-
-}

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/OperatorTypeMap.java

@@ -27,6 +27,7 @@ import org.gcube.portlets.user.td.expressionwidget.shared.model.logical.C_IsNull
 import org.gcube.portlets.user.td.expressionwidget.shared.model.logical.C_Not;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.logical.C_Or;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeMap;
 

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_Equals.java

@@ -1,7 +1,7 @@
 package org.gcube.portlets.user.td.expressionwidget.shared.model.composite.comparable;
 
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.C_OperatorType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 
 /**
  * 

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_GreaterOrEquals.java

@@ -1,7 +1,7 @@
 package org.gcube.portlets.user.td.expressionwidget.shared.model.composite.comparable;
 
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.C_OperatorType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 
 /**
  * 

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_GreaterThan.java

@@ -1,7 +1,7 @@
 package org.gcube.portlets.user.td.expressionwidget.shared.model.composite.comparable;
 
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.C_OperatorType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 
 /**
  * 

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_LessOrEquals.java

@@ -1,7 +1,7 @@
 package org.gcube.portlets.user.td.expressionwidget.shared.model.composite.comparable;
 
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.C_OperatorType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 
 /**
  * 

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_LessThan.java

@@ -1,7 +1,7 @@
 package org.gcube.portlets.user.td.expressionwidget.shared.model.composite.comparable;
 
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.C_OperatorType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 
 /**
  * 

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_NotEquals.java

@@ -1,7 +1,7 @@
 package org.gcube.portlets.user.td.expressionwidget.shared.model.composite.comparable;
 
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.C_OperatorType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 
 /**
  * 

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_NotGreater.java

@@ -1,7 +1,7 @@
 package org.gcube.portlets.user.td.expressionwidget.shared.model.composite.comparable;
 
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.C_OperatorType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 
 /**
  * 

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_NotLess.java

@@ -1,7 +1,7 @@
 package org.gcube.portlets.user.td.expressionwidget.shared.model.composite.comparable;
 
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.C_OperatorType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 
 /**
  * 

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextBeginsWith.java

@@ -1,7 +1,7 @@
 package org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text;
 
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.C_OperatorType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 
 /**
  * 

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextContains.java

@@ -1,7 +1,7 @@
 package org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text;
 
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.C_OperatorType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 
 /**
  * 

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextEndsWith.java

@@ -1,7 +1,7 @@
 package org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text;
 
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.C_OperatorType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 
 /**
  * 

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextMatchSQLRegexp.java

@@ -1,7 +1,7 @@
 package org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text;
 
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.C_OperatorType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 
 /**
  * 

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/C_Leaf.java

@@ -1,6 +1,6 @@
 package org.gcube.portlets.user.td.expressionwidget.shared.model.leaf;
 
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 
 public class C_Leaf extends C_Expression {
 

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_And.java

@@ -3,8 +3,8 @@ package org.gcube.portlets.user.td.expressionwidget.shared.model.logical;
 import java.util.Arrays;
 import java.util.List;
 
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.C_OperatorType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 
 /**
  * 

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Between.java

@@ -1,7 +1,7 @@
 package org.gcube.portlets.user.td.expressionwidget.shared.model.logical;
 
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.C_OperatorType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 
 /**
  * 

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_IsNotNull.java

@@ -1,7 +1,7 @@
 package org.gcube.portlets.user.td.expressionwidget.shared.model.logical;
 
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.C_OperatorType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 
 /**
  * 

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_IsNull.java

@@ -1,7 +1,7 @@
 package org.gcube.portlets.user.td.expressionwidget.shared.model.logical;
 
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.C_OperatorType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 
 /**
  * 

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Not.java

@@ -1,7 +1,7 @@
 package org.gcube.portlets.user.td.expressionwidget.shared.model.logical;
 
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.C_OperatorType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 
 /**
  * 

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Or.java

@@ -3,8 +3,8 @@ package org.gcube.portlets.user.td.expressionwidget.shared.model.logical;
 import java.util.Arrays;
 import java.util.List;
 
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.C_OperatorType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 
 /**
  * 

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_ValueIsIn.java

@@ -1,7 +1,7 @@
 package org.gcube.portlets.user.td.expressionwidget.shared.model.logical;
 
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
 import org.gcube.portlets.user.td.expressionwidget.shared.model.C_OperatorType;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 
 /**
  * 

src/test/java/org/gcube/portlets/user/td/expressionwidget/client/TestCExpressionServlet.java

@@ -10,7 +10,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 
 import org.gcube.data.analysis.tabulardata.expression.Expression;
-import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression;
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
 import org.junit.Test;
 
 public class TestCExpressionServlet {