LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: d51fb546b2097f0d48a9b928bab71c9956c7c7f3 

Monotone-Revision: 3f6384d2d667032c851f2ee92c9eb1305dd8e483

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-08-19T15:35:21
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-08-19 15:35:21 +00:00
parent 071f5b858f
commit b8d9e5f1e7
3 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SOPE/GDLContentStore/ChangeLog
View File

@ -1,3 +1,8 @@
2010-08-19 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* GCSFolder.m (-_channelManager): made method private.
(-folderManager): removed method.
2010-06-11 Wolfgang Sourdeau <wsourdeau@inverse.ca> 2010-06-11 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* GCSFolderManager.m * GCSFolderManager.m

3
SOPE/GDLContentStore/GCSFolder.h
View File

@ -94,9 +94,6 @@
- (NSURL *) aclLocation; - (NSURL *) aclLocation;
- (NSString *) folderTypeName; - (NSString *) folderTypeName;
- (GCSFolderManager *) folderManager;
- (GCSChannelManager *) channelManager;
- (NSString *) storeTableName; - (NSString *) storeTableName;
- (NSString *) quickTableName; - (NSString *) quickTableName;
- (NSString *) aclTableName; - (NSString *) aclTableName;

32
SOPE/GDLContentStore/GCSFolder.m
View File

@ -192,11 +192,8 @@ static NSArray *contentFieldNames = nil;
return folderTypeName; return folderTypeName;
} }
- (GCSFolderManager *)folderManager { - (GCSChannelManager *)_channelManager {
return folderManager; return [folderManager channelManager];
}
- (GCSChannelManager *)channelManager {
return [[self folderManager] channelManager];
} }
- (NSString *)storeTableName { - (NSString *)storeTableName {
@ -216,28 +213,28 @@ static NSArray *contentFieldNames = nil;
/* channels */ /* channels */
- (EOAdaptorChannel *)acquireStoreChannel { - (EOAdaptorChannel *)acquireStoreChannel {
return [[self channelManager] acquireOpenChannelForURL:[self location]]; return [[self _channelManager] acquireOpenChannelForURL:[self location]];
} }
- (EOAdaptorChannel *)acquireQuickChannel { - (EOAdaptorChannel *)acquireQuickChannel {
return [[self channelManager] acquireOpenChannelForURL:[self quickLocation]]; return [[self _channelManager] acquireOpenChannelForURL:[self quickLocation]];
} }
- (EOAdaptorChannel *)acquireAclChannel { - (EOAdaptorChannel *)acquireAclChannel {
return [[self channelManager] acquireOpenChannelForURL:[self aclLocation]]; return [[self _channelManager] acquireOpenChannelForURL:[self aclLocation]];
} }
- (void)releaseChannel:(EOAdaptorChannel *)_channel { - (void)releaseChannel:(EOAdaptorChannel *)_channel {
[[self channelManager] releaseChannel:_channel]; [[self _channelManager] releaseChannel:_channel];
if (debugOn) [self debugWithFormat:@"released channel: %@", _channel]; if (debugOn) [self debugWithFormat:@"released channel: %@", _channel];
} }
- (BOOL)canConnectStore { - (BOOL)canConnectStore {
return [[self channelManager] canConnect:[self location]]; return [[self _channelManager] canConnect:[self location]];
} }
- (BOOL)canConnectQuick { - (BOOL)canConnectQuick {
return [[self channelManager] canConnect:[self quickLocation]]; return [[self _channelManager] canConnect:[self quickLocation]];
} }
- (BOOL)canConnectAcl { - (BOOL)canConnectAcl {
return [[self channelManager] canConnect:[self quickLocation]]; return [[self _channelManager] canConnect:[self quickLocation]];
} }
/* errors */ /* errors */
@ -278,12 +275,12 @@ static NSArray *contentFieldNames = nil;
/* operations */ /* operations */
- (NSArray *)subFolderNames { - (NSArray *)subFolderNames {
return [[self folderManager] listSubFoldersAtPath:[self path] return [folderManager listSubFoldersAtPath:[self path]
recursive:NO]; recursive:NO];
} }
- (NSArray *)allSubFolderNames { - (NSArray *)allSubFolderNames {
return [[self folderManager] listSubFoldersAtPath:[self path] return [folderManager listSubFoldersAtPath:[self path]
recursive:YES]; recursive:YES];
} }
- (GCSTableRequirement) _tableRequirementForFields: (NSArray *) fields - (GCSTableRequirement) _tableRequirementForFields: (NSArray *) fields
@ -515,7 +512,6 @@ static NSArray *contentFieldNames = nil;
{ {
[self errorWithFormat:@"%s: cannot execute quick-fetch SQL '%@': %@", [self errorWithFormat:@"%s: cannot execute quick-fetch SQL '%@': %@",
__PRETTY_FUNCTION__, sql, error]; __PRETTY_FUNCTION__, sql, error];
[self releaseChannel: channel];
results = nil; results = nil;
} }
else else
@ -529,8 +525,8 @@ static NSArray *contentFieldNames = nil;
/* release channels */ /* release channels */
[self releaseChannel: channel];
} }
[self releaseChannel: channel];
// NSLog(@"/running query"); // NSLog(@"/running query");
} }
else else