From e0acd125c45883b1f11b0395c6bb09a51556968f Mon Sep 17 00:00:00 2001 From: helge Date: Sun, 20 Mar 2005 20:13:20 +0000 Subject: [PATCH] changed to use GDLContentStore git-svn-id: http://svn.opengroupware.org/SOGo/trunk@629 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/SoObjects/Appointments/ChangeLog | 4 ++++ .../SoObjects/Appointments/SOGoAppointmentFolder.h | 6 +++--- .../SoObjects/Appointments/SOGoAppointmentFolder.m | 6 +++--- SOGo/SoObjects/Appointments/Version | 11 ++++++----- SOGo/SoObjects/Contacts/ChangeLog | 4 ++++ SOGo/SoObjects/Contacts/SOGoContactFolder.h | 4 ++-- SOGo/SoObjects/Contacts/SOGoContactFolder.m | 2 +- SOGo/SoObjects/Contacts/Version | 5 +++-- SOGo/SoObjects/SOGo/ChangeLog | 4 ++++ SOGo/SoObjects/SOGo/SOGoContentObject.h | 2 +- SOGo/SoObjects/SOGo/SOGoContentObject.m | 12 ++++++------ SOGo/SoObjects/SOGo/SOGoFolder.h | 13 ++++++------- SOGo/SoObjects/SOGo/SOGoFolder.m | 14 +++++++------- SOGo/SoObjects/SOGo/SOGoObject.h | 2 +- SOGo/SoObjects/SOGo/Version | 3 ++- 15 files changed, 53 insertions(+), 39 deletions(-) diff --git a/SOGo/SoObjects/Appointments/ChangeLog b/SOGo/SoObjects/Appointments/ChangeLog index 3362f04c..d721ae84 100644 --- a/SOGo/SoObjects/Appointments/ChangeLog +++ b/SOGo/SoObjects/Appointments/ChangeLog @@ -1,3 +1,7 @@ +2005-03-20 Helge Hess + + * SOGoAppointmentFolder.m: changed to use GDLContentStore (v0.9.32) + 2005-03-03 Marcus Mueller * SOGoGroupAppointmentFolder.m: fixed incorrect creation of a mutable diff --git a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.h b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.h index 112010b6..7019e761 100644 --- a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.h +++ b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.h @@ -30,12 +30,12 @@ Parent object: the SOGoUserFolder Child objects: SOGoAppointmentObject - The SOGoAppointmentFolder maps to an OCS folder of type 'appointment', that + The SOGoAppointmentFolder maps to an GCS folder of type 'appointment', that is, a content folder containing iCalendar files (and a proper quicktable). */ @class NSString, NSArray, NSCalendarDate, NSException; -@class OCSFolder; +@class GCSFolder; @interface SOGoAppointmentFolder : SOGoFolder { @@ -50,7 +50,7 @@ /* fetching */ - (NSArray *)fetchFields:(NSArray *)_fields - fromFolder:(OCSFolder *)_folder + fromFolder:(GCSFolder *)_folder from:(NSCalendarDate *)_startDate to:(NSCalendarDate *)_endDate; diff --git a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m index 082378c0..3ccc895b 100644 --- a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -282,7 +282,7 @@ static NSTimeZone *MET = nil; } - (NSArray *)fetchFields:(NSArray *)_fields - fromFolder:(OCSFolder *)_folder + fromFolder:(GCSFolder *)_folder from:(NSCalendarDate *)_startDate to:(NSCalendarDate *)_endDate { @@ -365,7 +365,7 @@ static NSTimeZone *MET = nil; from:(NSCalendarDate *)_startDate to:(NSCalendarDate *)_endDate { - OCSFolder *folder; + GCSFolder *folder; if ((folder = [self ocsFolder]) == nil) { [self errorWithFormat:@"(%s): missing folder for fetch!", diff --git a/SOGo/SoObjects/Appointments/Version b/SOGo/SoObjects/Appointments/Version index 348bdedc..fc52df3a 100644 --- a/SOGo/SoObjects/Appointments/Version +++ b/SOGo/SoObjects/Appointments/Version @@ -1,8 +1,9 @@ # Version file -SUBMINOR_VERSION:=31 +SUBMINOR_VERSION:=32 -# v0.9.28 requires NGiCal v4.5.47 -# v0.9.26 requires libSOGo v0.9.30 -# v0.9.19 requires NGiCal v4.5.36 -# v0.9.13 requires libSOGo v0.9.26 +# v0.9.32 requires libGDLContentStore v4.5.26 +# v0.9.28 requires libNGiCal v4.5.47 +# v0.9.26 requires libSOGo v0.9.30 +# v0.9.19 requires libNGiCal v4.5.36 +# v0.9.13 requires libSOGo v0.9.26 diff --git a/SOGo/SoObjects/Contacts/ChangeLog b/SOGo/SoObjects/Contacts/ChangeLog index 2497f845..4176cbc0 100644 --- a/SOGo/SoObjects/Contacts/ChangeLog +++ b/SOGo/SoObjects/Contacts/ChangeLog @@ -1,3 +1,7 @@ +2005-03-20 Helge Hess + + * SOGoContactFolder.m: changed to use GDLContentStore (v0.9.9) + 2005-02-24 Helge Hess * SOGoContactObject.m: fixed a MacOSX warning (v0.9.8) diff --git a/SOGo/SoObjects/Contacts/SOGoContactFolder.h b/SOGo/SoObjects/Contacts/SOGoContactFolder.h index 6c61e4b6..e68e7dab 100644 --- a/SOGo/SoObjects/Contacts/SOGoContactFolder.h +++ b/SOGo/SoObjects/Contacts/SOGoContactFolder.h @@ -30,12 +30,12 @@ Parent object: the SOGoUserFolder Child objects: SOGoContactObject - The SOGoContactFolder maps to an OCS folder of type 'contact', that + The SOGoContactFolder maps to an GCS folder of type 'contact', that is, a content folder containing vcal?? files (and a proper quicktable). */ @class NSString, NSArray, NSCalendarDate, NSException; -@class OCSFolder; +@class GCSFolder; @interface SOGoContactFolder : SOGoFolder { diff --git a/SOGo/SoObjects/Contacts/SOGoContactFolder.m b/SOGo/SoObjects/Contacts/SOGoContactFolder.m index fa20cccd..6a182911 100644 --- a/SOGo/SoObjects/Contacts/SOGoContactFolder.m +++ b/SOGo/SoObjects/Contacts/SOGoContactFolder.m @@ -22,7 +22,7 @@ #include "SOGoContactFolder.h" #include #include -#include +#include #include #include "common.h" #include diff --git a/SOGo/SoObjects/Contacts/Version b/SOGo/SoObjects/Contacts/Version index 7899863f..34a952b8 100644 --- a/SOGo/SoObjects/Contacts/Version +++ b/SOGo/SoObjects/Contacts/Version @@ -1,5 +1,6 @@ # version file -SUBMINOR_VERSION:=8 +SUBMINOR_VERSION:=9 -# v0.9.5 requires NGExtensions v4.5.136 +# v0.9.9 requires libGDLContentStore v4.5.26 +# v0.9.5 requires libNGExtensions v4.5.136 diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog index 5af97f2b..fb88c3e1 100644 --- a/SOGo/SoObjects/SOGo/ChangeLog +++ b/SOGo/SoObjects/SOGo/ChangeLog @@ -1,3 +1,7 @@ +2005-03-20 Helge Hess + + * changed to use GDLContentStore (v0.9.34) + 2005-03-03 Marcus Mueller * SOGoGroupFolder.m: switched logging to NGLogging (v0.9.33) diff --git a/SOGo/SoObjects/SOGo/SOGoContentObject.h b/SOGo/SoObjects/SOGo/SOGoContentObject.h index fac0382b..77e4ddaf 100644 --- a/SOGo/SoObjects/SOGo/SOGoContentObject.h +++ b/SOGo/SoObjects/SOGo/SOGoContentObject.h @@ -41,7 +41,7 @@ /* folder */ - (NSString *)ocsPathOfContainer; -- (OCSFolder *)ocsFolder; +- (GCSFolder *)ocsFolder; /* content */ diff --git a/SOGo/SoObjects/SOGo/SOGoContentObject.m b/SOGo/SoObjects/SOGo/SOGoContentObject.m index 0b9189e6..0f958327 100644 --- a/SOGo/SoObjects/SOGo/SOGoContentObject.m +++ b/SOGo/SoObjects/SOGo/SOGoContentObject.m @@ -21,7 +21,7 @@ #include "SOGoContentObject.h" #include "common.h" -#include +#include @implementation SOGoContentObject @@ -49,7 +49,7 @@ return; if (self->ocsPath) - [self warnWithFormat:@"OCS path is already set! '%@'", _path]; + [self warnWithFormat:@"GCS path is already set! '%@'", _path]; ASSIGNCOPY(self->ocsPath, _path); } @@ -74,7 +74,7 @@ return [[self container] ocsPath]; } -- (OCSFolder *)ocsFolder { +- (GCSFolder *)ocsFolder { if (![[self container] respondsToSelector:@selector(ocsFolder)]) return nil; @@ -84,7 +84,7 @@ /* content */ - (NSString *)contentAsString { - OCSFolder *folder; + GCSFolder *folder; if (self->content != nil) return self->content; @@ -100,7 +100,7 @@ - (NSException *)saveContentString:(NSString *)_str { /* Note: "iCal multifolder saves" are implemented in the apt subclass! */ - OCSFolder *folder; + GCSFolder *folder; NSException *ex; if ((folder = [self ocsFolder]) == nil) { @@ -116,7 +116,7 @@ - (NSException *)delete { /* Note: "iCal multifolder saves" are implemented in the apt subclass! */ - OCSFolder *folder; + GCSFolder *folder; NSException *ex; if ((folder = [self ocsFolder]) == nil) { diff --git a/SOGo/SoObjects/SOGo/SOGoFolder.h b/SOGo/SoObjects/SOGo/SOGoFolder.h index 71059b6c..f48036e9 100644 --- a/SOGo/SoObjects/SOGo/SOGoFolder.h +++ b/SOGo/SoObjects/SOGo/SOGoFolder.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 SKYRIX Software AG + Copyright (C) 2004-2005 SKYRIX Software AG This file is part of OpenGroupware.org. @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ #ifndef __SOGo_SOGoFolder_H__ #define __SOGo_SOGoFolder_H__ @@ -26,19 +25,19 @@ #include @class NSString, NSArray, NSDictionary; -@class OCSFolder; +@class GCSFolder; /* SOGoFolder - A common superclass for folders stored in OCS. Already deals with all OCS + A common superclass for folders stored in GCS. Already deals with all GCS folder specific things. */ @interface SOGoFolder : SOGoObject { NSString *ocsPath; - OCSFolder *ocsFolder; + GCSFolder *ocsFolder; } /* accessors */ @@ -46,8 +45,8 @@ - (void)setOCSPath:(NSString *)_Path; - (NSString *)ocsPath; -- (OCSFolder *)ocsFolderForPath:(NSString *)_path; -- (OCSFolder *)ocsFolder; +- (GCSFolder *)ocsFolderForPath:(NSString *)_path; +- (GCSFolder *)ocsFolder; /* lower level fetches */ diff --git a/SOGo/SoObjects/SOGo/SOGoFolder.m b/SOGo/SoObjects/SOGo/SOGoFolder.m index d3988c66..6d10b9eb 100644 --- a/SOGo/SoObjects/SOGo/SOGoFolder.m +++ b/SOGo/SoObjects/SOGo/SOGoFolder.m @@ -21,8 +21,8 @@ #include "SOGoFolder.h" #include "common.h" -#include -#include +#include +#include @implementation SOGoFolder @@ -43,7 +43,7 @@ return; if (self->ocsPath) - [self warnWithFormat:@"OCS path is already set! '%@'", _path]; + [self warnWithFormat:@"GCS path is already set! '%@'", _path]; ASSIGNCOPY(self->ocsPath, _path); } @@ -51,13 +51,13 @@ return self->ocsPath; } -- (OCSFolderManager *)folderManager { - return [OCSFolderManager defaultFolderManager]; +- (GCSFolderManager *)folderManager { + return [GCSFolderManager defaultFolderManager]; } -- (OCSFolder *)ocsFolderForPath:(NSString *)_path { +- (GCSFolder *)ocsFolderForPath:(NSString *)_path { return [[self folderManager] folderAtPath:_path]; } -- (OCSFolder *)ocsFolder { +- (GCSFolder *)ocsFolder { if (self->ocsFolder != nil) return [self->ocsFolder isNotNull] ? self->ocsFolder : nil; diff --git a/SOGo/SoObjects/SOGo/SOGoObject.h b/SOGo/SoObjects/SOGo/SOGoObject.h index 6e5c93c1..f4d18b8f 100644 --- a/SOGo/SoObjects/SOGo/SOGoObject.h +++ b/SOGo/SoObjects/SOGo/SOGoObject.h @@ -35,7 +35,7 @@ */ @class NSString, NSArray, NSMutableString, NSException; -@class OCSFolderManager, OCSFolder; +@class GCSFolderManager, GCSFolder; @class SOGoUserFolder, SOGoGroupsFolder; @interface SOGoObject : NSObject diff --git a/SOGo/SoObjects/SOGo/Version b/SOGo/SoObjects/SOGo/Version index b36c56a5..495213fa 100644 --- a/SOGo/SoObjects/SOGo/Version +++ b/SOGo/SoObjects/SOGo/Version @@ -1,5 +1,6 @@ # version file -SUBMINOR_VERSION:=33 +SUBMINOR_VERSION:=34 +# v0.9.34 requires libGDLContentStore v4.5.26 # v0.9.26 requires libOGoContentStore v0.9.13 -- 2.39.5