gCubeSystem
/
workspace-tree-widget
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commented WorkspaceEventCollector and MetadataConverter 

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@115153 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2015-05-29 14:09:42 +00:00
parent ef3339fde1
commit 4862239803
2 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/gcube/portlets/user/workspace/server/util/WorkspaceEventCollector.java
View File

@ -16,15 +16,14 @@ import org.gcube.common.homelibrary.home.workspace.events.WorkspaceListener;
*/
public class WorkspaceEventCollector implements WorkspaceListener {
protected Logger logger;
protected static Logger logger = Logger.getLogger(WorkspaceEventCollector.class);
protected BlockingQueue<WorkspaceEvent> eventsQueue = new LinkedBlockingQueue<WorkspaceEvent>();
/**
* @param logger
*/
public WorkspaceEventCollector(Logger logger) {
this.logger = logger;
public WorkspaceEventCollector() {
}
/**

48
src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java
View File

@ -170,6 +170,7 @@ public class WsUtil {
Workspace workspace = HomeLibrary.getUserWorkspace(session.getUsername());
/*
if (session.getAttribute(METADATACONVERTER_ATTRIBUTE) == null){
logger.trace("Initializing the Metadata converter");
@ -196,10 +197,11 @@ public class WsUtil {
logger.trace("Initializing the event collector");
//we prepare the event collector
WorkspaceEventCollector eventCollector = new WorkspaceEventCollector(logger);
WorkspaceEventCollector eventCollector = new WorkspaceEventCollector();
workspace.addWorkspaceListener(eventCollector);
session.setAttribute(WORKSPACE_EVENT_COLLECTOR_ATTRIBUTE, eventCollector);
}
*/
if (session.getAttribute(WORKSPACEBUILDER_ATTRIBUTE) == null)
{
@ -218,29 +220,29 @@ public class WsUtil {
}
public static MetadataConverter getMetadataConverter(Logger logger, HttpSession httpSession)
{
MetadataConverter mc = (MetadataConverter) httpSession.getAttribute(METADATACONVERTER_ATTRIBUTE);
// public static MetadataConverter getMetadataConverter(Logger logger, HttpSession httpSession)
// {
// MetadataConverter mc = (MetadataConverter) httpSession.getAttribute(METADATACONVERTER_ATTRIBUTE);
//
// if (mc==null)
// {
//
// mc = new MetadataConverter(logger);
// ASLSession session = getAslSession(httpSession);
// mc.setup(session);
// session.setAttribute(METADATACONVERTER_ATTRIBUTE, mc);
// }
//
// mc.isReady();
//
// return mc;
// }
if (mc==null)
{
mc = new MetadataConverter(logger);
ASLSession session = getAslSession(httpSession);
mc.setup(session);
session.setAttribute(METADATACONVERTER_ATTRIBUTE, mc);
}
mc.isReady();
return mc;
}
public static WorkspaceEventCollector getEventCollector(HttpSession httpSession)
{
ASLSession session = getAslSession(httpSession);
return (WorkspaceEventCollector) session.getAttribute(WsUtil.WORKSPACE_EVENT_COLLECTOR_ATTRIBUTE);
}
// public static WorkspaceEventCollector getEventCollector(HttpSession httpSession)
// {
// ASLSession session = getAslSession(httpSession);
// return (WorkspaceEventCollector) session.getAttribute(WsUtil.WORKSPACE_EVENT_COLLECTOR_ATTRIBUTE);
// }
public static GWTWorkspaceBuilder getGWTWorkspaceBuilder(HttpSession httpSession)
{