From 4e31d36d5156da7493836953d888a1fb9079a540 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Tue, 18 Feb 2014 17:40:45 +0000
Subject: [PATCH] Minor Updated

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@91890 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .settings/org.eclipse.wst.common.component    | 18 ++--------
 pom.xml                                       | 35 ++++++++++---------
 .../user/td/client/TabularDataController.java | 16 ++++++++-
 .../user/td/tabulardataportlet.gwt.xml        |  3 +-
 .../user/td/tabulardataportlet.gwt.xml        |  1 +
 src/main/webapp/WEB-INF/web.xml               | 23 ++++++++++++
 src/main/webapp/tabulardataportlet.html       |  2 +-
 7 files changed, 64 insertions(+), 34 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 053b6a7..1d3727b 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,6 +4,9 @@
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <dependent-module archiveName="tabular-data-expression-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-expression-widget/tabular-data-expression-widget">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <dependent-module archiveName="tabular-data-widgetx-tdx-source-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widgetx-tdx-source/tabular-data-widgetx-tdx-source">
             <dependency-type>uses</dependency-type>
         </dependent-module>
@@ -19,30 +22,15 @@
         <dependent-module archiveName="tabular-data-wizard-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-wizard-widget/tabular-data-wizard-widget">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="tabular-data-csv-import-widget-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-csv-import-widget/tabular-data-csv-import-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <dependent-module archiveName="tabular-data-sdmx-import-widget-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-sdmx-import-widget/tabular-data-sdmx-import-widget">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="tabular-data-csv-export-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-csv-export-widget/tabular-data-csv-export-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <dependent-module archiveName="tabular-data-sdmx-export-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-sdmx-export-widget/tabular-data-sdmx-export-widget">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <dependent-module archiveName="tabular-data-toolbox-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-toolbox-widget/tabular-data-toolbox-widget">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="tabular-data-information-widget-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-information-widget/tabular-data-information-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="tabular-data-metadata-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-metadata-widget/tabular-data-metadata-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="tabular-data-column-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-column-widget/tabular-data-column-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <property name="context-root" value="tabular-data-portlet"/>
         <property name="java-output-path" value="/tabular-data-portlet/target/tabular-data-portlet-2.0.0-SNAPSHOT/WEB-INF/classes"/>
     </wb-module>
diff --git a/pom.xml b/pom.xml
index e14ab51..95bdd98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,9 +139,16 @@
 			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
+		
+		
+		<!-- TD Expression -->
+		<dependency>
+			<groupId>org.gcube.portlets.user</groupId>
+			<artifactId>tabular-data-expression-widget</artifactId>
+			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+		</dependency>
 
-
-		<!-- TD Source -->
+		<!-- TDX Source -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>tabular-data-widgetx-tdx-source</artifactId>
@@ -173,27 +180,27 @@
 			<version>[1.2.0-SNAPSHOT, 2.0.0-common)</version>
 		</dependency>
 
-		<!-- tabular-data-widget-common-event 	-->
+		<!-- tabular-data-widget-common-event -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>tabular-data-widget-common-event</artifactId>
 			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 		</dependency>
-		
+
 		<!-- tabular-data-gwt-service -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>tabular-data-gwt-service</artifactId>
 			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
 		</dependency>
-		
+
 		<!-- tabular-data-wizard-widget -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>tabular-data-wizard-widget</artifactId>
 			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 		</dependency>
-		
+
 
 		<!-- tabular-data-csv-import-widget -->
 		<dependency>
@@ -221,7 +228,7 @@
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>tabular-data-csv-export-widget</artifactId>
 			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
-		</dependency> 
+		</dependency>
 
 		<!-- tabular-data-sdmx-export-widget -->
 		<dependency>
@@ -229,7 +236,7 @@
 			<artifactId>tabular-data-sdmx-export-widget</artifactId>
 			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 		</dependency>
-		
+
 		<!-- tabular-data-toolbox-widget -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
@@ -244,13 +251,9 @@
 			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT]</version>
 		</dependency>
 
-		<!-- tabular-data-template 
-		<dependency>
-			<groupId>org.gcube.portlets.user.tdtemplate</groupId>
-			<artifactId>tabular-data-template</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
-		</dependency>
-		-->
+		<!-- tabular-data-template <dependency> <groupId>org.gcube.portlets.user.tdtemplate</groupId> 
+			<artifactId>tabular-data-template</artifactId> <version>1.0.0-SNAPSHOT</version> 
+			</dependency> -->
 
 		<!-- LOGGING -->
 		<dependency>
@@ -263,7 +266,7 @@
 			<artifactId>slf4j-api</artifactId>
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
index 4699b05..553aefc 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
@@ -5,6 +5,7 @@ package org.gcube.portlets.user.td.client;
 
 import org.gcube.portlets.user.td.csvexportwidget.client.CSVExportWizardTD;
 import org.gcube.portlets.user.td.csvimportwidget.client.CSVImportWizardTD;
+import org.gcube.portlets.user.td.expressionwidget.client.ColumnFilterDialog;
 import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
 import org.gcube.portlets.user.td.openwidget.client.TDOpen;
 import org.gcube.portlets.user.td.sdmxexportwidget.client.SDMXExportWizardTD;
@@ -630,6 +631,15 @@ public class TabularDataController {
 		
 	}
 	
+	protected void openColumnFilter(String columnName) {
+		Log.debug("Request Open Column Filter Dialog");
+		if (trId != null) {
+			ColumnFilterDialog cfDialog=new ColumnFilterDialog(trId, columnName, eventBus);
+			cfDialog.show();
+		}
+	}
+	
+	
 	protected void openColumnType() {
 		openColumnType(null);
 	}
@@ -645,6 +655,10 @@ public class TabularDataController {
 		}
 	}
 	
+	
+	
+	
+	
 	protected void openColumnDelete() {
 		openColumnDelete(null);
 	}
@@ -712,7 +726,7 @@ public class TabularDataController {
 						} else {
 							if (opId.compareTo(GridHeaderOperationId.COLUMNFILTER
 									.toString()) == 0) {
-
+								openColumnFilter(columnName);
 							} else {
 								if (opId.compareTo(GridHeaderOperationId.ANNOTATIONADD
 										.toString()) == 0) {
diff --git a/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml b/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
index 8e05ecd..b352287 100644
--- a/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
+++ b/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
@@ -17,6 +17,7 @@
 	<inherits name='org.gcube.portlets.user.td.gwtservice.TDGWTService' />	
 	<inherits name='org.gcube.portlets.user.td.wizardwidget.Wizard' />
 	<inherits name='org.gcube.portlets.user.td.widgetcommonevent.WidgetCommonEvent' />
+	<inherits name='org.gcube.portlets.user.td.expressionwidget.ExpressionWidget' />
 	
 	<inherits name='org.gcube.portlets.user.td.toolboxwidget.ToolBox' />
     <inherits name='org.gcube.portlets.user.td.openwidget.TDOpen' />
@@ -35,7 +36,7 @@
 	<!-- Specify the app entry point class. -->
 	<entry-point class='org.gcube.portlets.user.td.client.TabularDataPortlet' />
 
-	<!--  <set-property name="log_DivLogger" value="ENABLED" /> -->
+	<!--  <set-property name="log_DivLogger" value="DISABLED" /> -->
 	<set-property name="log_DivLogger" value="DISABLED" />
 	<set-property name="log_ConsoleLogger" value="DISABLED" />
 	<set-property name="log_FirebugLogger" value="DISABLED" />
diff --git a/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
index 1f8ac46..4975174 100644
--- a/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
@@ -17,6 +17,7 @@
 	<inherits name='org.gcube.portlets.user.td.gwtservice.TDGWTService' />	
 	<inherits name='org.gcube.portlets.user.td.wizardwidget.Wizard' />
 	<inherits name='org.gcube.portlets.user.td.widgetcommonevent.WidgetCommonEvent' />
+	<inherits name='org.gcube.portlets.user.td.expressionwidget.ExpressionWidget' />
 	
 	<inherits name='org.gcube.portlets.user.td.toolboxwidget.ToolBox' />
     <inherits name='org.gcube.portlets.user.td.openwidget.TDOpen' />
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index d638468..75bfc33 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -29,6 +29,16 @@
 		<servlet-class>org.gcube.portlets.user.td.gwtservice.server.TDGWTServiceImpl</servlet-class>
 	</servlet>
 	
+	<!-- TD Expression -->
+	<servlet>
+		<servlet-name>ExpressionService</servlet-name>
+		<servlet-class>org.gcube.portlets.user.td.expressionwidget.server.ExpressionServiceImpl</servlet-class>
+	</servlet>
+	
+	<servlet>
+		<servlet-name>CExpressionMapServlet</servlet-name>
+		<servlet-class>org.gcube.portlets.user.td.expressionwidget.server.CExpressionMapServlet</servlet-class>
+	</servlet>
 	
 	
 	<!-- TD Tasks Widget Service  -->
@@ -124,6 +134,19 @@
 		<url-pattern>/tabulardataportlet/TDGWTService</url-pattern>
 	</servlet-mapping>
 	
+	<!-- TD Expression -->
+	<servlet-mapping>
+		<servlet-name>ExpressionService</servlet-name>
+		<url-pattern>/tabulardataportlet/ExpressionService</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>CExpressionMapServlet</servlet-name>
+		<url-pattern>/tabulardataportlet/CExpressionMap</url-pattern>
+	</servlet-mapping>
+	
+	
+	
+	
 	<!-- TD Tasks Widget Service  -->
 	<servlet-mapping>
 		<servlet-name>tabularDataTasksWidgetService</servlet-name>
diff --git a/src/main/webapp/tabulardataportlet.html b/src/main/webapp/tabulardataportlet.html
index 9860255..54f1a70 100644
--- a/src/main/webapp/tabulardataportlet.html
+++ b/src/main/webapp/tabulardataportlet.html
@@ -13,7 +13,7 @@
     <!--                                           -->
     <!-- Any title is fine                         -->
     <!--                                           -->
-    <title>Tabular Data Porlet</title>
+    <title>Tabular Data Portlet</title>
 
     <!--                                           -->
     <!-- This script loads your compiled module.   -->