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

ACE-3175

Browse Source 
- First part, fix embarrassing spelling mistakes in public API methods and bean settings.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88884 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2014-10-22 09:13:24 +00:00
parent 5c08c97cb4
commit 9376ec3b44
5 changed files with 108 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/subsystems/ActivitiesFeed/default/activities-feed-context.xml
View File

@@ -152,7 +152,7 @@
<!-- Feed Email Notifier --> <!-- Feed Email Notifier -->
<bean id="emailUserNotifier" class="org.alfresco.repo.activities.feed.EmailUserNotifier"> <bean id="emailUserNotifier" class="org.alfresco.repo.activities.feed.EmailUserNotifier">
<property name="activitiesFeedModdelBuilderFactory" ref="feedModelBuilderFactory"/> <property name="activitiesFeedModelBuilderFactory" ref="feedModelBuilderFactory"/>
<property name="activityService" ref="activityService"/> <property name="activityService" ref="activityService"/>
<property name="namespaceService" ref="NamespaceService"/> <property name="namespaceService" ref="NamespaceService"/>
<property name="repoAdminService" ref="repoAdminService"/> <property name="repoAdminService" ref="repoAdminService"/>

12
source/java/org/alfresco/repo/activities/feed/AbstractUserNotifier.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2013 Alfresco Software Limited. * Copyright (C) 2005-2014 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -44,9 +44,9 @@ import org.json.JSONException;
import org.springframework.beans.factory.ObjectFactory; import org.springframework.beans.factory.ObjectFactory;
/** /**
*
* @since 4.0 * @since 4.0
* *
* @author Alex Miller
*/ */
public abstract class AbstractUserNotifier implements UserNotifier public abstract class AbstractUserNotifier implements UserNotifier
{ {
@@ -84,9 +84,9 @@ public abstract class AbstractUserNotifier implements UserNotifier
this.siteService = siteService; this.siteService = siteService;
} }
public void setActivitiesFeedModdelBuilderFactory(ObjectFactory<ActivitiesFeedModelBuilder> activitivitesFeedModelBuilderFactory) public void setActivitiesFeedModelBuilderFactory(ObjectFactory<ActivitiesFeedModelBuilder> activitiesFeedModelBuilder)
{ {
this.activitiesFeedModelBuilderFactory = activitivitesFeedModelBuilderFactory; this.activitiesFeedModelBuilderFactory = activitiesFeedModelBuilder;
} }
/** /**
@@ -94,7 +94,7 @@ public abstract class AbstractUserNotifier implements UserNotifier
*/ */
protected void checkProperties() protected void checkProperties()
{ {
PropertyCheck.mandatory(this, "activitiesFeedModdelBuilderFactory", activitiesFeedModelBuilderFactory); PropertyCheck.mandatory(this, "activitiesFeedModelBuilderFactory", activitiesFeedModelBuilderFactory);
PropertyCheck.mandatory(this, "activityService", activityService); PropertyCheck.mandatory(this, "activityService", activityService);
PropertyCheck.mandatory(this, "nodeService", nodeService); PropertyCheck.mandatory(this, "nodeService", nodeService);
PropertyCheck.mandatory(this, "namespaceService", namespaceService); PropertyCheck.mandatory(this, "namespaceService", namespaceService);
@@ -175,7 +175,7 @@ public abstract class AbstractUserNotifier implements UserNotifier
{ {
try try
{ {
modelBuilder.addAcctivitiyFeedEntry(feedEntry); modelBuilder.addActivityFeedEntry(feedEntry);
String siteId = feedEntry.getSiteNetwork(); String siteId = feedEntry.getSiteNetwork();
addSiteName(siteId, siteNames); addSiteName(siteId, siteNames);

2
source/java/org/alfresco/repo/activities/feed/ActivitiesFeedModelBuilder.java
View File

@@ -33,7 +33,7 @@ public interface ActivitiesFeedModelBuilder
Map<String, Object> buildModel(); Map<String, Object> buildModel();
void addAcctivitiyFeedEntry(ActivityFeedEntity feedEntry) throws JSONException; void addActivityFeedEntry(ActivityFeedEntity feedEntry) throws JSONException;
int activityCount(); int activityCount();

4
source/java/org/alfresco/repo/activities/feed/DefaultActivitiesFeedModelBuilder.java
View File

@@ -45,7 +45,7 @@ public class DefaultActivitiesFeedModelBuilder implements ActivitiesFeedModelBui
} }
@Override @Override
public void addAcctivitiyFeedEntry(ActivityFeedEntity feedEntry) throws JSONException public void addActivityFeedEntry(ActivityFeedEntity feedEntry) throws JSONException
{ {
Map<String, Object> map; Map<String, Object> map;
map = feedEntry.getModel(); map = feedEntry.getModel();
@@ -56,7 +56,6 @@ public class DefaultActivitiesFeedModelBuilder implements ActivitiesFeedModelBui
{ {
maxFeedId = feedId; maxFeedId = feedId;
} }
} }
@Override @Override
@@ -70,5 +69,4 @@ public class DefaultActivitiesFeedModelBuilder implements ActivitiesFeedModelBui
{ {
return maxFeedId; return maxFeedId;
} }
} }

2
source/test-java/org/alfresco/repo/activities/feed/FeedNotifierTest.java
View File

@@ -230,7 +230,7 @@ public class FeedNotifierTest
userNotifier.setActivityService(activityService); userNotifier.setActivityService(activityService);
userNotifier.setRepoAdminService(repoAdminService); userNotifier.setRepoAdminService(repoAdminService);
userNotifier.setActionService(actionService); userNotifier.setActionService(actionService);
userNotifier.setActivitiesFeedModdelBuilderFactory(feedModelBuilderFactory); userNotifier.setActivitiesFeedModelBuilderFactory(feedModelBuilderFactory);
feedNotifier.setUserNotifier(userNotifier); feedNotifier.setUserNotifier(userNotifier);
} }