From 9adcac3910497e434dbaf60f46f9b010060e4cb0 Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Mon, 11 Jul 2011 14:22:48 +0000 Subject: [PATCH] ALF-9156 Port the existing (SharePoint Specific) recurring events logic to Java, and add some basic tests for fetching it git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28917 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/calendar/CalendarEntryImpl.java | 9 ++++----- .../org/alfresco/service/cmr/calendar/CalendarEntry.java | 9 +++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/source/java/org/alfresco/repo/calendar/CalendarEntryImpl.java b/source/java/org/alfresco/repo/calendar/CalendarEntryImpl.java index a5e1a5ae66..07dd8fdfd9 100644 --- a/source/java/org/alfresco/repo/calendar/CalendarEntryImpl.java +++ b/source/java/org/alfresco/repo/calendar/CalendarEntryImpl.java @@ -67,6 +67,7 @@ public class CalendarEntryImpl extends CalendarEntryDTO /** * Builds up the node properties for a given Calendar Entry + * Doesn't handle tags, those must be done in the service itself. */ protected static Map toNodeProperties(CalendarEntry entry) { @@ -84,13 +85,12 @@ public class CalendarEntryImpl extends CalendarEntryDTO // properties.put(CalendarModel.PROP_COLOR, entry.getColor(); - // TODO Tags, doc folders - return properties; } /** - * Populates a Calendar Entry from the given node properties + * Populates a Calendar Entry from the given node properties. + * Doesn't handle tags, those must be done in the service itself. */ protected static void populate(CalendarEntry entry, Map properties) { @@ -108,12 +108,11 @@ public class CalendarEntryImpl extends CalendarEntryDTO entry.setOutlookUID((String)properties.get(CalendarModel.PROP_OUTLOOK_UID)); //entry.setColor(properties.get(CalendarModel.PROP_COLOR)); - - // TODO Tags, doc folders } /** * Populates this entry from the given node properties + * Doesn't handle tags, those are done in the service itself. */ protected void populate(Map properties) { diff --git a/source/java/org/alfresco/service/cmr/calendar/CalendarEntry.java b/source/java/org/alfresco/service/cmr/calendar/CalendarEntry.java index 7d8a9417c1..f3d0b4472c 100644 --- a/source/java/org/alfresco/service/cmr/calendar/CalendarEntry.java +++ b/source/java/org/alfresco/service/cmr/calendar/CalendarEntry.java @@ -94,18 +94,19 @@ public interface CalendarEntry extends Serializable, PermissionCheckValue { /** * Gets the event recurrence rule. - * TODO Define these + * This needs to be in the SharePoint/Outlook format of + * FREQ=...;INTERVAL=...;BY...=...;COUNT=... */ String getRecurrenceRule(); /** - * Sets the event recurrence rule - * TODO Define these + * Sets the event recurrence rule, in SharePoint/Outlook format */ void setRecurrenceRule(String recurrenceRule); /** - * Gets the date of the last instance of this recurring event + * Gets the date of the last instance of this recurring event, + * i.e. the last date up until which recurrances will occur. */ Date getLastRecurrence();