Monotone-Parent: fc87b2e35370aef34db8f91a54bc71a27c2ea297
Monotone-Revision: 44c81c0fbde1cf04e0ee2064fd07a4e6b1e74fcb Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-07-19T20:31:15 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
0b2f4e5c44
commit
7fa7630d74
|
@ -1,5 +1,9 @@
|
||||||
2012-07-19 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
2012-07-19 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
|
* OpenChange/MAPIStoreObject.m (-nameInContainer): moved method
|
||||||
|
from MAPIStoreSOGoObject and made mandatory for subclasses.
|
||||||
|
(-url): new methed moved from MAPIStoreSOGoObject.
|
||||||
|
|
||||||
* OpenChange/MAPIStoreAppointmentWrapper.m: now a subclass of
|
* OpenChange/MAPIStoreAppointmentWrapper.m: now a subclass of
|
||||||
MAPIStoreObjectProxy.
|
MAPIStoreObjectProxy.
|
||||||
|
|
||||||
|
|
|
@ -60,6 +60,8 @@
|
||||||
- (MAPIStoreUserContext *) userContext;
|
- (MAPIStoreUserContext *) userContext;
|
||||||
- (MAPIStoreMapping *) mapping;
|
- (MAPIStoreMapping *) mapping;
|
||||||
|
|
||||||
|
- (NSString *) url;
|
||||||
|
|
||||||
/* properties */
|
/* properties */
|
||||||
|
|
||||||
- (void) addProperties: (NSDictionary *) newProperties;
|
- (void) addProperties: (NSDictionary *) newProperties;
|
||||||
|
@ -89,6 +91,7 @@
|
||||||
inMemCtx: (TALLOC_CTX *) memCtx;
|
inMemCtx: (TALLOC_CTX *) memCtx;
|
||||||
|
|
||||||
/* subclasses */
|
/* subclasses */
|
||||||
|
- (NSString *) nameInContainer
|
||||||
- (NSDate *) creationTime;
|
- (NSDate *) creationTime;
|
||||||
- (NSDate *) lastModificationTime;
|
- (NSDate *) lastModificationTime;
|
||||||
|
|
||||||
|
|
|
@ -122,6 +122,20 @@ static Class NSExceptionK, MAPIStoreFolderK;
|
||||||
return [[self userContext] mapping];
|
return [[self userContext] mapping];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (NSString *) url
|
||||||
|
{
|
||||||
|
NSString *containerURL, *format;
|
||||||
|
|
||||||
|
containerURL = (NSString *) [container url];
|
||||||
|
if ([containerURL hasSuffix: @"/"])
|
||||||
|
format = @"%@%@";
|
||||||
|
else
|
||||||
|
format = @"%@/%@";
|
||||||
|
|
||||||
|
return [NSString stringWithFormat: format,
|
||||||
|
containerURL, [self nameInContainer]];
|
||||||
|
}
|
||||||
|
|
||||||
/* helpers */
|
/* helpers */
|
||||||
|
|
||||||
- (void) addProperties: (NSDictionary *) newNewProperties
|
- (void) addProperties: (NSDictionary *) newNewProperties
|
||||||
|
@ -293,6 +307,13 @@ static Class NSExceptionK, MAPIStoreFolderK;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* subclasses */
|
/* subclasses */
|
||||||
|
- (NSString *) nameInContainer
|
||||||
|
{
|
||||||
|
[self subclassResponsibility: _cmd];
|
||||||
|
|
||||||
|
return nil;
|
||||||
|
}
|
||||||
|
|
||||||
- (NSDate *) creationTime
|
- (NSDate *) creationTime
|
||||||
{
|
{
|
||||||
[self subclassResponsibility: _cmd];
|
[self subclassResponsibility: _cmd];
|
||||||
|
|
|
@ -58,14 +58,11 @@
|
||||||
|
|
||||||
- (id) sogoObject;
|
- (id) sogoObject;
|
||||||
|
|
||||||
- (NSString *) nameInContainer;
|
|
||||||
|
|
||||||
- (MAPIStoreObject *) container;
|
- (MAPIStoreObject *) container;
|
||||||
|
|
||||||
- (void) cleanupCaches;
|
- (void) cleanupCaches;
|
||||||
|
|
||||||
- (uint64_t) objectId;
|
- (uint64_t) objectId;
|
||||||
- (NSString *) url;
|
|
||||||
|
|
||||||
/* implemented getters */
|
/* implemented getters */
|
||||||
- (int) getPidTagDisplayName: (void **) data
|
- (int) getPidTagDisplayName: (void **) data
|
||||||
|
|
|
@ -146,20 +146,6 @@ static Class MAPIStoreFolderK;
|
||||||
return objectId;
|
return objectId;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSString *) url
|
|
||||||
{
|
|
||||||
NSString *containerURL, *format;
|
|
||||||
|
|
||||||
containerURL = (NSString *) [container url];
|
|
||||||
if ([containerURL hasSuffix: @"/"])
|
|
||||||
format = @"%@%@";
|
|
||||||
else
|
|
||||||
format = @"%@/%@";
|
|
||||||
|
|
||||||
return [NSString stringWithFormat: format,
|
|
||||||
containerURL, [self nameInContainer]];
|
|
||||||
}
|
|
||||||
|
|
||||||
/* getters */
|
/* getters */
|
||||||
- (int) getPidTagDisplayName: (void **) data
|
- (int) getPidTagDisplayName: (void **) data
|
||||||
inMemCtx: (TALLOC_CTX *) memCtx
|
inMemCtx: (TALLOC_CTX *) memCtx
|
||||||
|
|
Loading…
Reference in a new issue