From d1aabf06e34bcbb4c45a6d2e71c346a52119fab7 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Wed, 27 May 2015 14:38:02 +0000
Subject: [PATCH] 81: Allow the creation and use of expressions on multi column
 in TDM portlet Task-Url: https://support.d4science.org/issues/81

Updated Dependency

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-extractcodelist-widget@115057 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 pom.xml                                                  | 9 +++++++++
 .../client/ExtractCodelistDetailsCard.java               | 3 ++-
 .../client/TargetColumnsSelectionPanel.java              | 2 +-
 .../ExtractCodelistWizardTD.gwt.xml                      | 2 ++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 21e2e1e..0f30d3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,6 +146,15 @@
 			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
+		
+		<!-- tabular-data-expression-widget -->
+		<dependency>
+			<groupId>org.gcube.portlets.user</groupId>
+			<artifactId>tabular-data-expression-widget</artifactId>
+			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+			<scope>provided</scope>
+		</dependency>
+		
 
 		<!-- tabular-data-column-widget-->
 		<dependency>
diff --git a/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/ExtractCodelistDetailsCard.java b/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/ExtractCodelistDetailsCard.java
index 21197d8..8f02b8d 100644
--- a/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/ExtractCodelistDetailsCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/ExtractCodelistDetailsCard.java
@@ -1,6 +1,7 @@
 package org.gcube.portlets.user.td.extractcodelistwidget.client;
 
-import org.gcube.portlets.user.td.columnwidget.client.properties.ColumnDataPropertiesCombo;
+
+import org.gcube.portlets.user.td.expressionwidget.client.properties.ColumnDataPropertiesCombo;
 import org.gcube.portlets.user.td.gwtservice.shared.extract.ExtractCodelistSession;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData;
diff --git a/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/TargetColumnsSelectionPanel.java b/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/TargetColumnsSelectionPanel.java
index fe3ac7c..f40128b 100644
--- a/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/TargetColumnsSelectionPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/TargetColumnsSelectionPanel.java
@@ -2,6 +2,7 @@ package org.gcube.portlets.user.td.extractcodelistwidget.client;
 
 import java.util.ArrayList;
 
+import org.gcube.portlets.user.td.expressionwidget.client.properties.ColumnDataPropertiesCombo;
 import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
 import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsLockedException;
 import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException;
@@ -11,7 +12,6 @@ import org.gcube.portlets.user.td.columnwidget.client.create.CreateDefColumnDial
 import org.gcube.portlets.user.td.columnwidget.client.create.CreateDefColumnListener;
 import org.gcube.portlets.user.td.columnwidget.client.dimension.CodelistSelectionDialog;
 import org.gcube.portlets.user.td.columnwidget.client.dimension.CodelistSelectionListener;
-import org.gcube.portlets.user.td.columnwidget.client.properties.ColumnDataPropertiesCombo;
 import org.gcube.portlets.user.td.columnwidget.client.properties.ExtractCodelistDefColumnPropertiesCombo;
 import org.gcube.portlets.user.td.columnwidget.client.resources.ResourceBundle;
 import org.gcube.portlets.user.td.columnwidget.client.utils.UtilsGXT3;
diff --git a/src/main/resources/org/gcube/portlets/user/td/extractcodelistwidget/ExtractCodelistWizardTD.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/extractcodelistwidget/ExtractCodelistWizardTD.gwt.xml
index 58e4c43..dfd597d 100644
--- a/src/main/resources/org/gcube/portlets/user/td/extractcodelistwidget/ExtractCodelistWizardTD.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/td/extractcodelistwidget/ExtractCodelistWizardTD.gwt.xml
@@ -19,6 +19,8 @@
   <inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" />
   <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.expressionwidget.ExpressionWidget' />
   <inherits name='org.gcube.portlets.user.td.columnwidget.ColumnWidget' />
   <inherits name='org.gcube.portlets.user.td.monitorwidget.MonitorWidgetTD' />