From fe1361615c3e80c31e85731a0b7c28b8f489ad41 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Thu, 4 Feb 2016 17:04:25 +0000 Subject: [PATCH] moved EnhancedFeed class to SNL git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/news-feed@122853 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/newsfeed/client/NewsService.java | 2 +- .../newsfeed/client/NewsServiceAsync.java | 2 +- .../newsfeed/client/panels/NewsFeedPanel.java | 2 +- .../newsfeed/client/ui/TweetTemplate.java | 2 +- .../user/newsfeed/server/NewsServiceImpl.java | 2 +- .../user/newsfeed/shared/EnhancedFeed.java | 89 ------------------- .../user/newsfeed/shared/MoreFeedsBean.java | 2 + 7 files changed, 7 insertions(+), 94 deletions(-) delete mode 100644 src/main/java/org/gcube/portlets/user/newsfeed/shared/EnhancedFeed.java diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/NewsService.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/NewsService.java index e9c48ba..5d95af7 100644 --- a/src/main/java/org/gcube/portlets/user/newsfeed/client/NewsService.java +++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/NewsService.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.HashSet; import org.gcube.portal.databook.shared.Comment; +import org.gcube.portal.databook.shared.EnhancedFeed; import org.gcube.portal.databook.shared.Like; -import org.gcube.portlets.user.newsfeed.shared.EnhancedFeed; import org.gcube.portlets.user.newsfeed.shared.MoreFeedsBean; import org.gcube.portlets.user.newsfeed.shared.OperationResult; import org.gcube.portlets.user.newsfeed.shared.UserSettings; diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/NewsServiceAsync.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/NewsServiceAsync.java index 1556dfa..16c2b11 100644 --- a/src/main/java/org/gcube/portlets/user/newsfeed/client/NewsServiceAsync.java +++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/NewsServiceAsync.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.HashSet; import org.gcube.portal.databook.shared.Comment; +import org.gcube.portal.databook.shared.EnhancedFeed; import org.gcube.portal.databook.shared.Like; -import org.gcube.portlets.user.newsfeed.shared.EnhancedFeed; import org.gcube.portlets.user.newsfeed.shared.MoreFeedsBean; import org.gcube.portlets.user.newsfeed.shared.OperationResult; import org.gcube.portlets.user.newsfeed.shared.UserSettings; diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java index 4f62e16..6f6032d 100644 --- a/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java +++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java @@ -11,6 +11,7 @@ import org.gcube.portal.databook.client.util.Encoder; import org.gcube.portal.databook.shared.Attachment; import org.gcube.portal.databook.shared.ClientFeed; import org.gcube.portal.databook.shared.Comment; +import org.gcube.portal.databook.shared.EnhancedFeed; import org.gcube.portal.databook.shared.Feed; import org.gcube.portal.databook.shared.FeedType; import org.gcube.portal.databook.shared.Like; @@ -50,7 +51,6 @@ import org.gcube.portlets.user.newsfeed.client.ui.ResultsFor; import org.gcube.portlets.user.newsfeed.client.ui.ShowMoreFeeds; import org.gcube.portlets.user.newsfeed.client.ui.SingleComment; import org.gcube.portlets.user.newsfeed.client.ui.TweetTemplate; -import org.gcube.portlets.user.newsfeed.shared.EnhancedFeed; import org.gcube.portlets.user.newsfeed.shared.MoreFeedsBean; import org.gcube.portlets.user.newsfeed.shared.NewsConstants; import org.gcube.portlets.user.newsfeed.shared.OperationResult; diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java index 8e1f463..7ddc47c 100644 --- a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java +++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java @@ -11,6 +11,7 @@ import org.gcube.portal.databook.client.GCubeSocialNetworking; import org.gcube.portal.databook.client.util.Encoder; import org.gcube.portal.databook.shared.Attachment; import org.gcube.portal.databook.shared.Comment; +import org.gcube.portal.databook.shared.EnhancedFeed; import org.gcube.portal.databook.shared.Feed; import org.gcube.portal.databook.shared.UserInfo; import org.gcube.portlets.user.newsfeed.client.event.AddLikeEvent; @@ -20,7 +21,6 @@ import org.gcube.portlets.user.newsfeed.client.event.SeeCommentsEvent; import org.gcube.portlets.user.newsfeed.client.event.SeeLikesEvent; import org.gcube.portlets.user.newsfeed.client.event.UnLikeEvent; import org.gcube.portlets.user.newsfeed.client.panels.NewsFeedPanel; -import org.gcube.portlets.user.newsfeed.shared.EnhancedFeed; import org.gcube.portlets.widgets.imagepreviewerwidget.client.EnhancedImage; import org.gcube.portlets.widgets.imagepreviewerwidget.client.ui.Carousel; diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java b/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java index a70fc77..b8c36b4 100644 --- a/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java @@ -28,6 +28,7 @@ import org.gcube.portal.databook.server.DBCassandraAstyanaxImpl; import org.gcube.portal.databook.server.DatabookStore; import org.gcube.portal.databook.shared.Attachment; import org.gcube.portal.databook.shared.Comment; +import org.gcube.portal.databook.shared.EnhancedFeed; import org.gcube.portal.databook.shared.Feed; import org.gcube.portal.databook.shared.Like; import org.gcube.portal.databook.shared.RangeFeeds; @@ -42,7 +43,6 @@ import org.gcube.portal.notifications.thread.CommentNotificationsThread; import org.gcube.portal.notifications.thread.LikeNotificationsThread; import org.gcube.portal.notifications.thread.MentionNotificationsThread; import org.gcube.portlets.user.newsfeed.client.NewsService; -import org.gcube.portlets.user.newsfeed.shared.EnhancedFeed; import org.gcube.portlets.user.newsfeed.shared.MoreFeedsBean; import org.gcube.portlets.user.newsfeed.shared.NewsConstants; import org.gcube.portlets.user.newsfeed.shared.OperationResult; diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/shared/EnhancedFeed.java b/src/main/java/org/gcube/portlets/user/newsfeed/shared/EnhancedFeed.java deleted file mode 100644 index cea762d..0000000 --- a/src/main/java/org/gcube/portlets/user/newsfeed/shared/EnhancedFeed.java +++ /dev/null @@ -1,89 +0,0 @@ -package org.gcube.portlets.user.newsfeed.shared; - -import java.io.Serializable; -import java.util.ArrayList; - -import org.gcube.portal.databook.shared.Attachment; -import org.gcube.portal.databook.shared.Comment; -import org.gcube.portal.databook.shared.Feed; -/** - * - * @author massi - * This class contains addtional user related information about a Feed - * e.g. if this user has liked it - */ -@SuppressWarnings("serial") -public class EnhancedFeed implements Serializable{ - private Feed feed; - private boolean liked; - private boolean isUsers; - private ArrayList comments; - private ArrayList attachments; - - - public EnhancedFeed() { - super(); - } - public EnhancedFeed(Feed feed, boolean liked, boolean isUsers) { - super(); - this.feed = feed; - this.liked = liked; - this.isUsers = isUsers; - } - - public EnhancedFeed(Feed feed, boolean liked, boolean isUsers, ArrayList comments) { - super(); - this.isUsers = isUsers; - this.feed = feed; - this.liked = liked; - this.comments = comments; - } - - - public EnhancedFeed(Feed feed, boolean liked, boolean isUsers, - ArrayList comments, ArrayList attachments) { - super(); - this.feed = feed; - this.liked = liked; - this.isUsers = isUsers; - this.comments = comments; - this.attachments = attachments; - } - public ArrayList getComments() { - return comments; - } - public void setComments(ArrayList comments) { - this.comments = comments; - } - public Feed getFeed() { - return feed; - } - public void setFeed(Feed feed) { - this.feed = feed; - } - public boolean isLiked() { - return liked; - } - public void setLiked(boolean liked) { - this.liked = liked; - } - public boolean isUsers() { - return isUsers; - } - public void setUsers(boolean isUsers) { - this.isUsers = isUsers; - } - public ArrayList getAttachments() { - return attachments; - } - public void setAttachments(ArrayList attachments) { - this.attachments = attachments; - } - @Override - public String toString() { - return "EnhancedFeed [feed=" + feed + ", liked=" + liked + ", isUsers=" - + isUsers + ", comments=" + comments + ", attachments=" - + attachments + "]"; - } - -} diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/shared/MoreFeedsBean.java b/src/main/java/org/gcube/portlets/user/newsfeed/shared/MoreFeedsBean.java index bcae427..9ed1d9b 100644 --- a/src/main/java/org/gcube/portlets/user/newsfeed/shared/MoreFeedsBean.java +++ b/src/main/java/org/gcube/portlets/user/newsfeed/shared/MoreFeedsBean.java @@ -3,6 +3,8 @@ package org.gcube.portlets.user.newsfeed.shared; import java.io.Serializable; import java.util.ArrayList; +import org.gcube.portal.databook.shared.EnhancedFeed; + @SuppressWarnings("serial") public class MoreFeedsBean implements Serializable { private int lastReturnedFeedTimelineIndex;