From d7495ce2a3d290c19ae490ba2ba43c8dd925ff5b Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 22 Jan 2015 18:19:41 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@111456 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/td/gwtservice/server/TDGWTServiceImpl.java | 8 ++++---- .../server/opexecution/OpExecution4EditRow.java | 11 ++++++----- 2 files changed, 10 insertions(+), 9 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 ad83aac..dccbfb1 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 @@ -6609,16 +6609,16 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements director.setOperationExecutionBuilder(opEx); director.constructOperationExecution(); - ArrayList invocation = director + ArrayList invocations = director .getListOperationExecution(); - if (invocation == null) { + if (invocations == null) { throw new TDGWTServiceException( "Error in invocation: Operation not supported"); } - logger.debug("OperationInvocation: \n" + invocation.toString()); - Task trTask = service.executeBatch(invocation, tabularResourceId); + logger.debug("OperationInvocation: \n" + invocations.toString()); + Task trTask = service.executeBatch(invocations, tabularResourceId); logger.debug("Start Task on service: TaskId " + trTask.getId()); diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4EditRow.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4EditRow.java index 795531c..1236da5 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4EditRow.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4EditRow.java @@ -43,9 +43,8 @@ public class OpExecution4EditRow extends OpExecutionBuilder { logger.debug(editRowSession.toString()); - OperationExecution invocation; - Map map = new HashMap(); + ArrayList invocations = new ArrayList(); ValueMap valueMap = new ValueMap(); @@ -59,10 +58,11 @@ public class OpExecution4EditRow extends OpExecutionBuilder { ArrayList> compositeValue = valueMap .genValueMap(editRowSession.getTrId(), editRowSession.getColumns(), fieldsMap); - + + Map map = new HashMap(); map.put(Constants.PARAMETER_ADD_ROW_COMPOSITE, compositeValue); - invocation = new OperationExecution( + OperationExecution invocation = new OperationExecution( operationDefinition.getOperationId(), map); invocations.add(invocation); @@ -83,10 +83,11 @@ public class OpExecution4EditRow extends OpExecutionBuilder { OperationsId.ModifyTuplesValuesByExpression.toString(), service); + Map map = new HashMap(); map.put(Constants.PARAMETER_ADD_ROW_COMPOSITE, compositeValue); map.put(Constants.PARAMETER_EDIT_ROW_CONDITION, exp); - invocation = new OperationExecution( + OperationExecution invocation = new OperationExecution( operationDefinition.getOperationId(), map); invocations.add(invocation); }