inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

Browse Source 
125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Raluca Munteanu
2016-04-26 13:03:25 +00:00
parent 9a889c69ea
commit 386a4aca06
327 changed files with 55062 additions and 55062 deletions
Download Patch File Download Diff File Expand all files Collapse all files

280
source/java/org/alfresco/rest/api/model/Activity.java
View File

@@ -1,140 +1,140 @@
package org.alfresco.rest.api.model;
import java.util.Date;
import java.util.Map;
import org.alfresco.rest.framework.resource.UniqueId;
/**
* Represents an activity feed entry.
*
* @author steveglover
*
*/
public class Activity implements Comparable<Activity>
{
private Long id;
private String networkId;
private String siteId;
private String feedPersonId;
private String postPersonId;
private Date postedAt;
private String activityType;
private Map<String, Object> activitySummary;
public Activity()
{
}
public Activity(Long id, String networkId, String siteId, String feedPersonId,
String postPersonId, Date postedAt, String activityType, Map<String, Object> activitySummary)
{
super();
this.id = id;
this.networkId = networkId;
this.siteId = siteId;
this.feedPersonId = feedPersonId;
this.postPersonId = postPersonId;
this.postedAt = postedAt;
this.activityType = activityType;
this.activitySummary = activitySummary;
}
@UniqueId
public Long getId()
{
return id;
}
public String getNetworkId()
{
return networkId;
}
public String getSiteId()
{
return siteId;
}
public String getFeedPersonId()
{
return feedPersonId;
}
public String getPostPersonId()
{
return postPersonId;
}
public String getActivityType()
{
return activityType;
}
public Date getPostedAt()
{
return postedAt;
}
public Map<String, Object> getActivitySummary()
{
return activitySummary;
}
@Override
public int hashCode()
{
final int prime = 31;
int result = 1;
result = prime * result + ((id == null) ? 0 : id.hashCode());
return result;
}
@Override
public boolean equals(Object obj)
{
if (this == obj)
{
return true;
}
if (obj == null)
{
return false;
}
if (getClass() != obj.getClass())
{
return false;
}
Activity other = (Activity) obj;
return(id.equals(other.id));
}
@Override
public int compareTo(Activity activity)
{
long otherId = activity.getId();
long diff = id - otherId;
if(diff == 0)
{
return 0;
}
else
{
return diff < 0 ? -1 : 1;
}
}
@Override
public String toString()
{
return "Activity [id=" + id + ", siteId=" + siteId
+ ", feedPersonId=" + feedPersonId + ", postPersonId=" + postPersonId
+ ", postedAt=" + postedAt
+ ", activityType=" + activityType + ", activitySummary="
+ activitySummary + "]";
}
}
package org.alfresco.rest.api.model;
import java.util.Date;
import java.util.Map;
import org.alfresco.rest.framework.resource.UniqueId;
/**
* Represents an activity feed entry.
*
* @author steveglover
*
*/
public class Activity implements Comparable<Activity>
{
private Long id;
private String networkId;
private String siteId;
private String feedPersonId;
private String postPersonId;
private Date postedAt;
private String activityType;
private Map<String, Object> activitySummary;
public Activity()
{
}
public Activity(Long id, String networkId, String siteId, String feedPersonId,
String postPersonId, Date postedAt, String activityType, Map<String, Object> activitySummary)
{
super();
this.id = id;
this.networkId = networkId;
this.siteId = siteId;
this.feedPersonId = feedPersonId;
this.postPersonId = postPersonId;
this.postedAt = postedAt;
this.activityType = activityType;
this.activitySummary = activitySummary;
}
@UniqueId
public Long getId()
{
return id;
}
public String getNetworkId()
{
return networkId;
}
public String getSiteId()
{
return siteId;
}
public String getFeedPersonId()
{
return feedPersonId;
}
public String getPostPersonId()
{
return postPersonId;
}
public String getActivityType()
{
return activityType;
}
public Date getPostedAt()
{
return postedAt;
}
public Map<String, Object> getActivitySummary()
{
return activitySummary;
}
@Override
public int hashCode()
{
final int prime = 31;
int result = 1;
result = prime * result + ((id == null) ? 0 : id.hashCode());
return result;
}
@Override
public boolean equals(Object obj)
{
if (this == obj)
{
return true;
}
if (obj == null)
{
return false;
}
if (getClass() != obj.getClass())
{
return false;
}
Activity other = (Activity) obj;
return(id.equals(other.id));
}
@Override
public int compareTo(Activity activity)
{
long otherId = activity.getId();
long diff = id - otherId;
if(diff == 0)
{
return 0;
}
else
{
return diff < 0 ? -1 : 1;
}
}
@Override
public String toString()
{
return "Activity [id=" + id + ", siteId=" + siteId
+ ", feedPersonId=" + feedPersonId + ", postPersonId=" + postPersonId
+ ", postedAt=" + postedAt
+ ", activityType=" + activityType + ", activitySummary="
+ activitySummary + "]";
}
}