From 8da761f4ff4beb19cefcd4a66f4565b10805b1aa Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Tue, 19 Jun 2018 10:19:08 +0000 Subject: [PATCH] Removed deprecated dependency ws-mail widget git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/social-networking/social-util-library@169322 82a268e6-3cf1-43bd-a215-b396298e98cf --- distro/changelog.xml | 4 + pom.xml | 7 +- .../socialutillibrary/Utils.java | 2 +- .../socialutillibrary/shared/ItemBean.java | 79 +++++++++++++++++++ 4 files changed, 85 insertions(+), 7 deletions(-) create mode 100644 src/main/java/org/gcube/social_networking/socialutillibrary/shared/ItemBean.java diff --git a/distro/changelog.xml b/distro/changelog.xml index ec42bb0..78f9b9f 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,8 @@ + + Removed deprecated dependency ws-mail widget + Fixed regex for hashtags (#10700) diff --git a/pom.xml b/pom.xml index 0f37006..9fb243f 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.gcube.socialnetworking social-util-library - 1.3.0-SNAPSHOT + 1.4.0-SNAPSHOT social-util-library The social-util-library contains utility functions that can be used by the social-networking portlets. @@ -47,11 +47,6 @@ social-networking-library provided - - org.gcube.portlets.widgets - pickitem-widget - [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) - org.gcube.portlets.user gcube-widgets diff --git a/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java b/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java index 59eba62..876c4aa 100644 --- a/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java +++ b/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java @@ -15,7 +15,7 @@ import org.gcube.common.portal.PortalContext; import org.gcube.common.scope.impl.ScopeBean; import org.gcube.common.scope.impl.ScopeBean.Type; import org.gcube.portal.databook.client.GCubeSocialNetworking; -import org.gcube.portlets.widgets.pickitem.shared.ItemBean; +import org.gcube.social_networking.socialutillibrary.shared.ItemBean; import org.gcube.vomanagement.usermanagement.GroupManager; import org.gcube.vomanagement.usermanagement.RoleManager; import org.gcube.vomanagement.usermanagement.UserManager; diff --git a/src/main/java/org/gcube/social_networking/socialutillibrary/shared/ItemBean.java b/src/main/java/org/gcube/social_networking/socialutillibrary/shared/ItemBean.java new file mode 100644 index 0000000..5490b34 --- /dev/null +++ b/src/main/java/org/gcube/social_networking/socialutillibrary/shared/ItemBean.java @@ -0,0 +1,79 @@ +package org.gcube.social_networking.socialutillibrary.shared; + +import java.io.Serializable; + +@SuppressWarnings("serial") +public class ItemBean implements Serializable { + private String id; + private String name; + private String alternativeName; + private String thumbnailURL; + private boolean isItemGroup; + + public ItemBean() { + super(); + } + /** + * Use it when the Item represents a user. + * @param id + * @param username + * @param fullName + * @param thumbnailURL + */ + public ItemBean(String id, String username, String fullName, String thumbnailURL) { + super(); + this.id = id; + this.name = username; + this.alternativeName = fullName; + this.thumbnailURL = thumbnailURL; + } + /** + * Use it when the Item represents a group of users (namely a team). + * @param id + * @param teamName + */ + public ItemBean(String id, String teamName) { + super(); + this.id = id; + this.name = teamName; + this.alternativeName = teamName; + this.isItemGroup = true; + } + public boolean isItemGroup() { + return isItemGroup; + } + public void setItemGroup(boolean isItemGroup) { + this.isItemGroup = isItemGroup; + } + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public String getAlternativeName() { + return alternativeName; + } + public void setAlternativeName(String altname) { + this.alternativeName = altname; + } + + public String getThumbnailURL() { + return thumbnailURL; + } + public void setThumbnailURL(String thumbnailURL) { + this.thumbnailURL = thumbnailURL; + } + @Override + public String toString() { + return "ItemBean [id=" + id + ", name=" + name + ", alternativeName=" + + alternativeName + ", thumbnailURL=" + thumbnailURL + + ", isItemGroup=" + isItemGroup + "]"; + } +}