git-svn-id: http://svn.opengroupware.org/SOGo/trunk@175 d1b88da0-ebda-0310-925b-ed51d...

diff --git a/SOGo/SoObjects/Appointments/ChangeLog b/SOGo/SoObjects/Appointments/ChangeLog
index cc4a7037a26288e112eaff4d3bcc873819a7f2b9..8893336c2961f91dc133af248f6776f4bff5cad8 100644 (file)
--- a/SOGo/SoObjects/Appointments/ChangeLog
+++ b/SOGo/SoObjects/Appointments/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-11    <helge@agenor.opengroupware.org>
+
+       * started SOGoGroupAppointmentFolder
+
 2004-07-02  Helge Hess  <helge.hess@opengroupware.org>
 
        * SOGoAppointmentFolder.m: added method to fetch core info from other

diff --git a/SOGo/SoObjects/Appointments/GNUmakefile b/SOGo/SoObjects/Appointments/GNUmakefile
index 26b2ddc6004ed245b8a15775e8d14bad62898df0..fb184a26b1e08564ae8456ee5f65480fd9780528 100644 (file)
--- a/SOGo/SoObjects/Appointments/GNUmakefile
+++ b/SOGo/SoObjects/Appointments/GNUmakefile
@@ -13,6 +13,7 @@ Appointments_OBJC_FILES = \
        \
        SOGoAppointmentObject.m         \
        SOGoAppointmentFolder.m         \
+       SOGoGroupAppointmentFolder.m    \
 
 Appointments_RESOURCE_FILES += \
        Version                 \

diff --git a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.h b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.h
index 243b2fcf86d0e5551f5f5c683103ab53e1170250..1a10c9697496d1c12f913079c5492415c1ab0d56 100644 (file)
--- a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.h
+++ b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.h
@@ -25,6 +25,15 @@
 
 #include <SOGo/SOGoFolder.h>
 
+/*
+  SOGoAppointmentFolder
+    Parent object: the SOGoUserFolder
+    Child objects: SOGoAppointmentObject
+    
+  The SOGoAppointmentFolder maps to an OCS folder of type 'appointment', that
+  is, a content folder containing iCalendar files (and a proper quicktable).
+*/
+
 @class NSString, NSArray, NSCalendarDate, NSException;
 @class OCSFolder;
 

diff --git a/SOGo/SoObjects/Appointments/SOGoGroupAppointmentFolder.h b/SOGo/SoObjects/Appointments/SOGoGroupAppointmentFolder.h
new file mode 100644 (file)
index 0000000..4dfb99e
--- /dev/null
+++ b/SOGo/SoObjects/Appointments/SOGoGroupAppointmentFolder.h
@@ -0,0 +1,46 @@
+/*
+  Copyright (C) 2004 SKYRIX Software AG
+
+  This file is part of OpenGroupware.org.
+
+  OGo 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 2, or (at your option) any
+  later version.
+
+  OGo 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 OGo; see the file COPYING.  If not, write to the
+  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+  02111-1307, USA.
+*/
+// $Id: SOGoAppointmentFolder.h 137 2004-07-02 17:42:14Z helge $
+
+#ifndef __Appointments_SOGoGroupAppointmentFolder_H__
+#define __Appointments_SOGoGroupAppointmentFolder_H__
+
+#include "SOGoAppointmentFolder.h"
+
+/*
+  SOGoGroupAppointmentFolder
+    Parent object: an SOGoGroupFolder (or subclass)
+    Child objects: SOGoAppointmentObject
+  
+  Note: this is only a subclass of SOGoAppointmentFolder to inherit all the
+        SOPE methods (it provides the same API). It is not an ocsFolder but
+        rather looks up the "child" folders for aggregation using regular SOPE
+        techniques.
+        => hm, do we need "aspects" in SOPE? ;-)
+*/
+
+@interface SOGoGroupAppointmentFolder : SOGoAppointmentFolder
+{
+}
+
+@end
+
+#endif /* __Appointments_SOGoGroupAppointmentFolder_H__ */

diff --git a/SOGo/SoObjects/Appointments/SOGoGroupAppointmentFolder.m b/SOGo/SoObjects/Appointments/SOGoGroupAppointmentFolder.m
new file mode 100644 (file)
index 0000000..7b85a73
--- /dev/null
+++ b/SOGo/SoObjects/Appointments/SOGoGroupAppointmentFolder.m
@@ -0,0 +1,36 @@
+/*
+  Copyright (C) 2004 SKYRIX Software AG
+
+  This file is part of OpenGroupware.org.
+
+  OGo 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 2, or (at your option) any
+  later version.
+
+  OGo 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 OGo; see the file COPYING.  If not, write to the
+  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+  02111-1307, USA.
+*/
+// $Id: SOGoAppointmentFolder.m 137 2004-07-02 17:42:14Z helge $
+
+#include "SOGoGroupAppointmentFolder.h"
+#include "common.h"
+
+@implementation SOGoGroupAppointmentFolder
+
+#warning TODO: implement aggregation based on the container
+
+/* looking up shared objects */
+
+- (SOGoGroupsFolder *)lookupGroupsFolder {
+  return [[self container] lookupGroupsFolder];
+}
+
+@end /* SOGoGroupAppointmentFolder */

diff --git a/SOGo/SoObjects/Appointments/product.plist b/SOGo/SoObjects/Appointments/product.plist
index a9cfe6219a7de645ee25b296f17d9a5c5f91abb4..781de9bca3ee4628caca938f4cbbf513323ebfd8 100644 (file)
--- a/SOGo/SoObjects/Appointments/product.plist
+++ b/SOGo/SoObjects/Appointments/product.plist
@@ -11,6 +11,9 @@
     SOGoAppointmentFolder = {
       superclass    = "SOGoFolder";
     };
+    SOGoGroupAppointmentFolder = {
+      superclass    = "SOGoAppointmentFolder";
+    };
 
     SOGoAppointmentObject = {
       superclass    = "SOGoContentObject";

diff --git a/SOGo/SoObjects/SOGo/SOGoGroupFolder.m b/SOGo/SoObjects/SOGo/SOGoGroupFolder.m
index 4ab88390624e0ae657c91332f516c567ba79ddf4..d1f49d219498cff196f09a48c18ce9d8748ab166 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoGroupFolder.m
+++ b/SOGo/SoObjects/SOGo/SOGoGroupFolder.m
@@ -31,6 +31,11 @@
 
 /* accessors */
 
+- (NSArray *)uids {
+  [self logWithFormat:@"ERROR: instantiated abstract Group folder class!"];
+  return nil;
+}
+
 /* SOPE */
 
 - (BOOL)isFolderish {
@@ -39,8 +44,8 @@
 
 /* looking up shared objects */
 
-- (SOGoGroupFolder *)lookupGroupFolder {
-  return [[self container] lookupGroupFolder];
+- (SOGoGroupsFolder *)lookupGroupsFolder {
+  return [[self container] lookupGroupsFolder];
 }
 
 /* pathes */