gCubeSystem
/
tabular-data-gwt-service
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor Update 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@96151 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-05-27 16:21:22 +00:00
parent 79a8ea7245
commit f11e984481
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java
View File

@ -16,6 +16,7 @@ import org.gcube.data.analysis.tabulardata.service.tabular.TabularResource;
import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper; 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.file.FileUploadSession;
import org.gcube.portlets.user.td.gwtservice.server.trservice.TRTasksManager; 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.CSVExportSession;
import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportSession; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportSession;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException;
@ -77,15 +78,15 @@ public class SessionUtil {
ASLSession session; ASLSession session;
if (username == null) { if (username == null) {
logger.warn("no user found in session, using test one"); logger.warn("no user found in session, using test one");
throw new TDGWTSessionExpiredException("Session Expired!"); //throw new TDGWTSessionExpiredException("Session Expired!");
/*
username = Constants.DEFAULT_USER; username = Constants.DEFAULT_USER;
String scope = Constants.DEFAULT_SCOPE; String scope = Constants.DEFAULT_SCOPE;
httpSession.setAttribute(ScopeHelper.USERNAME_ATTRIBUTE, username); httpSession.setAttribute(ScopeHelper.USERNAME_ATTRIBUTE, username);
session = SessionManager.getInstance().getASLSession( session = SessionManager.getInstance().getASLSession(
httpSession.getId(), username); httpSession.getId(), username);
session.setScope(scope);*/ session.setScope(scope);
} else { } else {
session = SessionManager.getInstance().getASLSession( session = SessionManager.getInstance().getASLSession(

22
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/extract/ExtractCodelistDefColumn.java
View File

@ -13,6 +13,7 @@ public class ExtractCodelistDefColumn implements Serializable {
private static final long serialVersionUID = 7467523779864189492L; private static final long serialVersionUID = 7467523779864189492L;
protected int id; //Only for grid or combo
protected ColumnTypeCode columnType; protected ColumnTypeCode columnType;
protected String defaultValue; protected String defaultValue;
protected String label; protected String label;
@ -21,7 +22,7 @@ public class ExtractCodelistDefColumn implements Serializable {
} }
public ExtractCodelistDefColumn(ColumnTypeCode columnType, public ExtractCodelistDefColumn(int id, ColumnTypeCode columnType,
String defaultValue, String label) { String defaultValue, String label) {
this.columnType=columnType; this.columnType=columnType;
this.defaultValue=defaultValue; this.defaultValue=defaultValue;
@ -52,10 +53,21 @@ public class ExtractCodelistDefColumn implements Serializable {
this.defaultValue = defaultValue; this.defaultValue = defaultValue;
} }
@Override public int getId() {
public String toString() { return id;
return "ExtractCodelistDefColumn [columnType=" + columnType
+ ", defaultValue=" + defaultValue + ", label=" + label + "]";
} }
public void setId(int id) {
this.id = id;
}
@Override
public String toString() {
return "ExtractCodelistDefColumn [id=" + id + ", columnType="
+ columnType + ", defaultValue=" + defaultValue + ", label="
+ label + "]";
}
} }