Monotone-Parent: be9c203f3a5b8055a08854fac75321227532ee8c
Monotone-Revision: b65572c3789024ccb44bac952fa19cc6708071a0 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-07-19T19:28:44 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
cd18ceeb6c
commit
b4f8a596f5
11
ChangeLog
11
ChangeLog
|
@ -1,5 +1,16 @@
|
|||
2012-07-19 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* OpenChange/MAPIStoreObject.m (-addProxy:): new method that keeps
|
||||
proxy objects in the new "proxies" ivar.
|
||||
(-getProperty:withTag:inMemCtx:): added code that pass the request
|
||||
to the available object proxies, when the property getters have
|
||||
not been found in the local class.
|
||||
|
||||
* OpenChange/MAPIStoreObjectProxy.[hm]: new class module that
|
||||
provide a facility for providing property getters in the name of
|
||||
another class, working around the fact that Objective-C does not
|
||||
provide multiple-inheritance.
|
||||
|
||||
* OpenChange/NSObject+MAPIStore.m
|
||||
(+getAvailableProperties:inMemCtx:)
|
||||
(-getAvailableProperties:inMemCtx:, canGetProperty:): methods
|
||||
|
|
|
@ -55,6 +55,7 @@ $(SOGOBACKEND)_OBJC_FILES += \
|
|||
MAPIStoreFolder.m \
|
||||
MAPIStoreMessage.m \
|
||||
MAPIStoreObject.m \
|
||||
MAPIStoreObjectProxy.m \
|
||||
MAPIStoreSOGoObject.m \
|
||||
MAPIStoreTable.m \
|
||||
MAPIStoreMessageTable.m \
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
|
||||
@class MAPIStoreContext;
|
||||
@class MAPIStoreMapping;
|
||||
@class MAPIStoreObjectProxy;
|
||||
@class MAPIStoreUserContext;
|
||||
@class MAPIStoreSOGoObject;
|
||||
|
||||
|
@ -43,6 +44,7 @@
|
|||
const IMP *classGetters;
|
||||
|
||||
NSMutableArray *parentContainersBag;
|
||||
NSMutableArray *proxies;
|
||||
id container;
|
||||
NSMutableDictionary *properties;
|
||||
}
|
||||
|
@ -50,6 +52,7 @@
|
|||
+ (id) mapiStoreObjectInContainer: (MAPIStoreObject *) newContainer;
|
||||
- (id) initInContainer: (MAPIStoreObject *) newContainer;
|
||||
|
||||
- (void) addProxy: (MAPIStoreObjectProxy *) newProxy;
|
||||
|
||||
- (MAPIStoreObject *) container;
|
||||
|
||||
|
|
|
@ -143,6 +143,7 @@ static Class NSExceptionK, MAPIStoreFolderK;
|
|||
SEL methodSel;
|
||||
id value;
|
||||
int rc = MAPISTORE_ERR_NOT_FOUND;
|
||||
NSUInteger count, max;
|
||||
|
||||
value = [properties objectForKey: MAPIPropertyKey (propTag)];
|
||||
if (value)
|
||||
|
@ -156,6 +157,16 @@ static Class NSExceptionK, MAPIStoreFolderK;
|
|||
rc = method (self, methodSel, data, memCtx);
|
||||
}
|
||||
|
||||
if (rc == MAPISTORE_ERR_NOT_FOUND)
|
||||
{
|
||||
max = [proxies count];
|
||||
for (count = 0; rc == MAPISTORE_ERR_NOT_FOUND && count < max; count++)
|
||||
rc = [[proxies objectAtIndex: count]
|
||||
getProperty: data
|
||||
withTag: propTag
|
||||
inMemCtx: memCtx];
|
||||
}
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
@ -200,6 +211,11 @@ static Class NSExceptionK, MAPIStoreFolderK;
|
|||
return MAPISTORE_SUCCESS;
|
||||
}
|
||||
|
||||
- (void) addProxy: (MAPIStoreObjectProxy *) newProxy
|
||||
{
|
||||
[proxies addObject: newProxy];
|
||||
}
|
||||
|
||||
- (int) addPropertiesFromRow: (struct SRow *) aRow
|
||||
{
|
||||
struct SPropValue *cValue;
|
||||
|
|
|
@ -0,0 +1,41 @@
|
|||
/* MAPIStoreObjectProxy.h - this file is part of SOGo
|
||||
*
|
||||
* Copyright (C) 2012 Inverse inc
|
||||
*
|
||||
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
*
|
||||
* This file is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2, or (at your option)
|
||||
* any later version.
|
||||
*
|
||||
* This file 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 General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; see the file COPYING. If not, write to
|
||||
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#ifndef MAPISTOREOBJECTPROXY_H
|
||||
#define MAPISTOREOBJECTPROXY_H
|
||||
|
||||
#include <talloc.h>
|
||||
|
||||
#import <Foundation/NSObject.h>
|
||||
|
||||
@interface MAPIStoreObjectProxy : NSObject
|
||||
{
|
||||
const IMP *classGetters;
|
||||
}
|
||||
|
||||
- (enum mapistore_error) getProperty: (void **) data
|
||||
withTag: (enum MAPITAGS) propTag
|
||||
inMemCtx: (TALLOC_CTX *) localMemCtx;
|
||||
|
||||
@end
|
||||
|
||||
#endif /* MAPISTOREOBJECTPROXY_H */
|
|
@ -0,0 +1,66 @@
|
|||
/* MAPIStoreObjectProxy.m - this file is part of SOGo
|
||||
*
|
||||
* Copyright (C) 2012 Inverse inc
|
||||
*
|
||||
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
*
|
||||
* This file is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2, or (at your option)
|
||||
* any later version.
|
||||
*
|
||||
* This file 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 General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; see the file COPYING. If not, write to
|
||||
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#import "MAPIStorePropertySelectors.h"
|
||||
|
||||
#import "MAPIStoreObjectProxy.h"
|
||||
|
||||
#undef DEBUG
|
||||
#include <stdbool.h>
|
||||
#include <talloc.h>
|
||||
#include <gen_ndr/exchange.h>
|
||||
#include <mapistore/mapistore.h>
|
||||
#include <mapistore/mapistore_errors.h>
|
||||
|
||||
@implementation MAPIStoreObjectProxy
|
||||
|
||||
- (id) init
|
||||
{
|
||||
if ((self = [super init]))
|
||||
{
|
||||
classGetters = (IMP *) MAPIStorePropertyGettersForClass (isa);
|
||||
}
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (enum mapistore_error) getProperty: (void **) data
|
||||
withTag: (enum MAPITAGS) propTag
|
||||
inMemCtx: (TALLOC_CTX *) memCtx
|
||||
{
|
||||
MAPIStorePropertyGetter method;
|
||||
uint16_t propValue;
|
||||
SEL methodSel;
|
||||
int rc;
|
||||
|
||||
propValue = (propTag & 0xffff0000) >> 16;
|
||||
methodSel = MAPIStoreSelectorForPropertyGetter (propValue);
|
||||
method = (MAPIStorePropertyGetter) classGetters[propValue];
|
||||
if (method)
|
||||
rc = method (self, methodSel, data, memCtx);
|
||||
else
|
||||
rc = MAPISTORE_ERR_NOT_FOUND;
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
@end
|
Loading…
Reference in New Issue