From c209237ed0ff15de69189ba70e7ceefab2a5bd01 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 18 Jul 2014 16:37:47 +0000 Subject: [PATCH] Minor Updated git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@98816 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../server/opexecution/OpExecution4Union.java | 1 - .../shared/tr/union/UnionColumnsMapping.java | 17 ++++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Union.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Union.java index 353bf9e..ba8c810 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Union.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Union.java @@ -51,7 +51,6 @@ public class OpExecution4Union extends OpExecutionBuilder { ColumnMap columnMap = new ColumnMap(); ArrayList> compositeColumnMap = columnMap .genColumnMap(unionSession); - map.put(Constants.PARAMETER_UNION_COMPOSITE, compositeColumnMap); diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/union/UnionColumnsMapping.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/union/UnionColumnsMapping.java index f254ec0..033a35e 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/union/UnionColumnsMapping.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/union/UnionColumnsMapping.java @@ -14,6 +14,7 @@ public class UnionColumnsMapping implements Serializable { private static final long serialVersionUID = -8971216501310276805L; + protected String columnLabel; protected ColumnData sourceColumn; protected ColumnData targetColumn; @@ -21,7 +22,8 @@ public class UnionColumnsMapping implements Serializable { } - public UnionColumnsMapping(ColumnData sourceColumn,ColumnData targetColumn){ + public UnionColumnsMapping(String columnLabel,ColumnData sourceColumn,ColumnData targetColumn){ + this.columnLabel=columnLabel; this.sourceColumn=sourceColumn; this.targetColumn=targetColumn; } @@ -41,11 +43,20 @@ public class UnionColumnsMapping implements Serializable { public void setTargetColumn(ColumnData targetColumn) { this.targetColumn = targetColumn; } + + public String getColumnLabel() { + return columnLabel; + } + + public void setColumnLabel(String columnLabel) { + this.columnLabel = columnLabel; + } @Override public String toString() { - return "UnionColumnsMapping [sourceColumn=" + sourceColumn - + ", targetColumn=" + targetColumn + "]"; + return "UnionColumnsMapping [columnLabel=" + columnLabel + + ", sourceColumn=" + sourceColumn + ", targetColumn=" + + targetColumn + "]"; }