From 80db6955aa60591c7b432e8afa3b105d4452d2b3 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Thu, 19 Nov 2015 15:05:01 +0000 Subject: [PATCH] rafactor on class git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@120322 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../workspace/server/GWTWorkspaceServiceImpl.java | 8 ++++---- .../server/notifications/NotificationsProducer.java | 6 +++--- ...del.java => DiffereceBetweenInfoContactModel.java} | 11 +++++------ 3 files changed, 12 insertions(+), 13 deletions(-) rename src/main/java/org/gcube/portlets/user/workspace/server/util/{DiffereceBeetweenInfoContactModel.java => DiffereceBetweenInfoContactModel.java} (93%) 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 0b7ac24..1ca8852 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 @@ -60,7 +60,7 @@ import org.gcube.portlets.user.workspace.server.notifications.NotificationsUtil; import org.gcube.portlets.user.workspace.server.resolver.UriResolverReaderParameter; import org.gcube.portlets.user.workspace.server.shortener.UrlShortener; import org.gcube.portlets.user.workspace.server.util.AclTypeComparator; -import org.gcube.portlets.user.workspace.server.util.DiffereceBeetweenInfoContactModel; +import org.gcube.portlets.user.workspace.server.util.DiffereceBetweenInfoContactModel; import org.gcube.portlets.user.workspace.server.util.HttpRequestUtil; import org.gcube.portlets.user.workspace.server.util.StringUtil; import org.gcube.portlets.user.workspace.server.util.UserUtil; @@ -1715,7 +1715,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT sharedFolder.setDescription(folder.getDescription()); //SET NEW DESCRIPTION //USER REMOVED FROM SHARE - DiffereceBeetweenInfoContactModel diff2 = new DiffereceBeetweenInfoContactModel(listSharedContact, listContacts); + DiffereceBetweenInfoContactModel diff2 = new DiffereceBetweenInfoContactModel(listSharedContact, listContacts); List listRemovedUsersFromShare = diff2.getDifferentsContacts(); workspaceLogger.info("List removed user from share has size: "+listRemovedUsersFromShare.size()); for (InfoContactModel userRemoved : listRemovedUsersFromShare) { @@ -3062,14 +3062,14 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT NotificationsProducer np = getNotificationProducer(); workspaceLogger.info("Sending notifications downgrade/upgrade administator/s.."); - DiffereceBeetweenInfoContactModel diff1 = new DiffereceBeetweenInfoContactModel(oldAdmins, newAdmins); + DiffereceBetweenInfoContactModel diff1 = new DiffereceBetweenInfoContactModel(oldAdmins, newAdmins); List contactsDowngrade = diff1.getDifferentsContacts(); for (InfoContactModel infoContactModel : contactsDowngrade) { np.notifyAdministratorDowngrade(infoContactModel, sharedFolder); } - DiffereceBeetweenInfoContactModel diff2 = new DiffereceBeetweenInfoContactModel(newAdmins, oldAdmins); + DiffereceBetweenInfoContactModel diff2 = new DiffereceBetweenInfoContactModel(newAdmins, oldAdmins); List contactsUpgrade = diff2.getDifferentsContacts(); for (InfoContactModel infoContactModel : contactsUpgrade) { diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/notifications/NotificationsProducer.java b/src/main/java/org/gcube/portlets/user/workspace/server/notifications/NotificationsProducer.java index 601590b..a54abf5 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/notifications/NotificationsProducer.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/notifications/NotificationsProducer.java @@ -15,7 +15,7 @@ import org.gcube.common.homelibrary.home.workspace.WorkspaceItem; import org.gcube.common.homelibrary.home.workspace.WorkspaceSharedFolder; import org.gcube.common.scope.impl.ScopeBean; import org.gcube.portlets.user.workspace.client.model.InfoContactModel; -import org.gcube.portlets.user.workspace.server.util.DiffereceBeetweenInfoContactModel; +import org.gcube.portlets.user.workspace.server.util.DiffereceBetweenInfoContactModel; import org.gcube.portlets.user.workspace.server.util.UserUtil; import org.gcube.portlets.user.workspace.server.util.WsUtil; @@ -241,7 +241,7 @@ public class NotificationsProducer { try{ //NEW USER SHARED - DiffereceBeetweenInfoContactModel diff = new DiffereceBeetweenInfoContactModel(listSharingContact, listSharedContact); + DiffereceBetweenInfoContactModel diff = new DiffereceBetweenInfoContactModel(listSharingContact, listSharedContact); List listNewContactsShared = diff.getDifferentsContacts(); @@ -307,7 +307,7 @@ public class NotificationsProducer { } //USER REMOVED FROM SHARE - DiffereceBeetweenInfoContactModel diff2 = new DiffereceBeetweenInfoContactModel(listSharedContact, listSharingContact); + DiffereceBetweenInfoContactModel diff2 = new DiffereceBetweenInfoContactModel(listSharedContact, listSharingContact); List listRemovedUsersFromShare = diff2.getDifferentsContacts(); diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/util/DiffereceBeetweenInfoContactModel.java b/src/main/java/org/gcube/portlets/user/workspace/server/util/DiffereceBetweenInfoContactModel.java similarity index 93% rename from src/main/java/org/gcube/portlets/user/workspace/server/util/DiffereceBeetweenInfoContactModel.java rename to src/main/java/org/gcube/portlets/user/workspace/server/util/DiffereceBetweenInfoContactModel.java index 54d1e14..f7db709 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/util/DiffereceBeetweenInfoContactModel.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/util/DiffereceBetweenInfoContactModel.java @@ -6,13 +6,14 @@ import java.util.List; import org.gcube.portlets.user.workspace.client.model.InfoContactModel; + /** - * The Class DiffereceBeetweenInfoContactModel. + * The Class DiffereceBetweenInfoContactModel. * * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * Nov 4, 2015 + * Nov 19, 2015 */ -public class DiffereceBeetweenInfoContactModel { +public class DiffereceBetweenInfoContactModel { private List listOne; @@ -24,11 +25,9 @@ public class DiffereceBeetweenInfoContactModel { * @param listA the list a * @param listB the list b */ - public DiffereceBeetweenInfoContactModel(List listA, List listB){ - + public DiffereceBetweenInfoContactModel(List listA, List listB){ this.listOne = listA; this.listTwo = listB; - } /**