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
This commit is contained in:
parent
de0eafa5c4
commit
fe1361615c
|
@ -4,8 +4,8 @@ import java.util.ArrayList;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
|
|
||||||
import org.gcube.portal.databook.shared.Comment;
|
import org.gcube.portal.databook.shared.Comment;
|
||||||
|
import org.gcube.portal.databook.shared.EnhancedFeed;
|
||||||
import org.gcube.portal.databook.shared.Like;
|
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.MoreFeedsBean;
|
||||||
import org.gcube.portlets.user.newsfeed.shared.OperationResult;
|
import org.gcube.portlets.user.newsfeed.shared.OperationResult;
|
||||||
import org.gcube.portlets.user.newsfeed.shared.UserSettings;
|
import org.gcube.portlets.user.newsfeed.shared.UserSettings;
|
||||||
|
|
|
@ -4,8 +4,8 @@ import java.util.ArrayList;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
|
|
||||||
import org.gcube.portal.databook.shared.Comment;
|
import org.gcube.portal.databook.shared.Comment;
|
||||||
|
import org.gcube.portal.databook.shared.EnhancedFeed;
|
||||||
import org.gcube.portal.databook.shared.Like;
|
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.MoreFeedsBean;
|
||||||
import org.gcube.portlets.user.newsfeed.shared.OperationResult;
|
import org.gcube.portlets.user.newsfeed.shared.OperationResult;
|
||||||
import org.gcube.portlets.user.newsfeed.shared.UserSettings;
|
import org.gcube.portlets.user.newsfeed.shared.UserSettings;
|
||||||
|
|
|
@ -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.Attachment;
|
||||||
import org.gcube.portal.databook.shared.ClientFeed;
|
import org.gcube.portal.databook.shared.ClientFeed;
|
||||||
import org.gcube.portal.databook.shared.Comment;
|
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.Feed;
|
||||||
import org.gcube.portal.databook.shared.FeedType;
|
import org.gcube.portal.databook.shared.FeedType;
|
||||||
import org.gcube.portal.databook.shared.Like;
|
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.ShowMoreFeeds;
|
||||||
import org.gcube.portlets.user.newsfeed.client.ui.SingleComment;
|
import org.gcube.portlets.user.newsfeed.client.ui.SingleComment;
|
||||||
import org.gcube.portlets.user.newsfeed.client.ui.TweetTemplate;
|
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.MoreFeedsBean;
|
||||||
import org.gcube.portlets.user.newsfeed.shared.NewsConstants;
|
import org.gcube.portlets.user.newsfeed.shared.NewsConstants;
|
||||||
import org.gcube.portlets.user.newsfeed.shared.OperationResult;
|
import org.gcube.portlets.user.newsfeed.shared.OperationResult;
|
||||||
|
|
|
@ -11,6 +11,7 @@ import org.gcube.portal.databook.client.GCubeSocialNetworking;
|
||||||
import org.gcube.portal.databook.client.util.Encoder;
|
import org.gcube.portal.databook.client.util.Encoder;
|
||||||
import org.gcube.portal.databook.shared.Attachment;
|
import org.gcube.portal.databook.shared.Attachment;
|
||||||
import org.gcube.portal.databook.shared.Comment;
|
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.Feed;
|
||||||
import org.gcube.portal.databook.shared.UserInfo;
|
import org.gcube.portal.databook.shared.UserInfo;
|
||||||
import org.gcube.portlets.user.newsfeed.client.event.AddLikeEvent;
|
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.SeeLikesEvent;
|
||||||
import org.gcube.portlets.user.newsfeed.client.event.UnLikeEvent;
|
import org.gcube.portlets.user.newsfeed.client.event.UnLikeEvent;
|
||||||
import org.gcube.portlets.user.newsfeed.client.panels.NewsFeedPanel;
|
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.EnhancedImage;
|
||||||
import org.gcube.portlets.widgets.imagepreviewerwidget.client.ui.Carousel;
|
import org.gcube.portlets.widgets.imagepreviewerwidget.client.ui.Carousel;
|
||||||
|
|
||||||
|
|
|
@ -28,6 +28,7 @@ import org.gcube.portal.databook.server.DBCassandraAstyanaxImpl;
|
||||||
import org.gcube.portal.databook.server.DatabookStore;
|
import org.gcube.portal.databook.server.DatabookStore;
|
||||||
import org.gcube.portal.databook.shared.Attachment;
|
import org.gcube.portal.databook.shared.Attachment;
|
||||||
import org.gcube.portal.databook.shared.Comment;
|
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.Feed;
|
||||||
import org.gcube.portal.databook.shared.Like;
|
import org.gcube.portal.databook.shared.Like;
|
||||||
import org.gcube.portal.databook.shared.RangeFeeds;
|
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.LikeNotificationsThread;
|
||||||
import org.gcube.portal.notifications.thread.MentionNotificationsThread;
|
import org.gcube.portal.notifications.thread.MentionNotificationsThread;
|
||||||
import org.gcube.portlets.user.newsfeed.client.NewsService;
|
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.MoreFeedsBean;
|
||||||
import org.gcube.portlets.user.newsfeed.shared.NewsConstants;
|
import org.gcube.portlets.user.newsfeed.shared.NewsConstants;
|
||||||
import org.gcube.portlets.user.newsfeed.shared.OperationResult;
|
import org.gcube.portlets.user.newsfeed.shared.OperationResult;
|
||||||
|
|
|
@ -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<Comment> comments;
|
|
||||||
private ArrayList<Attachment> 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<Comment> comments) {
|
|
||||||
super();
|
|
||||||
this.isUsers = isUsers;
|
|
||||||
this.feed = feed;
|
|
||||||
this.liked = liked;
|
|
||||||
this.comments = comments;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public EnhancedFeed(Feed feed, boolean liked, boolean isUsers,
|
|
||||||
ArrayList<Comment> comments, ArrayList<Attachment> attachments) {
|
|
||||||
super();
|
|
||||||
this.feed = feed;
|
|
||||||
this.liked = liked;
|
|
||||||
this.isUsers = isUsers;
|
|
||||||
this.comments = comments;
|
|
||||||
this.attachments = attachments;
|
|
||||||
}
|
|
||||||
public ArrayList<Comment> getComments() {
|
|
||||||
return comments;
|
|
||||||
}
|
|
||||||
public void setComments(ArrayList<Comment> 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<Attachment> getAttachments() {
|
|
||||||
return attachments;
|
|
||||||
}
|
|
||||||
public void setAttachments(ArrayList<Attachment> attachments) {
|
|
||||||
this.attachments = attachments;
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "EnhancedFeed [feed=" + feed + ", liked=" + liked + ", isUsers="
|
|
||||||
+ isUsers + ", comments=" + comments + ", attachments="
|
|
||||||
+ attachments + "]";
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -3,6 +3,8 @@ package org.gcube.portlets.user.newsfeed.shared;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
import org.gcube.portal.databook.shared.EnhancedFeed;
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class MoreFeedsBean implements Serializable {
|
public class MoreFeedsBean implements Serializable {
|
||||||
private int lastReturnedFeedTimelineIndex;
|
private int lastReturnedFeedTimelineIndex;
|
||||||
|
|
Loading…
Reference in New Issue