git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1089 d1b88da0-ebda-0310...

[scalable-opengroupware.org] / UI / Scheduler / UIxCalendarSelector.m

diff --git a/UI/Scheduler/UIxCalendarSelector.m b/UI/Scheduler/UIxCalendarSelector.m
index ab6b124a14a6f49ea607ba206ab354869f2b7944..7205bfec7fc58133807f284d3e11d46bfdaa194b 100644 (file)
--- a/UI/Scheduler/UIxCalendarSelector.m
+++ b/UI/Scheduler/UIxCalendarSelector.m
@@ -28,9 +28,9 @@
 #import <NGExtensions/NGExtensions.h>
 #import <NGCards/iCalPerson.h>
 
-#import <SOGo/AgenorUserManager.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGoUI/UIxComponent.h>
+#import <Appointments/SOGoAppointmentFolder.h>
 
 #import "UIxCalendarSelector.h"
 
@@ -90,8 +90,7 @@ colorForNumber (unsigned int number)
 {
   if ((self = [super init]))
     {
-      colors = [NSMutableDictionary new];
-      calendarFolders = nil;
+      colors = nil;
       currentCalendarFolder = nil;
     }
 
@@ -100,34 +99,34 @@ colorForNumber (unsigned int number)
 
 - (void) dealloc
 {
-  [calendarFolders release];
   [currentCalendarFolder release];
   [colors release];
   [super dealloc];
 }
 
-- (void) setCalendarFolders: (NSArray *) newCalendarFolders
+- (NSArray *) calendarFolders
 {
+  NSArray *calendarFolders;
   NSEnumerator *newFolders;
   NSDictionary *currentFolder;
   unsigned int count;
 
-  ASSIGN (calendarFolders, newCalendarFolders);
-
-  newFolders = [calendarFolders objectEnumerator];
-  currentFolder = [newFolders nextObject];
-  count = 0;
-  while (currentFolder)
+  calendarFolders = [[self clientObject] calendarFolders];
+  if (!colors)
     {
-      [colors setObject: colorForNumber (count)
-             forKey: [currentFolder objectForKey: @"folder"]];
-      count++;
+      colors = [NSMutableDictionary new];
+      count = 0;
+      newFolders = [calendarFolders objectEnumerator];
       currentFolder = [newFolders nextObject];
+      while (currentFolder)
+       {
+         [colors setObject: colorForNumber (count)
+                 forKey: [currentFolder objectForKey: @"folder"]];
+         count++;
+         currentFolder = [newFolders nextObject];
+       }
     }
-}
 
-- (NSArray *) calendarFolders
-{
   return calendarFolders;
 }