Monotone-Parent: 16ddf3bffae0279bac86bf214c2a15cff134e2e9

Monotone-Revision: d253d04eddd673d2fda2f03ca664a7fc15cf7455

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-03-07T22:14:44
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,5 +1,9 @@
 2008-03-07  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoFolder.m ([SOGoFolder
+	-isValidContentName:name]): moved method from
+	SOGoAppointmentFolder's isValidAppointmentName.
+
 	* SoObjects/Contacts/SOGoContactGCSFolder.m ([SOGoContactGCSFolder -objectClassForContent:content])
 	([SOGoContactGCSFolder -deduceObjectForName:inContext:])
 	([SOGoContactGCSFolder -requestNamedIsHandledLater:name])

SoObjects/Appointments/SOGoAppointmentFolder.m

@@ -150,11 +150,6 @@ static NSNumber   *sharedYes = nil;
 
 /* name lookup */
 
-- (BOOL) isValidAppointmentName: (NSString *)_key
-{
-  return ([_key length] != 0);
-}
-
 - (void) appendObject: (NSDictionary *) object
           withBaseURL: (NSString *) baseURL
      toREPORTResponse: (WOResponse *) r
@@ -391,7 +386,7 @@ static NSNumber   *sharedYes = nil;
       obj = [super lookupName:_key inContext:_ctx acquire:NO];
       if (!obj)
         {
-	  if ([self isValidAppointmentName:_key])
+	  if ([self isValidContentName:_key])
             {
               url = [[[_ctx request] uri] urlWithoutParameters];
               if ([url hasSuffix: @"AsTask"])

SoObjects/SOGo/SOGoFolder.h

@@ -36,6 +36,8 @@
 - (NSString *) folderType;
 - (NSArray *) fetchContentObjectNames;
 
+- (BOOL) isValidContentName: (NSString *) name;
+
 /* sorting */
 - (NSComparisonResult) compare: (id) otherFolder;
 

SoObjects/SOGo/SOGoFolder.m

@@ -112,6 +112,11 @@
   return [NSArray array];
 }
 
+- (BOOL) isValidContentName: (NSString *) name
+{
+  return ([name length] > 0);
+}
+
 - (BOOL) isFolderish
 {
   return YES;
@@ -201,11 +206,6 @@
 
 /* WebDAV */
 
-- (BOOL) davIsCollection
-{
-  return [self isFolderish];
-}
-
 - (NSString *) davContentType
 {
   return @"httpd/unix-directory";