Fixed Tabular Resource Open in multi scope

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@102027 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-12-12 17:31:49 +00:00
parent ab425e5bf7
commit 1c87006467
3 changed files with 798 additions and 311 deletions

View File

@ -7,17 +7,19 @@ package org.gcube.portlets.user.td.gwtservice.server;
*
*/
public class SessionConstants {
public static final String CURRENT_TR_ID = "CURRENT_TR_ID";
public static final String CURRENT_TABULAR_RESOURCE = "CURRENT_TABULAR_RESOURCE";
public static final String CURRENT_TABULAR_RESOURCES_OPEN = "CURRENT_TABULAR_RESOURCES_OPEN";
public static final String SCOPE_TO_CURRENT_TRID_MAP = "SCOPE_TO_CURRENT_TRID_MAP";
public static final String SCOPE_TO_CURRENT_TABULAR_RESOURCE_MAP = "SCOPE_TO_CURRENT_TABULAR_RESOURCE_MAP";
public static final String SCOPE_TO_CURRENT_TABULAR_RESOURCES_OPEN_MAP = "SCOPE_TO_CURRENT_TABULAR_RESOURCES_OPEN_MAP";
public static final String SCOPE_TO_OPERATIONS_TASKS_STARTED_MAP="SCOPE_TO_OPERATIONS_TASKS_STARTED_MAP";
public static final String SCOPE_TO_OPERATIONS_TASKS_IN_BACKGROUND_MAP="SCOPE_TO_OPERATIONS_TASKS_IN_BACKGROUND_MAP";
public static final String SCOPE_TO_OPERATIONS_TASKS_ABORTED_MAP="SCOPE_TO_OPERATIONS_TASKS_ABORTED_MAP";
public static final String SCOPE_TO_OPERATIONS_TASKS_HIDDEN_MAP="SCOPE_TO_OPERATIONS_TASKS_HIDDEN_MAP";
public static final String SCOPE_TO_TABULAR_RESOURCE_LIST_MAP = "SCOPE_TO_TABULAR_RESOURCE_LIST_MAP";
public static final String TDOPEN_SESSION = "TDOPEN_SESSION";
public static final String TABULAR_RESOURCE_LIST = "TABULAR_RESOURCE_LIST";
public static final String OPERATIONS_TASKS_STARTED="OPERATION_TASKS_STARTED";
public static final String OPERATIONS_TASKS_IN_BACKGROUND="OPERATION_TASKS_IN_BACKGROUND";
public static final String OPERATIONS_TASKS_ABORTED="OPERATION_TASKS_ABORTED";
public static final String OPERATIONS_TASKS_HIDDEN="OPERATION_TASKS_HIDDEN";
public static final String FILE_UPLOAD_MONITOR = "FILE_UPLOAD_MONITOR";
public static final String TR_TASK_MANAGER = "TR_TASK_MANAGER";
@ -106,4 +108,7 @@ public class SessionConstants {
public static final String CHART_TOPRATING_SESSION = "CHART_TOPRATING_SESSION";
public static final String RESOURCE_SAVE_SESSION = "RESOURCE_SAVE_SESSION";
}

View File

@ -317,8 +317,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
public TRId restoreUISession() throws TDGWTServiceException {
try {
HttpSession session = this.getThreadLocalRequest().getSession();
SessionUtil.getAslSession(session);
ASLSession aslSession=SessionUtil.getAslSession(session);
TRId trId = SessionUtil.getTRId(session);
logger.debug("restoreUISession()");
if (trId == null) {