From 7091eaa28ce0e725f02f34569962fa67230a6a8b Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Wed, 13 Feb 2013 17:43:21 +0000 Subject: [PATCH] removed test git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@69211 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../workspace/server/GWTWorkspaceBuilder.java | 16 ++++++++-------- .../server/GWTWorkspaceServiceImpl.java | 4 ++-- .../user/workspace/server/util/Util.java | 3 ++- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java index e7a09c5..fbc37a2 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java @@ -1432,17 +1432,17 @@ public class GWTWorkspaceBuilder { List listContactsModel = new ArrayList(); for(User user: listUsers){ - //TODO REMOVE COMMENT -// listContactsModel.add(new InfoContactModel(user.getId(), user.getPortalLogin())); + + listContactsModel.add(new InfoContactModel(user.getId(), user.getPortalLogin(), user.getPortalLogin())); } - //THIS IS A TEST - listContactsModel.add(new InfoContactModel("Federico.Test", "Federico.Test", "Federico de Faveri")); - listContactsModel.add(new InfoContactModel("Antonio.Test", "Antonio.Test", "Antonio Gioia")); - listContactsModel.add(new InfoContactModel("Fabio.Test", "Fabio.Test", "Fabio Sinibaldi")); - listContactsModel.add(new InfoContactModel(Util.TEST_USER, Util.TEST_USER, Util.TEST_USER)); - listContactsModel.add(new InfoContactModel("massimiliano.assante", "massimiliano.assante", "Massimiliano Assante")); +// //THIS IS A TEST +// listContactsModel.add(new InfoContactModel("Federico.Test", "Federico.Test", "Federico de Faveri")); +// listContactsModel.add(new InfoContactModel("Antonio.Test", "Antonio.Test", "Antonio Gioia")); +// listContactsModel.add(new InfoContactModel("Fabio.Test", "Fabio.Test", "Fabio Sinibaldi")); +// listContactsModel.add(new InfoContactModel(Util.TEST_USER, Util.TEST_USER, Util.TEST_USER)); +// listContactsModel.add(new InfoContactModel("massimiliano.assante", "massimiliano.assante", "Massimiliano Assante")); return listContactsModel; } diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java index 0069503..8b7232b 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java @@ -1399,8 +1399,8 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT List contacts = getListUserSharedByFolderSharedId(folderSharedId); // //TODO REMOVE THIS - contacts = new ArrayList(); - contacts.add(new InfoContactModel("francesco.mangiacrapa", "francesco.mangiacrapa", "Francesco Mangiacrapa")); +// contacts = new ArrayList(); +// contacts.add(new InfoContactModel("francesco.mangiacrapa", "francesco.mangiacrapa", "Francesco Mangiacrapa")); np.notifyFolderUnSharing(contacts, wsFolder); diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/util/Util.java b/src/main/java/org/gcube/portlets/user/workspace/server/util/Util.java index 667e147..355b6b0 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/util/Util.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/util/Util.java @@ -47,7 +47,8 @@ public class Util { public static final String TEST_USER_FULL_NAME = "Francesco Mangiacrapa"; public static GCUBEClientLog defaultLogger = new GCUBEClientLog("WorkspacePortlet"); - + + public static ASLSession getAslSession(HttpSession httpSession) { String sessionID = httpSession.getId();