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
This commit is contained in:
parent
6861cf86fe
commit
7f456daef7
|
@ -96,7 +96,8 @@ public class OpExecution4ReplaceByExternal extends OpExecutionBuilder {
|
||||||
map.put(Constants.PARAMETER_REPLACE_BY_EXPRESSION_COLUMN_VALUE,
|
map.put(Constants.PARAMETER_REPLACE_BY_EXPRESSION_COLUMN_VALUE,
|
||||||
replaceColumn);
|
replaceColumn);
|
||||||
|
|
||||||
invocation = new OperationExecution(
|
|
||||||
|
invocation = new OperationExecution(replaceByExternalSession.getCurrentColumn().getColumnId(),
|
||||||
operationDefinition.getOperationId(), map);
|
operationDefinition.getOperationId(), map);
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,10 @@ public class ReplaceByExternalSession implements Serializable {
|
||||||
protected TRId trId;
|
protected TRId trId;
|
||||||
protected TabResource currentTabularResource;
|
protected TabResource currentTabularResource;
|
||||||
protected TabResource externalTabularResource;
|
protected TabResource externalTabularResource;
|
||||||
|
protected ColumnData currentColumn;
|
||||||
protected ColumnData replaceColumn;
|
protected ColumnData replaceColumn;
|
||||||
|
protected ArrayList<ColumnData> currentColumns;
|
||||||
|
protected ArrayList<ColumnData> externalColumns;
|
||||||
protected ArrayList<ReplaceByExternalColumnsMapping> columnsMatch;
|
protected ArrayList<ReplaceByExternalColumnsMapping> columnsMatch;
|
||||||
|
|
||||||
public ReplaceByExternalSession() {
|
public ReplaceByExternalSession() {
|
||||||
|
@ -31,18 +34,26 @@ public class ReplaceByExternalSession implements Serializable {
|
||||||
* @param trId
|
* @param trId
|
||||||
* @param currentTabularResource
|
* @param currentTabularResource
|
||||||
* @param externalTabularResource
|
* @param externalTabularResource
|
||||||
|
* @param currentColumn
|
||||||
* @param replaceColumn
|
* @param replaceColumn
|
||||||
|
* @param currentColumns
|
||||||
|
* @param externalColumns
|
||||||
* @param columnsMatch
|
* @param columnsMatch
|
||||||
*/
|
*/
|
||||||
public ReplaceByExternalSession(TRId trId,
|
public ReplaceByExternalSession(TRId trId,
|
||||||
TabResource currentTabularResource,
|
TabResource currentTabularResource,
|
||||||
TabResource externalTabularResource, ColumnData replaceColumn,
|
TabResource externalTabularResource, ColumnData currentColumn,
|
||||||
|
ColumnData replaceColumn, ArrayList<ColumnData> currentColumns,
|
||||||
|
ArrayList<ColumnData> externalColumns,
|
||||||
ArrayList<ReplaceByExternalColumnsMapping> columnsMatch) {
|
ArrayList<ReplaceByExternalColumnsMapping> columnsMatch) {
|
||||||
super();
|
super();
|
||||||
this.trId = trId;
|
this.trId = trId;
|
||||||
this.currentTabularResource = currentTabularResource;
|
this.currentTabularResource = currentTabularResource;
|
||||||
this.externalTabularResource = externalTabularResource;
|
this.externalTabularResource = externalTabularResource;
|
||||||
|
this.currentColumn = currentColumn;
|
||||||
this.replaceColumn = replaceColumn;
|
this.replaceColumn = replaceColumn;
|
||||||
|
this.currentColumns = currentColumns;
|
||||||
|
this.externalColumns = externalColumns;
|
||||||
this.columnsMatch = columnsMatch;
|
this.columnsMatch = columnsMatch;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -70,6 +81,14 @@ public class ReplaceByExternalSession implements Serializable {
|
||||||
this.externalTabularResource = externalTabularResource;
|
this.externalTabularResource = externalTabularResource;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ColumnData getCurrentColumn() {
|
||||||
|
return currentColumn;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCurrentColumn(ColumnData currentColumn) {
|
||||||
|
this.currentColumn = currentColumn;
|
||||||
|
}
|
||||||
|
|
||||||
public ColumnData getReplaceColumn() {
|
public ColumnData getReplaceColumn() {
|
||||||
return replaceColumn;
|
return replaceColumn;
|
||||||
}
|
}
|
||||||
|
@ -78,6 +97,22 @@ public class ReplaceByExternalSession implements Serializable {
|
||||||
this.replaceColumn = replaceColumn;
|
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() {
|
public ArrayList<ReplaceByExternalColumnsMapping> getColumnsMatch() {
|
||||||
return columnsMatch;
|
return columnsMatch;
|
||||||
}
|
}
|
||||||
|
@ -92,10 +127,10 @@ public class ReplaceByExternalSession implements Serializable {
|
||||||
return "ReplaceByExternalSession [trId=" + trId
|
return "ReplaceByExternalSession [trId=" + trId
|
||||||
+ ", currentTabularResource=" + currentTabularResource
|
+ ", currentTabularResource=" + currentTabularResource
|
||||||
+ ", externalTabularResource=" + externalTabularResource
|
+ ", externalTabularResource=" + externalTabularResource
|
||||||
+ ", replaceColumn=" + replaceColumn + ", columnsMatch="
|
+ ", currentColumn=" + currentColumn + ", replaceColumn="
|
||||||
|
+ replaceColumn + ", currentColumns=" + currentColumns
|
||||||
|
+ ", externalColumns=" + externalColumns + ", columnsMatch="
|
||||||
+ columnsMatch + "]";
|
+ columnsMatch + "]";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue