From c77426577255750f7a4468f126652060e0f4123f Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 16 May 2014 08:48:53 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@95747 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../portlets/user/td/gwtservice/server/SessionUtil.java | 7 ++++--- .../user/td/gwtservice/server/TDGWTServiceImpl.java | 2 +- .../user/td/gwtservice/server/trservice/ValueMap.java | 7 +++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java index 56a54b3..681df08 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java @@ -16,6 +16,7 @@ import org.gcube.data.analysis.tabulardata.service.tabular.TabularResource; import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper; import org.gcube.portlets.user.td.gwtservice.server.file.FileUploadSession; import org.gcube.portlets.user.td.gwtservice.server.trservice.TRTasksManager; +import org.gcube.portlets.user.td.gwtservice.shared.Constants; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVExportSession; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportSession; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException; @@ -73,8 +74,8 @@ public class SessionUtil { ASLSession session; if (username == null) { logger.warn("no user found in session, using test one"); - throw new TDGWTSessionExpiredException("Session Expired!"); - /* + //throw new TDGWTSessionExpiredException("Session Expired!"); + username = Constants.DEFAULT_USER; String scope = Constants.DEFAULT_SCOPE; @@ -82,7 +83,7 @@ public class SessionUtil { session = SessionManager.getInstance().getASLSession( httpSession.getId(), username); session.setScope(scope); - */ + } else { session = SessionManager.getInstance().getASLSession( httpSession.getId(), username); 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 33aeec8..6fe5953 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 @@ -6578,7 +6578,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("OperationInvocation: \n" + invocation.toString()); Task trTask = service.execute(invocation, serviceTR); logger.debug("Start Task on service: TaskId " + trTask.getId()); - SessionUtil.setReplaceColumnTask(session, trTask); + SessionUtil.setEditRowTask(session, trTask); return; } catch (TDGWTSessionExpiredException e) { diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ValueMap.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ValueMap.java index 9e9c960..c0540e4 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ValueMap.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ValueMap.java @@ -1,5 +1,6 @@ package org.gcube.portlets.user.td.gwtservice.server.trservice; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -24,8 +25,6 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeC import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.gwt.i18n.client.DateTimeFormat; - /** * * @author "Giancarlo Panichi" @@ -39,7 +38,7 @@ public class ValueMap { } - protected DateTimeFormat sdf = DateTimeFormat.getFormat("yyyy-MM-dd"); + protected SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); public ArrayList> genValueMap(EditRowSession editRowSession){ ArrayList> composit=new ArrayList>(); @@ -91,7 +90,7 @@ public class ValueMap { Date d; try{ d=sdf.parse(value); - }catch(IllegalArgumentException e){ + }catch(Exception e){ continue; } TDDate tdDate=new TDDate(d);