Minor Updated
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@92471 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
2463c290e6
commit
a1bf10b12c
|
@ -136,7 +136,6 @@ import org.gcube.resources.discovery.client.queries.api.SimpleQuery;
|
|||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import com.allen_sauer.gwt.log.client.Log;
|
||||
import com.google.gwt.user.server.rpc.RemoteServiceServlet;
|
||||
|
||||
/**
|
||||
|
@ -2334,20 +2333,18 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
|||
OperationDefinition operationDefinition;
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
|
||||
if (changeColumnTypeSession.getColumnTypeCodeTarget().compareTo(
|
||||
ColumnTypeCode.MEASURE) == 0) {
|
||||
operationDefinition = OperationDefinitionMap
|
||||
.map(OperationsId.ChangeToMeasureColumn.toString(),
|
||||
capabilities);
|
||||
ColumnTypeCode type = changeColumnTypeSession.getColumnTypeCodeTarget();
|
||||
|
||||
map.put(Constants.PARAMETER_TARGET_DATA_TYPE, ColumnDataTypeMap
|
||||
.map(changeColumnTypeSession.getColumnDataTypeTarget()));
|
||||
switch (type) {
|
||||
case ANNOTATION:
|
||||
operationDefinition = OperationDefinitionMap.map(
|
||||
OperationsId.ChangeToAnnotationColumn.toString(),
|
||||
capabilities);
|
||||
invocation = new OperationExecution(changeColumnTypeSession
|
||||
.getColumnData().getColumnId(),
|
||||
operationDefinition.getOperationId(), map);
|
||||
} else {
|
||||
if (changeColumnTypeSession.getColumnTypeCodeTarget().compareTo(
|
||||
ColumnTypeCode.ATTRIBUTE) == 0) {
|
||||
break;
|
||||
case ATTRIBUTE:
|
||||
operationDefinition = OperationDefinitionMap.map(
|
||||
OperationsId.ChangeToAttributeColumn.toString(),
|
||||
capabilities);
|
||||
|
@ -2357,82 +2354,63 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
|||
invocation = new OperationExecution(changeColumnTypeSession
|
||||
.getColumnData().getColumnId(),
|
||||
operationDefinition.getOperationId(), map);
|
||||
} else {
|
||||
if (changeColumnTypeSession.getColumnTypeCodeTarget()
|
||||
.compareTo(ColumnTypeCode.CODE) == 0) {
|
||||
break;
|
||||
case CODE:
|
||||
operationDefinition = OperationDefinitionMap.map(
|
||||
OperationsId.ChangeToCodeColumn.toString(),
|
||||
OperationsId.ChangeToCodeColumn.toString(), capabilities);
|
||||
invocation = new OperationExecution(changeColumnTypeSession
|
||||
.getColumnData().getColumnId(),
|
||||
operationDefinition.getOperationId(), map);
|
||||
break;
|
||||
case CODEDESCRIPTION:
|
||||
operationDefinition = OperationDefinitionMap.map(
|
||||
OperationsId.ChangeToCodeDescription.toString(),
|
||||
capabilities);
|
||||
invocation = new OperationExecution(changeColumnTypeSession
|
||||
.getColumnData().getColumnId(),
|
||||
operationDefinition.getOperationId(), map);
|
||||
} else {
|
||||
if (changeColumnTypeSession.getColumnTypeCodeTarget()
|
||||
.compareTo(ColumnTypeCode.CODENAME) == 0) {
|
||||
break;
|
||||
case CODENAME:
|
||||
operationDefinition = OperationDefinitionMap.map(
|
||||
OperationsId.ChangeToCodeName.toString(),
|
||||
OperationsId.ChangeToCodeName.toString(), capabilities);
|
||||
invocation = new OperationExecution(changeColumnTypeSession
|
||||
.getColumnData().getColumnId(),
|
||||
operationDefinition.getOperationId(), map);
|
||||
break;
|
||||
case DIMENSION:
|
||||
operationDefinition = OperationDefinitionMap.map(
|
||||
OperationsId.ChangeToDimensionColumn.toString(),
|
||||
capabilities);
|
||||
invocation = new OperationExecution(
|
||||
changeColumnTypeSession.getColumnData()
|
||||
.getColumnId(),
|
||||
operationDefinition.getOperationId(), map);
|
||||
} else {
|
||||
if (changeColumnTypeSession.getColumnTypeCodeTarget()
|
||||
.compareTo(ColumnTypeCode.CODEDESCRIPTION) == 0) {
|
||||
operationDefinition = OperationDefinitionMap.map(
|
||||
OperationsId.ChangeToCodeDescription
|
||||
.toString(), capabilities);
|
||||
invocation = new OperationExecution(
|
||||
changeColumnTypeSession.getColumnData()
|
||||
.getColumnId(),
|
||||
operationDefinition.getOperationId(), map);
|
||||
} else {
|
||||
if (changeColumnTypeSession
|
||||
.getColumnTypeCodeTarget().compareTo(
|
||||
ColumnTypeCode.ANNOTATION) == 0) {
|
||||
operationDefinition = OperationDefinitionMap
|
||||
.map(OperationsId.ChangeToAnnotationColumn
|
||||
.toString(), capabilities);
|
||||
invocation = new OperationExecution(
|
||||
changeColumnTypeSession.getColumnData()
|
||||
.getColumnId(),
|
||||
operationDefinition.getOperationId(),
|
||||
map);
|
||||
} else {
|
||||
if (changeColumnTypeSession
|
||||
.getColumnTypeCodeTarget().compareTo(
|
||||
ColumnTypeCode.DIMENSION) == 0) {
|
||||
operationDefinition = OperationDefinitionMap.map(
|
||||
OperationsId.ChangeToDimensionColumn
|
||||
.toString(), capabilities);
|
||||
ColumnData columnData=changeColumnTypeSession.getCodelistColumnReference();
|
||||
Log.debug("ReferenceColumn To Set: "+columnData);
|
||||
ColumnLocalId cId=new ColumnLocalId(columnData.getColumnId());
|
||||
TableId tId=new TableId(Long.getLong(columnData.getTrId().getTableId()));
|
||||
ColumnReference columnReference=new ColumnReference(tId,cId);
|
||||
ColumnData columnData = changeColumnTypeSession
|
||||
.getCodelistColumnReference();
|
||||
logger.debug("ReferenceColumn To Set: " + columnData);
|
||||
ColumnLocalId cId = new ColumnLocalId(columnData.getColumnId());
|
||||
TableId tId = new TableId(Long.getLong(columnData.getTrId()
|
||||
.getTableId()));
|
||||
ColumnReference columnReference = new ColumnReference(tId, cId);
|
||||
map.put(Constants.PARAMETER_REFERENCE_COLUMN, columnReference);
|
||||
|
||||
invocation = new OperationExecution(
|
||||
changeColumnTypeSession.getColumnData()
|
||||
.getColumnId(),
|
||||
invocation = new OperationExecution(changeColumnTypeSession
|
||||
.getColumnData().getColumnId(),
|
||||
operationDefinition.getOperationId(), map);
|
||||
break;
|
||||
case MEASURE:
|
||||
operationDefinition = OperationDefinitionMap
|
||||
.map(OperationsId.ChangeToMeasureColumn.toString(),
|
||||
capabilities);
|
||||
|
||||
} else {
|
||||
if (changeColumnTypeSession
|
||||
.getColumnTypeCodeTarget()
|
||||
.compareTo(
|
||||
ColumnTypeCode.TIMEDIMENSION) == 0) {
|
||||
} else {
|
||||
map.put(Constants.PARAMETER_TARGET_DATA_TYPE, ColumnDataTypeMap
|
||||
.map(changeColumnTypeSession.getColumnDataTypeTarget()));
|
||||
invocation = new OperationExecution(changeColumnTypeSession
|
||||
.getColumnData().getColumnId(),
|
||||
operationDefinition.getOperationId(), map);
|
||||
break;
|
||||
case TIMEDIMENSION:
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return invocation;
|
||||
}
|
||||
|
@ -3095,7 +3073,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
|||
|
||||
} catch (Exception e) {
|
||||
logger.error(
|
||||
"Error in getColumnsForDimension() retrieving Columns: " + e.getLocalizedMessage(), e);
|
||||
"Error in getColumnsForDimension() retrieving Columns: "
|
||||
+ e.getLocalizedMessage(), e);
|
||||
throw new TDGWTServiceException("Error retrieving Columns: "
|
||||
+ e.getLocalizedMessage());
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue