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

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

Browse Source 
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
source/java/org/alfresco/repo/domain/activities/ActivityFeedEntity.java
View File

@@ -1,19 +1,19 @@
/*
* Copyright (C) 2005-2010 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* Copyright (C) 2005-2010 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.repo.domain.activities;
@@ -22,7 +22,6 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import org.alfresco.repo.activities.feed.FeedTaskProcessor;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.util.JSONtoFmModel;
import org.json.JSONException;
@@ -43,12 +42,10 @@ public class ActivityFeedEntity
public static final String KEY_ACTIVITY_FEED_SITE = "siteNetwork";
public static final String KEY_ACTIVITY_FEED_TYPE = "activityType";
public static final String KEY_ACTIVITY_FEED_SUMMARY = "activitySummary";
public static final String KEY_ACTIVITY_FEED_SUMMARY_FORMAT = "activitySummaryFormat";
private Long id; // internal DB-generated id
private String activityType;
private String activitySummary;
private String activitySummaryFormat;
private String feedUserId;
private String postUserId;
private NodeRef postUserAvatarNodeRef;
@@ -99,16 +96,6 @@ public class ActivityFeedEntity
this.postUserId = userid;
}
public String getActivitySummaryFormat()
{
return activitySummaryFormat;
}
public void setActivitySummaryFormat(String format)
{
this.activitySummaryFormat = format;
}
public String getSiteNetwork()
{
return siteNetwork;
@@ -196,8 +183,6 @@ public class ActivityFeedEntity
jo.put(KEY_ACTIVITY_FEED_TYPE, getActivityType());
jo.put(KEY_ACTIVITY_FEED_SUMMARY, getActivitySummary());
jo.put(KEY_ACTIVITY_FEED_SUMMARY_FORMAT, getActivitySummaryFormat());
return jo.toString();
}
@@ -214,9 +199,7 @@ public class ActivityFeedEntity
map.put(KEY_ACTIVITY_FEED_SITE, getSiteNetwork());
map.put(KEY_ACTIVITY_FEED_TYPE, getActivityType());
map.put(KEY_ACTIVITY_FEED_SUMMARY_FORMAT, getActivitySummaryFormat());
if ((getActivitySummary() != null) && getActivitySummaryFormat().equals(FeedTaskProcessor.FEED_FORMAT_JSON))
if (getActivitySummary() != null)
{
map.put(KEY_ACTIVITY_FEED_SUMMARY, JSONtoFmModel.convertJSONObjectToMap(getActivitySummary()));
}
@@ -236,7 +219,6 @@ public class ActivityFeedEntity
sb.append("id=").append(id).append(",");
sb.append("activityType=").append(activityType).append(",");
sb.append("activitySummary=").append(activitySummary).append(",");
sb.append("activitySummaryFormat=").append(activitySummaryFormat).append(",");
sb.append("feedUserId=").append(feedUserId).append(",");
sb.append("postUserId=").append(postUserId).append(",");
sb.append("postDate=").append(postDate).append(",");