From d0b009e63cb42802fa63103e01e79de9bc237776 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 16 May 2014 18:14:56 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@95811 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../td/gwtservice/server/TDGWTServiceImpl.java | 15 +++++++++++++-- .../user/td/gwtservice/shared/task/JobS.java | 8 +++++--- 2 files changed, 18 insertions(+), 5 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 ef3afc3..35ef0b8 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 @@ -15,8 +15,10 @@ import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Set; import javax.servlet.http.HttpSession; @@ -6483,11 +6485,20 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } InvocationS invocationS=null; if (job.getInvocation() != null) { + Map mapSent=new HashMap(); + Map map=job.getInvocation().getParameters(); + Set keys=map.keySet(); + Iterator iterator=keys.iterator(); + while(iterator.hasNext()){ + String key=iterator.next(); + Object o=map.get(key); + mapSent.put(key, o.toString()); + } + invocationS = new InvocationS(job.getInvocation() .getColumnId(), job.getInvocation() .getIdentifier(), job.getInvocation() - .getOperationId(), job.getInvocation() - .getParameters()); + .getOperationId(), mapSent); } JobS jobS = new JobS(String.valueOf(j), job.getProgress(), job.getHumaReadableStatus(), job.getDescription(), diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/task/JobS.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/task/JobS.java index 965979e..f3376db 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/task/JobS.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/task/JobS.java @@ -18,8 +18,9 @@ public class JobS implements Serializable { protected float progress; protected String humaReadableStatus; protected String description; - protected ArrayList validations; protected InvocationS invocation; + protected ArrayList validations; + public JobS() { @@ -87,11 +88,12 @@ public class JobS implements Serializable { public String toString() { return "JobS [id=" + id + ", progress=" + progress + ", humaReadableStatus=" + humaReadableStatus - + ", description=" + description + ", validations=" - + validations + ", invocation=" + invocation + "]"; + + ", description=" + description + ", invocation=" + invocation + + ", validations=" + validations + "]"; } + }