From 3d04a1fe1e64949f5e7e3390c5a76aa816509b21 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Mon, 17 Feb 2014 10:38:49 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget@91753 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../server/CExpressionMapServlet.java | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) 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 ff8d481..5dd2efd 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 @@ -6,8 +6,6 @@ package org.gcube.portlets.user.td.expressionwidget.server; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import java.util.ArrayList; -import java.util.List; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; @@ -16,12 +14,6 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.gcube.data.analysis.tabulardata.expression.Expression; -import org.gcube.data.analysis.tabulardata.expression.composite.comparable.GreaterThan; -import org.gcube.data.analysis.tabulardata.expression.leaf.ColumnReferencePlaceholder; -import org.gcube.data.analysis.tabulardata.expression.leaf.ConstantList; -import org.gcube.data.analysis.tabulardata.model.datatype.IntegerType; -import org.gcube.data.analysis.tabulardata.model.datatype.value.TDInteger; -import org.gcube.data.analysis.tabulardata.model.datatype.value.TDTypeValue; import org.gcube.portlets.user.td.expressionwidget.shared.model.C_Expression; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -94,12 +86,8 @@ public class CExpressionMapServlet extends HttpServlet { } protected Expression parse(C_Expression exp) { - List args = new ArrayList(); - TDInteger value = new TDInteger(1); - args.add(value); - Expression e = new GreaterThan(new ColumnReferencePlaceholder( - new IntegerType(), "1"), new ConstantList(args)); - return e; + C_ExpressionParser parser=new C_ExpressionParser(); + return parser.parse(exp); } }