From ac6d6d8706f1f415dbe72f39ef6e1f649f9690c3 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Mon, 17 Feb 2014 11:03:47 +0000 Subject: [PATCH] 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 --- .../client/ColumnExpressionDialog.java | 12 ++++-- .../client/ColumnExpressionPanel.java | 15 +++++-- .../client/ConditionWidget.java | 2 +- .../client/ExpressionWidgetEntry.java | 9 ++++- .../client/rpc/ExpressionService.java | 2 +- .../client/rpc/ExpressionServiceAsync.java | 2 +- .../server/CExpressionMapServlet.java | 2 +- .../server/C_ExpressionParser.java | 2 +- .../expression/C_ExpressionContainer.java | 39 ------------------- .../shared/model/C_Expression.java | 23 ----------- .../shared/model/OperatorTypeMap.java | 1 + .../model/composite/comparable/C_Equals.java | 2 +- .../comparable/C_GreaterOrEquals.java | 2 +- .../composite/comparable/C_GreaterThan.java | 2 +- .../composite/comparable/C_LessOrEquals.java | 2 +- .../composite/comparable/C_LessThan.java | 2 +- .../composite/comparable/C_NotEquals.java | 2 +- .../composite/comparable/C_NotGreater.java | 2 +- .../model/composite/comparable/C_NotLess.java | 2 +- .../composite/text/C_TextBeginsWith.java | 2 +- .../model/composite/text/C_TextContains.java | 2 +- .../model/composite/text/C_TextEndsWith.java | 2 +- .../composite/text/C_TextMatchSQLRegexp.java | 2 +- .../shared/model/leaf/C_Leaf.java | 2 +- .../shared/model/logical/C_And.java | 2 +- .../shared/model/logical/C_Between.java | 2 +- .../shared/model/logical/C_IsNotNull.java | 2 +- .../shared/model/logical/C_IsNull.java | 2 +- .../shared/model/logical/C_Not.java | 2 +- .../shared/model/logical/C_Or.java | 2 +- .../shared/model/logical/C_ValueIsIn.java | 2 +- .../client/TestCExpressionServlet.java | 2 +- 32 files changed, 53 insertions(+), 98 deletions(-) delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/expression/C_ExpressionContainer.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/C_Expression.java diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionDialog.java index 498207a..3991aba 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionDialog.java +++ b/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!"); 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 63a6e8e..1b71038 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 @@ -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,12 +34,13 @@ 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; protected ColumnData column; protected ConditionWidget conditionWidget; - + /** @@ -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() { @@ -199,7 +206,7 @@ public class ColumnExpressionPanel extends FramedPanel { } protected void cancelRule() { - + } diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ConditionWidget.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ConditionWidget.java index 1d4ceb6..6075aa7 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ConditionWidget.java +++ b/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; diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ExpressionWidgetEntry.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ExpressionWidgetEntry.java index 9ae007e..4c4438c 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ExpressionWidgetEntry.java +++ b/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!"); diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionService.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionService.java index bc6cbab..c103257 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionService.java +++ b/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; diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionServiceAsync.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionServiceAsync.java index 59ae4d2..673a808 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionServiceAsync.java +++ b/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; diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/CExpressionMapServlet.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/CExpressionMapServlet.java index 5dd2efd..f6e9d67 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/CExpressionMapServlet.java +++ b/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; diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/C_ExpressionParser.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/C_ExpressionParser.java index 67be1bd..3caa391 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/C_ExpressionParser.java +++ b/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; diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/expression/C_ExpressionContainer.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/expression/C_ExpressionContainer.java deleted file mode 100644 index 48edeb2..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/expression/C_ExpressionContainer.java +++ /dev/null @@ -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 + "]"; - } - -} diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/C_Expression.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/C_Expression.java deleted file mode 100644 index 028ef4d..0000000 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/C_Expression.java +++ /dev/null @@ -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 + "]"; - } - - -} diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/OperatorTypeMap.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/OperatorTypeMap.java index 1737817..7a755c1 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/OperatorTypeMap.java +++ b/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; diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_Equals.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_Equals.java index be6078b..978555a 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_Equals.java +++ b/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; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_GreaterOrEquals.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_GreaterOrEquals.java index 7636ec8..2fc08c1 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_GreaterOrEquals.java +++ b/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; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_GreaterThan.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_GreaterThan.java index 58dcd2a..22658fc 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_GreaterThan.java +++ b/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; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_LessOrEquals.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_LessOrEquals.java index affdcdf..f70a5a1 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_LessOrEquals.java +++ b/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; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_LessThan.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_LessThan.java index 5c8fad2..55ea010 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_LessThan.java +++ b/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; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_NotEquals.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_NotEquals.java index 714cb9e..e5649d4 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_NotEquals.java +++ b/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; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_NotGreater.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_NotGreater.java index 07b708e..8202a0c 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_NotGreater.java +++ b/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; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_NotLess.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_NotLess.java index 30d2b61..5739924 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/comparable/C_NotLess.java +++ b/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; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextBeginsWith.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextBeginsWith.java index c54fd89..6bd6b62 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextBeginsWith.java +++ b/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; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextContains.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextContains.java index b00e3e1..6b1c7c3 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextContains.java +++ b/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; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextEndsWith.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextEndsWith.java index 9065ff8..68c6b20 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextEndsWith.java +++ b/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; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextMatchSQLRegexp.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextMatchSQLRegexp.java index 35974c7..6d59b1f 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextMatchSQLRegexp.java +++ b/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; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/C_Leaf.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/C_Leaf.java index b2e4400..24470b7 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/C_Leaf.java +++ b/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 { diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_And.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_And.java index 4a61a3d..59a948c 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_And.java +++ b/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; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Between.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Between.java index ef94a90..868b196 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Between.java +++ b/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; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_IsNotNull.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_IsNotNull.java index 4062c27..924b6db 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_IsNotNull.java +++ b/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; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_IsNull.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_IsNull.java index e4abb0c..b0bead9 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_IsNull.java +++ b/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; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Not.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Not.java index 07a464d..2a5c5bd 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Not.java +++ b/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; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Or.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Or.java index 06fe255..35f1d5e 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Or.java +++ b/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; /** * diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_ValueIsIn.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_ValueIsIn.java index 2e28c2e..9c1272c 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_ValueIsIn.java +++ b/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; /** * diff --git a/src/test/java/org/gcube/portlets/user/td/expressionwidget/client/TestCExpressionServlet.java b/src/test/java/org/gcube/portlets/user/td/expressionwidget/client/TestCExpressionServlet.java index 91364cd..39301dc 100644 --- a/src/test/java/org/gcube/portlets/user/td/expressionwidget/client/TestCExpressionServlet.java +++ b/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 {