From 7f456daef722751538e4be71dd3810372786f26c Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Fri, 7 Nov 2014 18:02:00 +0000
Subject: [PATCH] Updated Replace by External Column

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@101524 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../OpExecution4ReplaceByExternal.java        |  3 +-
 .../ReplaceByExternalSession.java             | 43 +++++++++++++++++--
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceByExternal.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceByExternal.java
index d2037e9..a470cff 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceByExternal.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ReplaceByExternal.java
@@ -96,7 +96,8 @@ public class OpExecution4ReplaceByExternal extends OpExecutionBuilder {
 		map.put(Constants.PARAMETER_REPLACE_BY_EXPRESSION_COLUMN_VALUE,
 				replaceColumn);
 
-		invocation = new OperationExecution(
+		
+		invocation = new OperationExecution(replaceByExternalSession.getCurrentColumn().getColumnId(),
 				operationDefinition.getOperationId(), map);
 
 		
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/replacebyexternal/ReplaceByExternalSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/replacebyexternal/ReplaceByExternalSession.java
index 45cef5c..b2a41c3 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/replacebyexternal/ReplaceByExternalSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/replacebyexternal/ReplaceByExternalSession.java
@@ -19,7 +19,10 @@ public class ReplaceByExternalSession implements Serializable {
 	protected TRId trId;
 	protected TabResource currentTabularResource;
 	protected TabResource externalTabularResource;
+	protected ColumnData currentColumn;
 	protected ColumnData replaceColumn;
+	protected ArrayList<ColumnData> currentColumns;
+	protected ArrayList<ColumnData> externalColumns;
 	protected ArrayList<ReplaceByExternalColumnsMapping> columnsMatch;
 
 	public ReplaceByExternalSession() {
@@ -31,18 +34,26 @@ public class ReplaceByExternalSession implements Serializable {
 	 * @param trId
 	 * @param currentTabularResource
 	 * @param externalTabularResource
+	 * @param currentColumn
 	 * @param replaceColumn
+	 * @param currentColumns
+	 * @param externalColumns
 	 * @param columnsMatch
 	 */
 	public ReplaceByExternalSession(TRId trId,
 			TabResource currentTabularResource,
-			TabResource externalTabularResource, ColumnData replaceColumn,
+			TabResource externalTabularResource, ColumnData currentColumn,
+			ColumnData replaceColumn, ArrayList<ColumnData> currentColumns,
+			ArrayList<ColumnData> externalColumns,
 			ArrayList<ReplaceByExternalColumnsMapping> columnsMatch) {
 		super();
 		this.trId = trId;
 		this.currentTabularResource = currentTabularResource;
 		this.externalTabularResource = externalTabularResource;
+		this.currentColumn = currentColumn;
 		this.replaceColumn = replaceColumn;
+		this.currentColumns = currentColumns;
+		this.externalColumns = externalColumns;
 		this.columnsMatch = columnsMatch;
 	}
 
@@ -70,6 +81,14 @@ public class ReplaceByExternalSession implements Serializable {
 		this.externalTabularResource = externalTabularResource;
 	}
 
+	public ColumnData getCurrentColumn() {
+		return currentColumn;
+	}
+
+	public void setCurrentColumn(ColumnData currentColumn) {
+		this.currentColumn = currentColumn;
+	}
+
 	public ColumnData getReplaceColumn() {
 		return replaceColumn;
 	}
@@ -78,6 +97,22 @@ public class ReplaceByExternalSession implements Serializable {
 		this.replaceColumn = replaceColumn;
 	}
 
+	public ArrayList<ColumnData> getCurrentColumns() {
+		return currentColumns;
+	}
+
+	public void setCurrentColumns(ArrayList<ColumnData> currentColumns) {
+		this.currentColumns = currentColumns;
+	}
+
+	public ArrayList<ColumnData> getExternalColumns() {
+		return externalColumns;
+	}
+
+	public void setExternalColumns(ArrayList<ColumnData> externalColumns) {
+		this.externalColumns = externalColumns;
+	}
+
 	public ArrayList<ReplaceByExternalColumnsMapping> getColumnsMatch() {
 		return columnsMatch;
 	}
@@ -92,10 +127,10 @@ public class ReplaceByExternalSession implements Serializable {
 		return "ReplaceByExternalSession [trId=" + trId
 				+ ", currentTabularResource=" + currentTabularResource
 				+ ", externalTabularResource=" + externalTabularResource
-				+ ", replaceColumn=" + replaceColumn + ", columnsMatch="
+				+ ", currentColumn=" + currentColumn + ", replaceColumn="
+				+ replaceColumn + ", currentColumns=" + currentColumns
+				+ ", externalColumns=" + externalColumns + ", columnsMatch="
 				+ columnsMatch + "]";
 	}
 
-	
-
 }