From a1bf10b12c5520a032d6980948a77d049cce217f Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 28 Feb 2014 10:55:56 +0000 Subject: [PATCH] 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 --- .../gwtservice/server/TDGWTServiceImpl.java | 159 ++++++++---------- 1 file changed, 69 insertions(+), 90 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java index a3b5b90..8f47be9 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java @@ -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,8 +2333,68 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements OperationDefinition operationDefinition; Map map = new HashMap(); - if (changeColumnTypeSession.getColumnTypeCodeTarget().compareTo( - ColumnTypeCode.MEASURE) == 0) { + ColumnTypeCode type = changeColumnTypeSession.getColumnTypeCodeTarget(); + + switch (type) { + case ANNOTATION: + operationDefinition = OperationDefinitionMap.map( + OperationsId.ChangeToAnnotationColumn.toString(), + capabilities); + invocation = new OperationExecution(changeColumnTypeSession + .getColumnData().getColumnId(), + operationDefinition.getOperationId(), map); + break; + case ATTRIBUTE: + operationDefinition = OperationDefinitionMap.map( + OperationsId.ChangeToAttributeColumn.toString(), + capabilities); + + map.put(Constants.PARAMETER_TARGET_DATA_TYPE, ColumnDataTypeMap + .map(changeColumnTypeSession.getColumnDataTypeTarget())); + invocation = new OperationExecution(changeColumnTypeSession + .getColumnData().getColumnId(), + operationDefinition.getOperationId(), map); + break; + case CODE: + operationDefinition = OperationDefinitionMap.map( + 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); + break; + case CODENAME: + operationDefinition = OperationDefinitionMap.map( + OperationsId.ChangeToCodeName.toString(), capabilities); + invocation = new OperationExecution(changeColumnTypeSession + .getColumnData().getColumnId(), + operationDefinition.getOperationId(), map); + break; + case DIMENSION: + operationDefinition = OperationDefinitionMap.map( + OperationsId.ChangeToDimensionColumn.toString(), + capabilities); + 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(), + operationDefinition.getOperationId(), map); + break; + case MEASURE: operationDefinition = OperationDefinitionMap .map(OperationsId.ChangeToMeasureColumn.toString(), capabilities); @@ -2345,93 +2404,12 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements invocation = new OperationExecution(changeColumnTypeSession .getColumnData().getColumnId(), operationDefinition.getOperationId(), map); - } else { - if (changeColumnTypeSession.getColumnTypeCodeTarget().compareTo( - ColumnTypeCode.ATTRIBUTE) == 0) { - operationDefinition = OperationDefinitionMap.map( - OperationsId.ChangeToAttributeColumn.toString(), - capabilities); + break; + case TIMEDIMENSION: + break; + default: + break; - map.put(Constants.PARAMETER_TARGET_DATA_TYPE, ColumnDataTypeMap - .map(changeColumnTypeSession.getColumnDataTypeTarget())); - invocation = new OperationExecution(changeColumnTypeSession - .getColumnData().getColumnId(), - operationDefinition.getOperationId(), map); - } else { - if (changeColumnTypeSession.getColumnTypeCodeTarget() - .compareTo(ColumnTypeCode.CODE) == 0) { - operationDefinition = OperationDefinitionMap.map( - OperationsId.ChangeToCodeColumn.toString(), - capabilities); - invocation = new OperationExecution(changeColumnTypeSession - .getColumnData().getColumnId(), - operationDefinition.getOperationId(), map); - } else { - if (changeColumnTypeSession.getColumnTypeCodeTarget() - .compareTo(ColumnTypeCode.CODENAME) == 0) { - operationDefinition = OperationDefinitionMap.map( - OperationsId.ChangeToCodeName.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); - map.put(Constants.PARAMETER_REFERENCE_COLUMN, columnReference); - - invocation = new OperationExecution( - changeColumnTypeSession.getColumnData() - .getColumnId(), - operationDefinition.getOperationId(), map); - - } else { - if (changeColumnTypeSession - .getColumnTypeCodeTarget() - .compareTo( - ColumnTypeCode.TIMEDIMENSION) == 0) { - } else { - - } - } - } - } - - } - } - } } 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()); }