gCubeSystem
/
tabular-data-gwt-service
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Giancarlo Panichi 2014-07-18 16:37:47 +00:00
parent c36e180c22
commit c209237ed0
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4Union.java
View File

@ -51,7 +51,6 @@ public class OpExecution4Union extends OpExecutionBuilder {
ColumnMap columnMap = new ColumnMap(); ColumnMap columnMap = new ColumnMap();
ArrayList<Map<String, Object>> compositeColumnMap = columnMap ArrayList<Map<String, Object>> compositeColumnMap = columnMap
.genColumnMap(unionSession); .genColumnMap(unionSession);
map.put(Constants.PARAMETER_UNION_COMPOSITE, compositeColumnMap); map.put(Constants.PARAMETER_UNION_COMPOSITE, compositeColumnMap);

17
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/union/UnionColumnsMapping.java
View File

@ -14,6 +14,7 @@ public class UnionColumnsMapping implements Serializable {
private static final long serialVersionUID = -8971216501310276805L; private static final long serialVersionUID = -8971216501310276805L;
protected String columnLabel;
protected ColumnData sourceColumn; protected ColumnData sourceColumn;
protected ColumnData targetColumn; 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.sourceColumn=sourceColumn;
this.targetColumn=targetColumn; this.targetColumn=targetColumn;
} }
@ -41,11 +43,20 @@ public class UnionColumnsMapping implements Serializable {
public void setTargetColumn(ColumnData targetColumn) { public void setTargetColumn(ColumnData targetColumn) {
this.targetColumn = targetColumn; this.targetColumn = targetColumn;
} }
public String getColumnLabel() {
return columnLabel;
}
public void setColumnLabel(String columnLabel) {
this.columnLabel = columnLabel;
}
@Override @Override
public String toString() { public String toString() {
return "UnionColumnsMapping [sourceColumn=" + sourceColumn return "UnionColumnsMapping [columnLabel=" + columnLabel
+ ", targetColumn=" + targetColumn + "]"; + ", sourceColumn=" + sourceColumn + ", targetColumn="
+ targetColumn + "]";
} }