From b738a6145bcb46a5c01b877056648eb2a8f2bf2a Mon Sep 17 00:00:00 2001 From: Mirko Viviani Date: Mon, 30 Dec 2002 22:10:43 +0000 Subject: [PATCH] * EOAdaptors/Postgres95/Postgres95Channel.m ([Postgres95Channel -describeTableNames]): implemented. * EOAccess/EOSQLExpression.h: added missing declaration. * EOAccess/EORelationship.m ([EORelationship -removeJoin:]): added cast. * EOAccess/EOModel.m ([EOModel -dealloc]): removes observer correctly. * EOAccess/EODatabaseContext.h: added missing declaration. * EOControl/EOFetchSpecification.m ([EOFetchSpecification -copyWithZone:]): fixed cast. ([EOFetchSpecification -hints]): added cast. * EOControl/EOClassDescription.m ([NSException +validationExceptionWithFormat:]), ([NSException +aggregateExceptionWithExceptions:]), ([NSException -exceptionAddingEntriesToUserInfo:]): renamed local variables. * rearranged header inclusion in all sources. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@15409 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 27 +++++++ EOAccess/EOAccess.h | 21 ----- EOAccess/EOAccessFault.h | 6 +- EOAccess/EOAccessFault.m | 6 +- EOAccess/EOAdaptor.h | 9 ++- EOAccess/EOAdaptor.m | 3 +- EOAccess/EOAdaptorChannel.h | 10 +-- EOAccess/EOAdaptorChannel.m | 20 ++--- EOAccess/EOAdaptorContext.h | 3 + EOAccess/EOAdaptorContext.m | 2 +- EOAccess/EOAdaptorOperation.m | 1 - EOAccess/EOAttribute.h | 12 ++- EOAccess/EOAttribute.m | 16 ++-- EOAccess/EODatabase.h | 10 ++- EOAccess/EODatabase.m | 7 +- EOAccess/EODatabaseChannel.h | 10 ++- EOAccess/EODatabaseChannel.m | 16 ++-- EOAccess/EODatabaseContext.h | 24 ++++-- EOAccess/EODatabaseContext.m | 11 ++- EOAccess/EODatabaseContextPriv.h | 3 + EOAccess/EODatabaseDataSource.h | 18 ++++- EOAccess/EODatabaseDataSource.m | 10 ++- EOAccess/EODatabaseOperation.h | 11 ++- EOAccess/EODatabaseOperation.m | 4 +- EOAccess/EODatabaseOperationPriv.h | 3 + EOAccess/EOEntity.h | 4 +- EOAccess/EOEntity.m | 6 +- EOAccess/EOEntityPriv.h | 7 +- EOAccess/EOExpressionArray.h | 25 +++--- EOAccess/EOExpressionArray.m | 7 +- EOAccess/EOJoin.h | 11 ++- EOAccess/EOJoin.m | 7 +- EOAccess/EOModel.h | 7 +- EOAccess/EOModel.m | 53 +++++++------ EOAccess/EOModelGroup.h | 14 +++- EOAccess/EOPropertyListEncoding.h | 7 +- EOAccess/EORelationship.h | 82 ++++++++++--------- EOAccess/EORelationship.m | 4 +- EOAccess/EOSQLExpression.h | 21 +++-- EOAccess/EOSQLExpression.m | 10 +-- EOAccess/EOSQLExpressionPriv.h | 3 + EOAccess/EOSQLQualifier.h | 8 +- EOAccess/EOSQLQualifier.m | 36 +++++---- EOAccess/EOStoredProcedure.h | 22 +++--- EOAccess/EOStoredProcedure.m | 6 +- EOAccess/EOUtilities.h | 11 ++- EOAccess/EOUtilities.m | 4 +- EOAdaptors/Postgres95/Postgres95Adaptor.m | 3 +- EOAdaptors/Postgres95/Postgres95Channel.m | 39 ++++++++-- EOAdaptors/Postgres95/Postgres95Values.h | 1 + EOAdaptors/Postgres95/Postgres95Values.m | 4 +- EOControl/EOAndQualifier.m | 2 +- EOControl/EOCheapArray.h | 4 + EOControl/EOClassDescription.h | 7 +- EOControl/EOClassDescription.m | 95 ++++++++++++----------- EOControl/EOControl.h | 2 +- EOControl/EODataSource.h | 2 + EOControl/EODataSource.m | 2 +- EOControl/EODebug.h | 5 +- EOControl/EODebug.m | 6 +- EOControl/EODetailDataSource.h | 8 ++ EOControl/EODetailDataSource.m | 3 +- EOControl/EOEditingContext.h | 14 +++- EOControl/EOEditingContext.m | 6 +- EOControl/EOFault.h | 11 ++- EOControl/EOFault.m | 9 ++- EOControl/EOFaultHandler.m | 4 +- EOControl/EOFetchSpecification.h | 40 ++++++---- EOControl/EOFetchSpecification.m | 7 +- EOControl/EOGenericRecord.h | 7 ++ EOControl/EOGenericRecord.m | 7 +- EOControl/EOGlobalID.h | 3 +- EOControl/EOGlobalID.m | 6 +- EOControl/EOKeyComparisonQualifier.m | 1 + EOControl/EOKeyGlobalID.h | 1 + EOControl/EOKeyGlobalID.m | 4 + EOControl/EOKeyValueArchiver.h | 16 +++- EOControl/EOKeyValueArchiver.m | 2 +- EOControl/EOKeyValueCoding.m | 3 +- EOControl/EOKeyValueCodingBase.h | 3 +- EOControl/EOKeyValueCodingBase.m | 2 +- EOControl/EOKeyValueQualifier.m | 1 + EOControl/EOMutableKnownKeyDictionary.h | 13 +++- EOControl/EOMutableKnownKeyDictionary.m | 1 - EOControl/EONSAddOns.h | 6 +- EOControl/EONotQualifier.m | 1 + EOControl/EONull.h | 1 + EOControl/EONull.m | 2 +- EOControl/EOObjectStore.h | 7 +- EOControl/EOObjectStore.m | 3 +- EOControl/EOObjectStoreCoordinator.h | 9 ++- EOControl/EOObjectStoreCoordinator.m | 1 + EOControl/EOObserver.h | 33 +++++--- EOControl/EOObserver.m | 2 +- EOControl/EOOrQualifier.m | 2 +- EOControl/EOQualifier.h | 7 +- EOControl/EOQualifier.m | 6 +- EOControl/EOSortOrdering.h | 3 +- EOControl/EOSortOrdering.m | 4 +- EOControl/EOUndoManager.h | 1 + EOControl/EOUndoManager.m | 2 +- EOModeler/EOModelExtensions.h | 6 +- 102 files changed, 693 insertions(+), 365 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d871cc..4897e69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,30 @@ +2002-12-30 Markus Hitter + + * EOAdaptors/Postgres95/Postgres95Channel.m ([Postgres95Channel + -describeTableNames]): implemented. + +2002-12-30 Mirko Viviani + + * EOAccess/EOSQLExpression.h: added missing declaration. + + * EOAccess/EORelationship.m ([EORelationship -removeJoin:]): added cast. + + * EOAccess/EOModel.m ([EOModel -dealloc]): removes observer correctly. + + * EOAccess/EODatabaseContext.h: added missing declaration. + + * EOControl/EOFetchSpecification.m ([EOFetchSpecification + -copyWithZone:]): fixed cast. + ([EOFetchSpecification -hints]): added cast. + + * EOControl/EOClassDescription.m ([NSException + +validationExceptionWithFormat:]), ([NSException + +aggregateExceptionWithExceptions:]), + ([NSException -exceptionAddingEntriesToUserInfo:]): renamed local + variables. + + * rearranged header inclusion in all sources. + 2002-12-29 Mirko Viviani * EOAccess/EODatabaseContext.m ([EODatabaseContext -initializeObject: diff --git a/EOAccess/EOAccess.h b/EOAccess/EOAccess.h index 7b6f257..b510ac0 100644 --- a/EOAccess/EOAccess.h +++ b/EOAccess/EOAccess.h @@ -27,27 +27,6 @@ #ifndef __EOAccess_h__ #define __EOAccess_h__ -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import - #import #import #import diff --git a/EOAccess/EOAccessFault.h b/EOAccess/EOAccessFault.h index ebe2be0..10049a7 100644 --- a/EOAccess/EOAccessFault.h +++ b/EOAccess/EOAccessFault.h @@ -28,11 +28,15 @@ #define __EOAccessFault_h__ -#import +#import + +#import @class EODatabaseContext; +@class EOEditingContext; @class EOKeyGlobalID; +@class NSString; @interface EOAccessGenericFaultHandler:EOFaultHandler diff --git a/EOAccess/EOAccessFault.m b/EOAccess/EOAccessFault.m index 19b3acf..3f7c448 100644 --- a/EOAccess/EOAccessFault.m +++ b/EOAccess/EOAccessFault.m @@ -33,11 +33,15 @@ static char rcsId[] = "$Id$"; +#ifdef GNUSTEP #import +#endif + +#import #import +#import #import -#import #import diff --git a/EOAccess/EOAdaptor.h b/EOAccess/EOAdaptor.h index 6b9cbe3..43c4741 100644 --- a/EOAccess/EOAdaptor.h +++ b/EOAccess/EOAdaptor.h @@ -28,12 +28,17 @@ #define __EOAdaptor_h__ #import +#import +@class NSArray; @class NSMutableArray; @class NSDictionary; -@class NSString; @class NSNumber; +@class NSException; +@class NSCalendarDate; +@class NSData; +@class NSTimeZone; @class EOModel; @class EOAttribute; @@ -119,7 +124,7 @@ extern NSString *EOGeneralAdaptorException; - (id)delegate; - (void)setDelegate: delegate; -- (BOOL) isValidQualifierType: (EOAttribute *)attribute +- (BOOL) isValidQualifierType: (NSString *)attribute model: (EOModel *)model; @end /* EOAdaptor */ diff --git a/EOAccess/EOAdaptor.m b/EOAccess/EOAdaptor.m index 60f2774..eb50ec9 100644 --- a/EOAccess/EOAdaptor.m +++ b/EOAccess/EOAdaptor.m @@ -53,6 +53,7 @@ static char rcsId[] = "$Id$"; #import #import #import +#import #import #import @@ -623,7 +624,7 @@ NSString *EOGeneralAdaptorException = @"EOGeneralAdaptorException"; [self notImplemented: _cmd]; } -- (BOOL) isValidQualifierType: (EOAttribute *)attribute +- (BOOL) isValidQualifierType: (NSString *)attribute model: (EOModel *)model { [self subclassResponsibility: _cmd]; diff --git a/EOAccess/EOAdaptorChannel.h b/EOAccess/EOAdaptorChannel.h index e090c99..b793799 100644 --- a/EOAccess/EOAdaptorChannel.h +++ b/EOAccess/EOAdaptorChannel.h @@ -28,10 +28,7 @@ #define __EOAdaptorChannel_h__ #import - -#import - -#import +#import @class NSArray; @@ -45,10 +42,13 @@ @class EOModel; @class EOEntity; @class EOAttribute; +@class EOAdaptorContext; @class EOQualifier; @class EOStoredProcedure; @class EOAdaptorOperation; @class EOSQLExpression; +@class EOFetchSpecification; + /* The EOAdaptorChannel class could be overriden for a concrete database adaptor. You have to override only those methods marked in this header @@ -191,7 +191,7 @@ shouldSelectAttributes: (NSArray *)attributes - (void)adaptorChannel: channel didSelectAttributes: (NSArray *)attributes fetchSpecification: (EOFetchSpecification *)fetchSpecification - lock:(BOOL) flag + lock: (BOOL) flag entity: (EOEntity *)entity; - (void)adaptorChannelWillFetchRow: channel; diff --git a/EOAccess/EOAdaptorChannel.m b/EOAccess/EOAdaptorChannel.m index 3c70d4b..e80412a 100644 --- a/EOAccess/EOAdaptorChannel.m +++ b/EOAccess/EOAdaptorChannel.m @@ -35,11 +35,6 @@ static char rcsId[] = "$Id$"; #import -#import -#import -#import - -#import #import #import #import @@ -49,6 +44,7 @@ static char rcsId[] = "$Id$"; #import #import +#import #import @@ -407,7 +403,7 @@ inRowsDescribedByQualifier: (EOQualifier *)qualifier attributes,objects); NSAssert(initializer,@"No initializer"); - NSDebugMLLog(@"gsdb",@"initializer=%@",initializer); + NSDebugMLLog(@"gsdb", @"initializer=%@", initializer); dict = [[[EOMutableKnownKeyDictionary allocWithZone: zone] initWithInitializer:initializer] autorelease]; @@ -488,7 +484,7 @@ inRowsDescribedByQualifier: (EOQualifier *)qualifier switch(operator) { case EOAdaptorLockOperator: - NSDebugMLLog(@"gsdb", @"EOAdaptorLockOperator"); + EOFLOGObjectLevel(@"gsdb", @"EOAdaptorLockOperator"); [self lockRowComparingAttributes: [adaptorOperation attributes] entity: entity @@ -497,7 +493,7 @@ inRowsDescribedByQualifier: (EOQualifier *)qualifier break; case EOAdaptorInsertOperator: - NSDebugMLLog(@"gsdb", @"EOAdaptorInsertOperator"); + EOFLOGObjectLevel(@"gsdb", @"EOAdaptorInsertOperator"); /* //self adaptorContext //adaptorcontext transactionNestingLevel @@ -516,7 +512,7 @@ prepareInsertExpressionWithRow:changedValues break; case EOAdaptorUpdateOperator: - NSDebugMLLog(@"gsdb", @"EOAdaptorUpdateOperator"); + EOFLOGObjectLevel(@"gsdb", @"EOAdaptorUpdateOperator"); //OK [self updateValues: [adaptorOperation changedValues] inRowDescribedByQualifier: [adaptorOperation qualifier] @@ -524,19 +520,19 @@ prepareInsertExpressionWithRow:changedValues break; case EOAdaptorDeleteOperator: - NSDebugMLLog(@"gsdb", @"EOAdaptorDeleteOperator"); + EOFLOGObjectLevel(@"gsdb", @"EOAdaptorDeleteOperator"); [self deleteRowDescribedByQualifier: [adaptorOperation qualifier] entity: entity]; break; case EOAdaptorStoredProcedureOperator: - NSDebugMLLog(@"gsdb", @"EOAdaptorStoredProcedureOperator"); + EOFLOGObjectLevel(@"gsdb", @"EOAdaptorStoredProcedureOperator"); [self executeStoredProcedure: [adaptorOperation storedProcedure] withValues: [adaptorOperation changedValues]]; break; case EOAdaptorUndefinedOperator: - NSDebugMLLog(@"gsdb", @"EOAdaptorUndefinedOperator"); + EOFLOGObjectLevel(@"gsdb", @"EOAdaptorUndefinedOperator"); default: [NSException raise: NSInvalidArgumentException diff --git a/EOAccess/EOAdaptorContext.h b/EOAccess/EOAdaptorContext.h index 9a53e2e..fe08f0f 100644 --- a/EOAccess/EOAdaptorContext.h +++ b/EOAccess/EOAdaptorContext.h @@ -29,11 +29,14 @@ #import + @class NSMutableArray; +@class NSString; @class EOAdaptor; @class EOAdaptorChannel; + typedef enum { EODelegateRejects, EODelegateApproves, diff --git a/EOAccess/EOAdaptorContext.m b/EOAccess/EOAdaptorContext.m index 85f8e91..c369607 100644 --- a/EOAccess/EOAdaptorContext.m +++ b/EOAccess/EOAdaptorContext.m @@ -39,8 +39,8 @@ static char rcsId[] = "$Id$"; #import #import -#import #import +#import #import #import diff --git a/EOAccess/EOAdaptorOperation.m b/EOAccess/EOAdaptorOperation.m index 24d2028..33fba76 100644 --- a/EOAccess/EOAdaptorOperation.m +++ b/EOAccess/EOAdaptorOperation.m @@ -36,7 +36,6 @@ static char rcsId[] = "$Id$"; #import #import -#import #import #import #import diff --git a/EOAccess/EOAttribute.h b/EOAccess/EOAttribute.h index e9091a5..05e84e8 100644 --- a/EOAccess/EOAttribute.h +++ b/EOAccess/EOAttribute.h @@ -28,15 +28,19 @@ #define __EOAttribute_h__ #import -#import -#import -#import +#import -#include +#import #import +@class NSDictionary; +@class NSData; +@class NSException; +@class NSCalendarDate; +@class NSTimeZone; + @class EOEntity; @class EOExpressionArray; @class EOStoredProcedure; diff --git a/EOAccess/EOAttribute.m b/EOAccess/EOAttribute.m index 63fc4db..a026c78 100644 --- a/EOAccess/EOAttribute.m +++ b/EOAccess/EOAttribute.m @@ -36,14 +36,19 @@ static char rcsId[] = "$Id$"; -#import +#include #import #import #import #import +#import +#import +#import +#import +#import +#import -#import #import #import #import @@ -56,6 +61,7 @@ static char rcsId[] = "$Id$"; #import #import + @implementation EOAttribute static NSString *defaultCalendarFormat = @"%b %d %Y %H:%M"; @@ -291,13 +297,13 @@ static NSString *defaultCalendarFormat = @"%b %d %Y %H:%M"; EOFLOGObjectFnStart(); [_parent gcDecrementRefCount]; - NSDebugMLLog(@"gsdb", @"prototype gcDecrementRefCount"); + EOFLOGObjectLevel(@"gsdb", @"prototype gcDecrementRefCount"); [_prototype gcDecrementRefCount]; - NSDebugMLLog(@"gsdb", @"definitionArray gcDecrementRefCount"); + EOFLOGObjectLevel(@"gsdb", @"definitionArray gcDecrementRefCount"); [(id)_definitionArray gcDecrementRefCount]; - NSDebugMLLog(@"gsdb", @"realAttribute gcDecrementRefCount"); + EOFLOGObjectLevel(@"gsdb", @"realAttribute gcDecrementRefCount"); [_realAttribute gcDecrementRefCount]; diff --git a/EOAccess/EODatabase.h b/EOAccess/EODatabase.h index f7beb44..d3abf21 100644 --- a/EOAccess/EODatabase.h +++ b/EOAccess/EODatabase.h @@ -27,7 +27,15 @@ #ifndef __EODatabase_h__ #define __EODatabase_h__ -#import + +#import + + +@class NSArray; +@class NSMutableArray; +@class NSDictionary; +@class NSMutableDictionary; +@class NSString; @class EOAdaptor; @class EOModel; diff --git a/EOAccess/EODatabase.m b/EOAccess/EODatabase.m index de3e777..42c96f0 100644 --- a/EOAccess/EODatabase.m +++ b/EOAccess/EODatabase.m @@ -33,25 +33,24 @@ static char rcsId[] = "$Id$"; -#import - #import #import #import #import #import #import +#import +#import -#import #import #import #import #import - #import #import #import +#import /* TODO diff --git a/EOAccess/EODatabaseChannel.h b/EOAccess/EODatabaseChannel.h index e4ab301..5718489 100644 --- a/EOAccess/EODatabaseChannel.h +++ b/EOAccess/EODatabaseChannel.h @@ -27,12 +27,18 @@ #ifndef __EODatabaseChannel_h__ #define __EODatabaseChannel_h__ -#import -#import +#import + + +@class NSMutableArray; + +@class EOEntity; @class EOAdaptorChannel; @class EORelationship; @class EODatabaseContext; +@class EOEditingContext; +@class EOFetchSpecification; @interface EODatabaseChannel : NSObject diff --git a/EOAccess/EODatabaseChannel.m b/EOAccess/EODatabaseChannel.m index 2c5b933..c3708bb 100644 --- a/EOAccess/EODatabaseChannel.m +++ b/EOAccess/EODatabaseChannel.m @@ -38,7 +38,6 @@ static char rcsId[] = "$Id$"; #import -#import #import #import #import @@ -47,11 +46,14 @@ static char rcsId[] = "$Id$"; #import #import +#import #import #import #import #import #import +#import +#import #import #import @@ -60,6 +62,7 @@ static char rcsId[] = "$Id$"; #import #import + @implementation EODatabaseChannel + (void)load @@ -286,7 +289,7 @@ static char rcsId[] = "$Id$"; propertiesToFetch = [self _propertiesToFetch]; - NSDebugMLLog(@"gsdb", @"Will fetchRow"); + EOFLOGObjectLevel(@"gsdb", @"Will fetchRow"); row = [_adaptorChannel fetchRowWithZone: NULL]; @@ -314,12 +317,12 @@ static char rcsId[] = "$Id$"; gid = [_currentEntity globalIDForRow: row isFinal: YES];//OK - NSDebugMLLog(@"gsdb",@"gid=%@",gid); + NSDebugMLLog(@"gsdb", @"gid=%@", gid); //NSDebugMLog(@"TEST attributesToFetch=%@",[_currentEntity attributesToFetch]); object = [_currentEditingContext objectForGlobalID: gid]; //OK //nil - NSDebugMLLog(@"gsdb",@"object=%@",object); + NSDebugMLLog(@"gsdb", @"object=%@", object); if (object) isObjectNew = NO; @@ -385,7 +388,7 @@ static char rcsId[] = "$Id$"; } if (!object) - { + { EOClassDescription *entityClassDescripton = [_currentEntity classDescriptionForInstances]; object = [entityClassDescripton createInstanceWithEditingContext: _currentEditingContext @@ -401,7 +404,8 @@ static char rcsId[] = "$Id$"; } else if (object && [EOFault isFault: object]) { - EOAccessFaultHandler *handler = [EOFault handlerForFault: object]; + EOAccessFaultHandler *handler = (EOAccessFaultHandler *) + [EOFault handlerForFault: object]; EOKeyGlobalID *handlerGID = (EOKeyGlobalID *)[handler globalID]; isObjectNew = YES; //TODO diff --git a/EOAccess/EODatabaseContext.h b/EOAccess/EODatabaseContext.h index 054517c..ccad226 100644 --- a/EOAccess/EODatabaseContext.h +++ b/EOAccess/EODatabaseContext.h @@ -27,8 +27,15 @@ #ifndef __EODatabaseContext_h__ #define __EODatabaseContext_h__ -#import +#import +#import +#import + +#import + + +@class NSMutableSet; @class EOAdaptorContext; @class EOAdaptorChannel; @@ -37,7 +44,6 @@ @class EOModel; @class EORelationship; @class EOAttribute; - @class EODatabase; @class EODatabaseChannel; @class EODatabaseOperation; @@ -83,11 +89,11 @@ struct _EOTransactionScope; NSDictionary *_currentSnapshot; objc_object *_currentBatch; */ - NSMutableArray *_uniqueStack;// snaps - NSMutableArray *_uniqueArrayStack;//to many snaps - NSMutableArray *_deleteStack; + NSMutableArray *_uniqueStack;// snaps + NSMutableArray *_uniqueArrayStack;//to many snaps + NSMutableArray *_deleteStack; - NSHashTable *_nonPrimaryKeyGenerators; + NSHashTable *_nonPrimaryKeyGenerators; struct { unsigned int preparingForSave:1; @@ -149,12 +155,14 @@ struct _EOTransactionScope; @end /* EODatabaseContext */ -@interface EODatabaseContext(EOObjectStoreSupport) +@interface EODatabaseContext (EOObjectStoreSupport) - (id)faultForRawRow: (NSDictionary *)row entityNamed: (NSString *)entityName editingContext: (EOEditingContext *)editingContext; +- (id) entityForGlobalID: (EOGlobalID *)globalID; + - (id)faultForGlobalID: (EOGlobalID *)globalID editingContext: (EOEditingContext *)context; @@ -195,7 +203,7 @@ struct _EOTransactionScope; @end -@interface EODatabaseContext(EOCooperatingObjectStoreSupport) +@interface EODatabaseContext (EOCooperatingObjectStoreSupport) - (BOOL)ownsGlobalID:(EOGlobalID *)globalID; diff --git a/EOAccess/EODatabaseContext.m b/EOAccess/EODatabaseContext.m index 6fe7f05..33d4d97 100644 --- a/EOAccess/EODatabaseContext.m +++ b/EOAccess/EODatabaseContext.m @@ -36,8 +36,6 @@ static char rcsId[] = "$Id$"; -#import - #import #import #import @@ -46,8 +44,11 @@ static char rcsId[] = "$Id$"; #import #import #import +#import +#import #import +#import #import #import #import @@ -64,17 +65,21 @@ static char rcsId[] = "$Id$"; #import #import #import +#import #import #import #import +#import #import #import #import +#import #import #import #import #import +#import #define _LOCK_BUFFER 128 @@ -608,7 +613,7 @@ May raise an exception if transaction has began or if you want pessimistic lock @end -@implementation EODatabaseContext(EOObjectStoreSupport) +@implementation EODatabaseContext (EOObjectStoreSupport) /** Return a fault for row 'row' **/ - (id)faultForRawRow: (NSDictionary *)row diff --git a/EOAccess/EODatabaseContextPriv.h b/EOAccess/EODatabaseContextPriv.h index 47fd4e4..69c7c81 100644 --- a/EOAccess/EODatabaseContextPriv.h +++ b/EOAccess/EODatabaseContextPriv.h @@ -27,8 +27,11 @@ #ifndef __EODatabaseContextPriv_h__ #define __EODatabaseContextPriv_h__ + @class EOAccessFaultHandler; @class EOAccessArrayFaultHandler; +@class EOKeyGlobalID; +@class EOFault; @interface EODatabaseContext (EODatabaseContextPrivate) diff --git a/EOAccess/EODatabaseDataSource.h b/EOAccess/EODatabaseDataSource.h index 6769067..be2fd47 100644 --- a/EOAccess/EODatabaseDataSource.h +++ b/EOAccess/EODatabaseDataSource.h @@ -24,10 +24,23 @@ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#import +#ifndef __EODatabaseDataSource_h__ +#define __EODatabaseDataSource_h__ + + +#import + +#import + + +@class NSDictionary; +@class NSString; @class EOEntity; @class EODatabaseContext; +@class EOEditingContext; +@class EOFetchSpecification; +@class EOQualifier; @interface EODatabaseDataSource : EODataSource @@ -65,3 +78,6 @@ - (BOOL)isFetchEnabled; @end + + +#endif /* __EODatabaseDataSource_h__ */ diff --git a/EOAccess/EODatabaseDataSource.m b/EOAccess/EODatabaseDataSource.m index d52b15d..7d9c4b2 100644 --- a/EOAccess/EODatabaseDataSource.m +++ b/EOAccess/EODatabaseDataSource.m @@ -41,8 +41,8 @@ static char rcsId[] = "$Id$"; #import #import #import +#import -#import #import #import #import @@ -50,6 +50,14 @@ static char rcsId[] = "$Id$"; #import #import +#import +#import +#import +#import +#import +#import + + @implementation EODatabaseDataSource - initWithEditingContext: (EOEditingContext *)editingContext diff --git a/EOAccess/EODatabaseOperation.h b/EOAccess/EODatabaseOperation.h index 8212998..ee05c76 100644 --- a/EOAccess/EODatabaseOperation.h +++ b/EOAccess/EODatabaseOperation.h @@ -27,11 +27,20 @@ #ifndef __EODatabaseOperation_h__ #define __EODatabaseOperation_h__ -#import +#import +@class NSArray; +@class NSMutableArray; +@class NSDictionary; +@class NSMutableDictionary; +@class NSException; +@class NSString; + @class EOStoredProcedure; @class EOEntity; +@class EOQualifier; +@class EOGlobalID; typedef enum { diff --git a/EOAccess/EODatabaseOperation.m b/EOAccess/EODatabaseOperation.m index d79891f..1ef7815 100644 --- a/EOAccess/EODatabaseOperation.m +++ b/EOAccess/EODatabaseOperation.m @@ -33,15 +33,13 @@ static char rcsId[] = "$Id$"; -#import - #import -#import #import #import #import + @implementation EODatabaseOperation + (EODatabaseOperation *)databaseOperationWithGlobalID: (EOGlobalID *)globalID diff --git a/EOAccess/EODatabaseOperationPriv.h b/EOAccess/EODatabaseOperationPriv.h index f270ecf..2dcbdf4 100644 --- a/EOAccess/EODatabaseOperationPriv.h +++ b/EOAccess/EODatabaseOperationPriv.h @@ -28,6 +28,9 @@ #define __EODatabaseOperationPriv_h__ +@class EOGlobalID; + + @interface EODatabaseOperation (private) - (void)_setGlobalID: (EOGlobalID *)globalID; diff --git a/EOAccess/EOEntity.h b/EOAccess/EOEntity.h index f226eb2..c2f5ea9 100644 --- a/EOAccess/EOEntity.h +++ b/EOAccess/EOEntity.h @@ -32,7 +32,8 @@ #import #import -#include +#import + @class EOModel; @class EOAttribute; @@ -50,6 +51,7 @@ @class EOMKKDInitializer; @class EOMKKDSubsetMapping; + @interface EOEntity : GCObject { NSString *_name; diff --git a/EOAccess/EOEntity.m b/EOAccess/EOEntity.m index 0f22348..5eba9ed 100644 --- a/EOAccess/EOEntity.m +++ b/EOAccess/EOEntity.m @@ -36,12 +36,12 @@ static char rcsId[] = "$Id$"; -#import + +#include #import -#import -#include +#import #import #import diff --git a/EOAccess/EOEntityPriv.h b/EOAccess/EOEntityPriv.h index fc72526..3020743 100644 --- a/EOAccess/EOEntityPriv.h +++ b/EOAccess/EOEntityPriv.h @@ -28,6 +28,12 @@ #define __EOEntityPriv_h__ +@class NSString; + +@class EORelationship; +@class EOExpressionArray; + + @interface EOEntity (EOEntityPrivate) - (void)setCreateMutableObjects: (BOOL)flag; @@ -48,7 +54,6 @@ toDestinationAttributeInLastComponentOfRelationshipPath: (NSString*)path; - (BOOL) _relationshipPathHasIdenticalKeys: (id)param0; @end -@class EOExpressionArray; @interface EOEntity (EOEntitySQLExpression) - (id) valueForSQLExpression: (id)param0; diff --git a/EOAccess/EOExpressionArray.h b/EOAccess/EOExpressionArray.h index 7d20d87..0eca0d2 100644 --- a/EOAccess/EOExpressionArray.h +++ b/EOAccess/EOExpressionArray.h @@ -27,12 +27,17 @@ #ifndef __EOExpressionArray_h__ #define __EOExpressionArray_h__ + #import -#include +#import + + +@class NSArray; @class EOAttribute; @class EOEntity; -@class EOExpressionArray; +@class EOSQLExpression; + @protocol EOExpressionContext @@ -44,16 +49,16 @@ @interface EOExpressionArray : GCMutableArray { - NSString *_prefix; - NSString *_infix; - NSString *_suffix; + NSString *_prefix; + NSString *_infix; + NSString *_suffix; // NSString *_definition; it's rebuilt - EOAttribute *_realAttribute; + EOAttribute *_realAttribute; - struct - { - unsigned int isFlattened:1; //TODO Why ? - } _flags; + struct + { + unsigned int isFlattened:1; //TODO Why ? + } _flags; } + (EOExpressionArray*)expressionArray; diff --git a/EOAccess/EOExpressionArray.m b/EOAccess/EOExpressionArray.m index 947b2b3..151fd68 100644 --- a/EOAccess/EOExpressionArray.m +++ b/EOAccess/EOExpressionArray.m @@ -36,20 +36,21 @@ static char rcsId[] = "$Id$"; -#import +#include + #import #import #import #import #import -#include +#import -#import #import #import #import + @implementation EOExpressionArray + (void) initialize diff --git a/EOAccess/EOJoin.h b/EOAccess/EOJoin.h index ceb16db..2107cae 100644 --- a/EOAccess/EOJoin.h +++ b/EOAccess/EOJoin.h @@ -27,7 +27,10 @@ #ifndef __EOJoin_h__ #define __EOJoin_h__ -#include +#import + + +@class NSString; @class EOEntity; @class EOAttribute; @@ -35,9 +38,9 @@ @interface EOJoin : GCObject { - /* Garbage collectable objects */ - EOAttribute *_sourceAttribute; - EOAttribute *_destinationAttribute; + /* Garbage collectable objects */ + EOAttribute *_sourceAttribute; + EOAttribute *_destinationAttribute; } + (EOJoin *)joinWithSourceAttribute: (EOAttribute *)source diff --git a/EOAccess/EOJoin.m b/EOAccess/EOJoin.m index 66660fa..bf273cb 100644 --- a/EOAccess/EOJoin.m +++ b/EOAccess/EOJoin.m @@ -33,12 +33,9 @@ static char rcsId[] = "$Id$"; -#import - #import #import -#import #import #import #import @@ -78,10 +75,10 @@ static char rcsId[] = "$Id$"; { EOFLOGObjectFnStart(); - NSDebugMLLog(@"gsdb", @"sourceAttribute gcDecrementRefCount"); + EOFLOGObjectLevel(@"gsdb", @"sourceAttribute gcDecrementRefCount"); [_sourceAttribute gcDecrementRefCount]; - NSDebugMLLog(@"gsdb", @"destinationAttribute gcDecrementRefCount"); + EOFLOGObjectLevel(@"gsdb", @"destinationAttribute gcDecrementRefCount"); [_destinationAttribute gcDecrementRefCount]; diff --git a/EOAccess/EOModel.h b/EOAccess/EOModel.h index e23c6d9..b79f7d5 100644 --- a/EOAccess/EOModel.h +++ b/EOAccess/EOModel.h @@ -27,11 +27,16 @@ #ifndef __EOModel_h__ #define __EOModel_h__ + #import -#include +#import #import + +@class NSArray; +@class NSDictionary; + @class EOEntity; @class EOModelGroup; @class EOStoredProcedure; diff --git a/EOAccess/EOModel.m b/EOAccess/EOModel.m index 5d077f3..5d41b55 100644 --- a/EOAccess/EOModel.m +++ b/EOAccess/EOModel.m @@ -34,30 +34,29 @@ static char rcsId[] = "$Id$"; -#include +#import +#import +#import +#import +#import +#import +#import +#import -#include -#include -#include -#include -#include -#include -#include +#import +#import +#import +#import +#import +#import -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include +#import +#import +#import +#import +#import +#import +#import NSString *EOEntityLoadedNotification = @"EOEntityLoadedNotification"; @@ -221,7 +220,7 @@ NSString *EOEntityLoadedNotification = @"EOEntityLoadedNotification"; - (void) dealloc { - [NSNotificationCenter removeObserver: self]; + [[NSNotificationCenter defaultCenter] removeObserver: self]; if (_entitiesByClass) { @@ -245,16 +244,16 @@ NSString *EOEntityLoadedNotification = @"EOEntityLoadedNotification"; EOFLOGObjectFnStart(); [(id)_group gcDecrementRefCount]; - NSDebugMLLog(@"gsdb", @"entities gcDecrementRefCount"); + EOFLOGObjectLevel(@"gsdb", @"entities gcDecrementRefCount"); [(id)_entities gcDecrementRefCount]; - NSDebugMLLog(@"gsdb", @"entitiesByName gcDecrementRefCount"); + EOFLOGObjectLevel(@"gsdb", @"entitiesByName gcDecrementRefCount"); [(id)_entitiesByName gcDecrementRefCount]; - NSDebugMLLog(@"gsdb", @"storedProcedures gcDecrementRefCount"); + EOFLOGObjectLevel(@"gsdb", @"storedProcedures gcDecrementRefCount"); [(id)_storedProcedures gcDecrementRefCount]; - NSDebugMLLog(@"gsdb", @"subEntitiesCache gcDecrementRefCount"); + EOFLOGObjectLevel(@"gsdb", @"subEntitiesCache gcDecrementRefCount"); [(id)_subEntitiesCache gcDecrementRefCount]; diff --git a/EOAccess/EOModelGroup.h b/EOAccess/EOModelGroup.h index 8deecba..405be64 100644 --- a/EOAccess/EOModelGroup.h +++ b/EOAccess/EOModelGroup.h @@ -27,16 +27,26 @@ #ifndef __EOModelGroup_h__ #define __EOModelGroup_h__ -#include +#import +#import +#import + + +@class NSArray; +@class NSDictionary; +@class NSMutableDictionary; +@class NSString; @class EOModel; @class EOEntity; @class EORelationship; @class EOGlobalID; @class EOAttribute; - @class EOStoredProcedure; +@class EOFetchSpecification; + + @interface EOModelGroup : GCObject { NSMutableDictionary *_modelsByName; diff --git a/EOAccess/EOPropertyListEncoding.h b/EOAccess/EOPropertyListEncoding.h index b0bb817..3516fe9 100644 --- a/EOAccess/EOPropertyListEncoding.h +++ b/EOAccess/EOPropertyListEncoding.h @@ -27,7 +27,12 @@ #ifndef __EOPropertyListEncoding_h__ #define __EOPropertyListEncoding_h__ -#import + +#import + + +@class NSDictionary; +@class NSMutableDictionary; @protocol EOPropertyListEncoding diff --git a/EOAccess/EORelationship.h b/EOAccess/EORelationship.h index e25ead7..d621093 100644 --- a/EOAccess/EORelationship.h +++ b/EOAccess/EORelationship.h @@ -28,20 +28,26 @@ #define __EORelationship_h__ #import - -#include - -#import -#import +#import #import #import +#import + + +@class NSArray; +@class NSMutableArray; +@class NSDictionary; +@class NSMutableDictionary; +@class NSException; @class EOEntity; @class EOAttribute; @class EOExpressionArray; @class EOMKKDSubsetMapping; +@class EOQualifier; + typedef enum { EOInnerJoin = 0, @@ -53,44 +59,44 @@ typedef enum { @interface EORelationship : GCObject { - NSString *_name; - EOQualifier *_qualifier; - NSMutableDictionary *_sourceNames; - NSMutableDictionary *_destinationNames; - NSDictionary *_userInfo; - NSDictionary *_internalInfo; - NSString *_docComment; - NSDictionary *_sourceToDestinationKeyMap; - unsigned int _batchCount; - EOJoinSemantic _joinSemantic; + NSString *_name; + EOQualifier *_qualifier; + NSMutableDictionary *_sourceNames; + NSMutableDictionary *_destinationNames; + NSDictionary *_userInfo; + NSDictionary *_internalInfo; + NSString *_docComment; + NSDictionary *_sourceToDestinationKeyMap; + unsigned int _batchCount; + EOJoinSemantic _joinSemantic; - struct { - unsigned int isToMany:1; - unsigned int useBatchFaulting:1; - unsigned int deleteRule:2; - unsigned int isMandatory:1; - unsigned int ownsDestination:1; - unsigned int propagatesPrimaryKey:1; - unsigned int createsMutableObjects:1; - unsigned int isBidirectional:1; - unsigned int extraRefCount:23; - } _flags; - id _sourceRowToForeignKeyMapping; + struct { + unsigned int isToMany:1; + unsigned int useBatchFaulting:1; + unsigned int deleteRule:2; + unsigned int isMandatory:1; + unsigned int ownsDestination:1; + unsigned int propagatesPrimaryKey:1; + unsigned int createsMutableObjects:1; + unsigned int isBidirectional:1; + unsigned int extraRefCount:23; + } _flags; + id _sourceRowToForeignKeyMapping; - /* Garbage collectable objects */ - EOExpressionArray *_definitionArray; + /* Garbage collectable objects */ + EOExpressionArray *_definitionArray; - EORelationship *_inverseRelationship; - EORelationship *_hiddenInverseRelationship; + EORelationship *_inverseRelationship; + EORelationship *_hiddenInverseRelationship; - EOEntity *_entity; - EOEntity *_destination; - GCMutableArray *_joins; + EOEntity *_entity; + EOEntity *_destination; + GCMutableArray *_joins; - /* Computed values */ - GCArray *_sourceAttributes; - GCArray *_destinationAttributes; - GCMutableArray *_componentRelationships;//Used ???? + /* Computed values */ + GCArray *_sourceAttributes; + GCArray *_destinationAttributes; + GCMutableArray *_componentRelationships;//Used ???? } + (id) relationshipWithPropertyList: (NSDictionary *)propertyList diff --git a/EOAccess/EORelationship.m b/EOAccess/EORelationship.m index 9191565..09d7731 100644 --- a/EOAccess/EORelationship.m +++ b/EOAccess/EORelationship.m @@ -36,8 +36,6 @@ static char rcsId[] = "$Id$"; -#import - #import #import @@ -1534,7 +1532,7 @@ relationships. Nil if none" **/ else { GCMutableArray *ma = [_joins mutableCopy]; - GCArray *a = _joins; + GCArray *a = (GCArray *)_joins; [ma removeObject: join]; _joins = ma; diff --git a/EOAccess/EOSQLExpression.h b/EOAccess/EOSQLExpression.h index 42b48a6..bfd4cab 100644 --- a/EOAccess/EOSQLExpression.h +++ b/EOAccess/EOSQLExpression.h @@ -27,17 +27,26 @@ #ifndef __EOSQLExpression_h__ #define __EOSQLExpression_h__ -#import -#import - -#import -#import +#import +#import +#import +#import #import + +@class NSArray; +@class NSMutableArray; +@class NSDictionary; +@class NSMutableDictionary; + @class EOAttribute; @class EOEntity; @class EOQualifier; +@class EOKeyValueQualifier; +@class EOKeyComparisonQualifier; +@class EOSortOrdering; +@class EOFetchSpecification; extern NSString *EOBindVariableNameKey; @@ -81,6 +90,8 @@ extern NSString *EOBindVariableColumnKey; fetchSpecification: (EOFetchSpecification *)fetchSpecification entity: (EOEntity *)entity; ++ (id)sqlExpressionWithEntity: (EOEntity *)entity; + - initWithEntity: (EOEntity *)entity; - (NSMutableDictionary *)aliasesByRelationshipPath; diff --git a/EOAccess/EOSQLExpression.m b/EOAccess/EOSQLExpression.m index dded7a5..727fa06 100644 --- a/EOAccess/EOSQLExpression.m +++ b/EOAccess/EOSQLExpression.m @@ -38,14 +38,11 @@ static char rcsId[] = "$Id$"; #include -#import - #import #import #import #import - -#import +#import #import #import @@ -61,8 +58,11 @@ static char rcsId[] = "$Id$"; #import #import +#import #import +#import #import +#import NSString *EOBindVariableNameKey = @"EOBindVariableNameKey"; @@ -483,7 +483,7 @@ NSString *EOBindVariableColumnKey = @"EOBindVariableColumnKey"; EOFLOGObjectLevelArgs(@"EOSQLExpression", @"qualifier=%@", qualifier); - whereClauseString = [()qualifier sqlStringForSQLExpression: self]; + whereClauseString = [(id )qualifier sqlStringForSQLExpression: self]; EOFLOGObjectLevelArgs(@"EOSQLExpression", @"whereClauseString=%@", whereClauseString); diff --git a/EOAccess/EOSQLExpressionPriv.h b/EOAccess/EOSQLExpressionPriv.h index 5035519..1a9050c 100644 --- a/EOAccess/EOSQLExpressionPriv.h +++ b/EOAccess/EOSQLExpressionPriv.h @@ -27,6 +27,9 @@ #ifndef __EOSQLExpressionPriv_h__ #define __EOSQLExpressionPriv_h__ +#import + +@class NSString; @class EOEntity; diff --git a/EOAccess/EOSQLQualifier.h b/EOAccess/EOSQLQualifier.h index 5e2f5ae..d063e86 100644 --- a/EOAccess/EOSQLQualifier.h +++ b/EOAccess/EOSQLQualifier.h @@ -30,8 +30,11 @@ #ifndef __EOSQLQualifier_h__ #define __EOSQLQualifier_h__ -#import -#import + +#import +#import + +#import @class EOSQLExpression; @@ -39,6 +42,7 @@ @class EOEntity; @class EOModel; + /** Protocol for all qualifiers used used to generate SQL queries **/ @protocol EOQualifierSQLGeneration diff --git a/EOAccess/EOSQLQualifier.m b/EOAccess/EOSQLQualifier.m index 8ae4be3..a36c79a 100644 --- a/EOAccess/EOSQLQualifier.m +++ b/EOAccess/EOSQLQualifier.m @@ -39,13 +39,19 @@ static char rcsId[] = "$Id$"; #import #import #import - #import -#import +#import +#import +#import +#import +#import +#import -#import #import +#import +#import +#import #import @@ -102,13 +108,13 @@ static char rcsId[] = "$Id$"; if (!sqlString) { sqlString = [NSMutableString stringWithString: - [()qualifier sqlStringForSQLExpression:sqlExpression]]; + [(id )qualifier sqlStringForSQLExpression:sqlExpression]]; } else { [sqlString appendFormat:@" %@ %@", @"AND", - [()qualifier sqlStringForSQLExpression:sqlExpression]]; + [(id )qualifier sqlStringForSQLExpression:sqlExpression]]; } } return sqlString; @@ -133,11 +139,13 @@ static char rcsId[] = "$Id$"; { EOQualifier *qualifier = [_qualifiers objectAtIndex: i]; EOQualifier *schemaBasedQualifierTmp = - [()qualifier - schemaBasedQualifierWithRootEntity: - entity]; + [(id )qualifier + schemaBasedQualifierWithRootEntity: + entity]; + if (schemaBasedQualifierTmp != qualifier) atLeastOneDifferentQualifier = YES; + [qualifiers addObject: schemaBasedQualifierTmp]; } @@ -167,13 +175,13 @@ static char rcsId[] = "$Id$"; if (!sqlString) { sqlString = [NSMutableString stringWithString: - [()qualifier sqlStringForSQLExpression: sqlExpression]]; + [(id )qualifier sqlStringForSQLExpression: sqlExpression]]; } else { [sqlString appendFormat: @" %@ %@", @"OR", - [()qualifier sqlStringForSQLExpression: sqlExpression]]; + [(id )qualifier sqlStringForSQLExpression: sqlExpression]]; } } @@ -198,11 +206,13 @@ static char rcsId[] = "$Id$"; { EOQualifier *qualifier = [_qualifiers objectAtIndex: i]; EOQualifier *schemaBasedQualifierTmp = - [()qualifier - schemaBasedQualifierWithRootEntity: - entity]; + [(id )qualifier + schemaBasedQualifierWithRootEntity: + entity]; + if (schemaBasedQualifierTmp != qualifier) atLeastOneDifferentQualifier = YES; + [qualifiers addObject: schemaBasedQualifierTmp]; } diff --git a/EOAccess/EOStoredProcedure.h b/EOAccess/EOStoredProcedure.h index 01f0d49..556722a 100644 --- a/EOAccess/EOStoredProcedure.h +++ b/EOAccess/EOStoredProcedure.h @@ -27,25 +27,29 @@ #ifndef __EOStoredProcedure_h__ #define __EOStoredProcedure_h__ -#import +#import #import + #import + +@class NSDictionary; + @class EOModel; @class EOAttribute; -@class GCArray; +@class EOStoredProcedure; @interface EOStoredProcedure : GCObject { - NSString *_name; - NSString *_externalName; - NSDictionary *_userInfo; - NSDictionary *_internalInfo; + NSString *_name; + NSString *_externalName; + NSDictionary *_userInfo; + NSDictionary *_internalInfo; - /* Garbage collectable objects */ - EOModel *_model; - GCArray *_arguments; + /* Garbage collectable objects */ + EOModel *_model; + GCArray *_arguments; } + (EOStoredProcedure *)storedProcedureWithPropertyList: (NSDictionary *)propertyList diff --git a/EOAccess/EOStoredProcedure.m b/EOAccess/EOStoredProcedure.m index 3fcb98f..d0bd49b 100644 --- a/EOAccess/EOStoredProcedure.m +++ b/EOAccess/EOStoredProcedure.m @@ -33,7 +33,9 @@ static char rcsId[] = "$Id$"; -#include +#import + +#import #import #import @@ -59,7 +61,7 @@ static char rcsId[] = "$Id$"; { EOFLOGObjectFnStart(); - NSDebugMLLog(@"gsdb", @"model gcDecrementRefCount"); + EOFLOGObjectLevel(@"gsdb", @"model gcDecrementRefCount"); [(id)_model gcDecrementRefCount]; [(id)_arguments gcDecrementRefCount]; diff --git a/EOAccess/EOUtilities.h b/EOAccess/EOUtilities.h index b3660f4..ef5e56e 100644 --- a/EOAccess/EOUtilities.h +++ b/EOAccess/EOUtilities.h @@ -27,16 +27,23 @@ #ifndef __EOUtilities_h__ #define __EOUtilities_h__ -#import + +#import + + +@class NSArray; +@class NSDictionary; +@class NSString; @class EODatabaseContext; @class EOModelGroup; @class EOEntity; + extern NSString *EOMoreThanOneException; -@interface EOEditingContext(EOUtilities) +@interface EOEditingContext (EOUtilities) - (NSArray*)objectsForEntityNamed: (NSString*)name; - (NSArray*)objectsOfClass: (Class)classObject; diff --git a/EOAccess/EOUtilities.m b/EOAccess/EOUtilities.m index 529b585..2e6c495 100644 --- a/EOAccess/EOUtilities.m +++ b/EOAccess/EOUtilities.m @@ -37,6 +37,8 @@ static char rcsId[] = "$Id$"; #import #import +#import +#import #import #import @@ -227,7 +229,7 @@ static NSString *EOMoreThanOneException = @"EOMoreThanOneException"; { NSDebugMLog(@"exception in EOEditingContext (EOUtilities) objectsMatchingValues:entityNamed:"); NSLog(@"exception in EOEditingContext (EOUtilities) objectsMatchingValues:entityNamed:"); - NSDebugMLog(@"exception=%@",localException); + NSDebugMLog(@"exception=%@", localException); NSLog(@"exception=%@", localException); /* localException=ExceptionByAddingUserInfoObjectFrameInfo(localException, @"In EOEditingContext (EOUtilities) objectsMatchingValues:entityNamed:"); diff --git a/EOAdaptors/Postgres95/Postgres95Adaptor.m b/EOAdaptors/Postgres95/Postgres95Adaptor.m index 3a926e5..7ab2a26 100644 --- a/EOAdaptors/Postgres95/Postgres95Adaptor.m +++ b/EOAdaptors/Postgres95/Postgres95Adaptor.m @@ -47,8 +47,7 @@ static char rcsId[] = "$Id$"; #import #import #import - -#include +#import #import #import diff --git a/EOAdaptors/Postgres95/Postgres95Channel.m b/EOAdaptors/Postgres95/Postgres95Channel.m index 01f9ee5..ca3d30e 100644 --- a/EOAdaptors/Postgres95/Postgres95Channel.m +++ b/EOAdaptors/Postgres95/Postgres95Channel.m @@ -44,13 +44,13 @@ static char rcsId[] = "$Id$"; #import #import #import - -#include +#import #import #import #import +#import #import #import @@ -1306,9 +1306,38 @@ each key - (NSArray *)describeTableNames { - // TODO - [self notImplemented: _cmd]; - return nil; + int i, count; + NSMutableArray *results = [NSMutableArray array]; + + NSAssert(_pgConn, @"Channel not opened"); + + _pgResult = PQexec(_pgConn, + "SELECT tablename FROM pg_tables WHERE +pg_tables.schemaname = 'public'"); + + if (_pgResult == NULL + || PQresultStatus(_pgResult) != PGRES_TUPLES_OK) + { + _pgResult = NULL; + [NSException raise: Postgres95Exception + format: @"cannot read list of tables from database. " + @"bad response from server"]; + } + + [_oidToTypeName removeAllObjects]; + count = PQntuples(_pgResult); + + for (i = 0; i < count; i++) + { + char *oid = PQgetvalue(_pgResult, i, 0); + + [results addObject: [NSString stringWithUTF8String: oid]]; + } + + PQclear(_pgResult); + _pgResult = NULL; + + return [NSArray arrayWithArray: results]; } - (NSArray *)describeStoredProcedureNames diff --git a/EOAdaptors/Postgres95/Postgres95Values.h b/EOAdaptors/Postgres95/Postgres95Values.h index 9db9f69..03e6b0d 100644 --- a/EOAdaptors/Postgres95/Postgres95Values.h +++ b/EOAdaptors/Postgres95/Postgres95Values.h @@ -31,6 +31,7 @@ #import #import #import +#import #import diff --git a/EOAdaptors/Postgres95/Postgres95Values.m b/EOAdaptors/Postgres95/Postgres95Values.m index 3954f1a..912bd8a 100644 --- a/EOAdaptors/Postgres95/Postgres95Values.m +++ b/EOAdaptors/Postgres95/Postgres95Values.m @@ -37,8 +37,8 @@ static char rcsId[] = "$Id$"; #import #import #import - -#include +#import +#import #import #import diff --git a/EOControl/EOAndQualifier.m b/EOControl/EOAndQualifier.m index 9043ca0..54d0f38 100644 --- a/EOControl/EOAndQualifier.m +++ b/EOControl/EOAndQualifier.m @@ -40,10 +40,10 @@ static char rcsId[] = "$Id$"; #import #import -#import #import #import + @implementation EOAndQualifier + (EOQualifier *)qualifierWithQualifierArray: (NSArray *)array diff --git a/EOControl/EOCheapArray.h b/EOControl/EOCheapArray.h index ecb3340..faae00f 100644 --- a/EOControl/EOCheapArray.h +++ b/EOControl/EOCheapArray.h @@ -27,6 +27,10 @@ #ifndef __EOCheapArray_h__ #define __EOCheapArray_h__ +#import +#import + + @interface EOCheapCopyArray : NSArray { unsigned int _count; diff --git a/EOControl/EOClassDescription.h b/EOControl/EOClassDescription.h index e61c0ae..5202999 100644 --- a/EOControl/EOClassDescription.h +++ b/EOControl/EOClassDescription.h @@ -30,6 +30,8 @@ #import #import #import +#import + @class NSDictionary; @class NSFormatter; @@ -45,6 +47,7 @@ typedef enum EODeleteRuleNoAction } EODeleteRule; + @interface EOClassDescription : NSObject + (void)registerClassDescription: (EOClassDescription *)description @@ -147,7 +150,7 @@ extern NSString *EOClassDescriptionNeededForClassNotification; extern NSString *EOClassDescriptionNeededForEntityNameNotification; -@interface NSArray(EOShallowCopy) +@interface NSArray (EOShallowCopy) - (NSArray *)shallowCopy; @@ -220,7 +223,7 @@ extern NSString *EOValidatedPropertyUserInfoKey; @end @interface NSObject (_EOEditingContext) --(EOEditingContext*)editingContext; +- (EOEditingContext*)editingContext; @end #endif diff --git a/EOControl/EOClassDescription.m b/EOControl/EOClassDescription.m index f03a8bc..8cbc38e 100644 --- a/EOControl/EOClassDescription.m +++ b/EOControl/EOClassDescription.m @@ -133,7 +133,7 @@ static id classDelegate = nil; NSDebugMLLog(@"gsdb", @"entityName=%@", entityName); classDescription = NSMapGet(classDescriptionForEntity, entityName); - NSDebugMLLog(@"gsdb",@"classDescription=%@",classDescription); + NSDebugMLLog(@"gsdb", @"classDescription=%@", classDescription); /*?? if (classDescription==NOT_FOUND_CLASS_DESCRIPTION) classDescription=nil; @@ -292,7 +292,8 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext - (NSString *)displayNameForKey: (NSString *)key { const char *s, *ckey = [key cString]; - NSMutableString *str = [NSMutableString initWithCapacity: [key length]]; + NSMutableString *str = [[NSMutableString alloc] initWithCapacity: + [key length]]; char c; BOOL init = NO; @@ -390,7 +391,7 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext switch (deleteRule) { case EODeleteRuleNullify: - NSDebugMLLog(@"gsdb", @"EODeleteRuleNullify"); + EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleNullify"); [object removeObject: destination fromBothSidesOfRelationshipWithKey: key]; @@ -409,7 +410,7 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext case EODeleteRuleCascade: //OK - NSDebugMLLog(@"gsdb", @"EODeleteRuleCascade"); + EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleCascade"); [object removeObject: destination fromBothSidesOfRelationshipWithKey: key]; [context deleteObject: destination]; @@ -417,7 +418,7 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext break; case EODeleteRuleDeny: - NSDebugMLLog(@"gsdb", @"EODeleteRuleDeny"); + EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleDeny"); // TODO don't know how to do yet, if raise an exception // or something else. NSEmitTODO(); @@ -425,7 +426,7 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext break; case EODeleteRuleNoAction: - NSDebugMLLog(@"gsdb", @"EODeleteRuleNoAction"); + EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleNoAction"); break; } } @@ -462,7 +463,7 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext switch (deleteRule) { case EODeleteRuleNullify: - NSDebugMLLog(@"gsdb", @"EODeleteRuleNullify"); + EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleNullify"); NSDebugMLLog(@"gsdb", @"toManyArray %p=%@", toManyArray, toManyArray); @@ -487,7 +488,7 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext case EODeleteRuleCascade: //OK - NSDebugMLLog(@"gsdb", @"EODeleteRuleCascade"); + EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleCascade"); NSDebugMLLog(@"gsdb", @"toManyArray %p=%@", toManyArray, toManyArray); while ((destination = [toManyArray lastObject])) @@ -503,7 +504,7 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext break; case EODeleteRuleDeny: - NSDebugMLLog(@"gsdb", @"EODeleteRuleDeny"); + EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleDeny"); NSDebugMLLog(@"gsdb", @"toManyArray %p=%@", toManyArray, toManyArray); if ([toManyArray count] > 0) { @@ -515,7 +516,7 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext break; case EODeleteRuleNoAction: - NSDebugMLLog(@"gsdb", @"EODeleteRuleNoAction"); + EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleNoAction"); break; } } @@ -997,7 +998,7 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext forKey: key]; } - NSDebugMLLog(@"gsdb",@"toManyRelationshipKeys=%@",toManyRelationshipKeys); + NSDebugMLLog(@"gsdb", @"toManyRelationshipKeys=%@", toManyRelationshipKeys); for (i = 0; i < toManyRelationshipKeyCount; i++) { @@ -1221,7 +1222,7 @@ toPropertyWithKey: (NSString *)key if ([self isToManyKey: key] == YES) { - NSDebugMLLog(@"gsdb", @"to many"); + EOFLOGObjectLevel(@"gsdb", @"to many"); val = [self valueForKey: key]; //should use storedValueForKey: ? @@ -1236,7 +1237,7 @@ toPropertyWithKey: (NSString *)key { if ([val isKindOfClass: [NSMutableArray class]]) { - NSDebugMLLog(@"gsdb", @"to many2"); + EOFLOGObjectLevel(@"gsdb", @"to many2"); [self willChange]; [val addObject: object]; } @@ -1263,7 +1264,7 @@ toPropertyWithKey: (NSString *)key } else { - NSDebugMLLog(@"gsdb", @"key is not to many"); + EOFLOGObjectLevel(@"gsdb", @"key is not to many"); [self takeValue: object forKey: key]; @@ -1316,7 +1317,7 @@ toPropertyWithKey: (NSString *)key if (removeFromSelector && [self respondsToSelector: removeFromSelector]) { - NSDebugMLLog(@"gsdb", @"responds=YES"); + EOFLOGObjectLevel(@"gsdb", @"responds=YES"); [self performSelector: removeFromSelector withObject: object]; } @@ -1324,11 +1325,11 @@ toPropertyWithKey: (NSString *)key { id val = nil; - NSDebugMLLog(@"gsdb", @"responds=NO"); + EOFLOGObjectLevel(@"gsdb", @"responds=NO"); if ([self isToManyKey:key] == YES) { - NSDebugMLLog(@"gsdb", @"key is to many"); + EOFLOGObjectLevel(@"gsdb", @"key is to many"); val = [self valueForKey: key]; NSDebugMLLog(@"gsdb", @"val=%@", val); @@ -1354,7 +1355,7 @@ toPropertyWithKey: (NSString *)key } else { - NSDebugMLLog(@"gsdb", @"key is not to many"); + EOFLOGObjectLevel(@"gsdb", @"key is not to many"); [self takeValue: nil forKey: key]; } @@ -1394,7 +1395,7 @@ forBothSidesOfRelationshipWithKey: (NSString*)key /* if ([object isToManyKey:inverseKey]) { //?? - NSDebugMLLog(@"gsdb",@"Inverse is to many"); + EOFLOGObjectLevel(@"gsdb",@"Inverse is to many"); [oldObject removeObject:self fromPropertyWithKey:inverseKey]; [object addObject:self @@ -1402,7 +1403,7 @@ forBothSidesOfRelationshipWithKey: (NSString*)key } else { - NSDebugMLLog(@"gsdb",@"Inverse is not to many"); + EOFLOGObjectLevel(@"gsdb",@"Inverse is not to many"); //OK //MIRKO if ((inverseKey = [oldObject inverseForRelationshipKey:key])) //MIRKO [oldObject removeObject:self @@ -1513,15 +1514,15 @@ fromBothSidesOfRelationshipWithKey: (NSString *)key + (NSException *)validationExceptionWithFormat: (NSString *)format, ... { NSException *exp; - NSString *name; + NSString *aName; va_list args; va_start(args, format); - name = [[[NSString alloc] initWithFormat: format arguments: args] - autorelease]; + aName = [[[NSString alloc] initWithFormat: format arguments: args] + autorelease]; exp = [NSException exceptionWithName: EOValidationException - reason: name + reason: aName userInfo: nil]; va_end(args); @@ -1537,21 +1538,21 @@ fromBothSidesOfRelationshipWithKey: (NSString *)key exp = [subexceptions objectAtIndex: 0]; else if ([subexceptions count] > 1) { - NSString *name, *reason; - NSMutableDictionary *userInfo; + NSString *aName, *aReason; + NSMutableDictionary *aUserInfo; exp = [subexceptions objectAtIndex: 0]; - name = [exp name]; - reason = [exp reason]; - userInfo = [[exp userInfo] mutableCopy]; - - [userInfo setObject: subexceptions - forKey: EOAdditionalExceptionsKey]; + aName = [exp name]; + aReason = [exp reason]; + aUserInfo = [[exp userInfo] mutableCopy]; - exp = [NSException exceptionWithName: name - reason: reason - userInfo: userInfo]; + [aUserInfo setObject: subexceptions + forKey: EOAdditionalExceptionsKey]; + + exp = [NSException exceptionWithName: aName + reason: aReason + userInfo: aUserInfo]; } return exp; @@ -1560,21 +1561,21 @@ fromBothSidesOfRelationshipWithKey: (NSString *)key - (NSException *)exceptionAddingEntriesToUserInfo: (NSDictionary *)additions { NSException *exp; - NSString *name, *reason; - NSMutableDictionary *userInfo; + NSString *aName, *aReason; + NSMutableDictionary *aUserInfo; - name = [self name]; - reason = [self reason]; - userInfo = [[self userInfo] mutableCopy]; + aName = [self name]; + aReason = [self reason]; + aUserInfo = [[self userInfo] mutableCopy]; - [userInfo setObject: [additions allValues] - forKey: EOValidatedObjectUserInfoKey]; - [userInfo setObject: [additions allKeys] - forKey: EOValidatedPropertyUserInfoKey]; + [aUserInfo setObject: [additions allValues] + forKey: EOValidatedObjectUserInfoKey]; + [aUserInfo setObject: [additions allKeys] + forKey: EOValidatedPropertyUserInfoKey]; - exp = [NSException exceptionWithName: name - reason: reason - userInfo: userInfo]; + exp = [NSException exceptionWithName: aName + reason: aReason + userInfo: aUserInfo]; return exp; } diff --git a/EOControl/EOControl.h b/EOControl/EOControl.h index 5c2c9a5..1af0493 100644 --- a/EOControl/EOControl.h +++ b/EOControl/EOControl.h @@ -46,7 +46,7 @@ #import #import #import -#include +#import #endif /* __EOControl_h__ */ diff --git a/EOControl/EODataSource.h b/EOControl/EODataSource.h index ced34d2..748008a 100644 --- a/EOControl/EODataSource.h +++ b/EOControl/EODataSource.h @@ -31,6 +31,8 @@ @class NSArray; @class NSDictionary; +@class NSString; + @class EOEditingContext; @class EOClassDescription; diff --git a/EOControl/EODataSource.m b/EOControl/EODataSource.m index 6062b34..08fe7a1 100644 --- a/EOControl/EODataSource.m +++ b/EOControl/EODataSource.m @@ -33,11 +33,11 @@ static char rcsId[] = "$Id$"; -#import #import #import #import + @implementation EODataSource - (id)createObject diff --git a/EOControl/EODebug.h b/EOControl/EODebug.h index fcada9b..d25c5a1 100644 --- a/EOControl/EODebug.h +++ b/EOControl/EODebug.h @@ -30,8 +30,9 @@ #ifdef DEBUG -#include -#include +#import +#import + extern void EOFLogC_(const char* file,int line,const char* string); extern void EOFLogDumpObject_(const char* file,int line,id object,int deep); diff --git a/EOControl/EODebug.m b/EOControl/EODebug.m index 5571948..a12e6ea 100644 --- a/EOControl/EODebug.m +++ b/EOControl/EODebug.m @@ -31,9 +31,9 @@ static char rcsId[] = "$Id$"; -#include -#include -#include +#import +#import + #include #define USTART NSAutoreleasePool* arp=[NSAutoreleasePool new]; diff --git a/EOControl/EODetailDataSource.h b/EOControl/EODetailDataSource.h index 3996293..687002d 100644 --- a/EOControl/EODetailDataSource.h +++ b/EOControl/EODetailDataSource.h @@ -24,9 +24,15 @@ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef __EODetailDataSource_h__ +#define __EODetailDataSource_h__ + #import +@class EOKeyValueUnarchiver; + + @interface EODetailDataSource : EODataSource { EODataSource *_masterDataSource; @@ -60,3 +66,5 @@ - (EOEditingContext *)editingContext; @end + +#endif /* __EODetailDataSource_h__ */ diff --git a/EOControl/EODetailDataSource.m b/EOControl/EODetailDataSource.m index ece3b00..f71540e 100644 --- a/EOControl/EODetailDataSource.m +++ b/EOControl/EODetailDataSource.m @@ -37,9 +37,10 @@ static char rcsId[] = "$Id$"; #import #import #import -#import + #import #import +#import #import diff --git a/EOControl/EOEditingContext.h b/EOControl/EOEditingContext.h index 4a8d412..f9cb7a9 100644 --- a/EOControl/EOEditingContext.h +++ b/EOControl/EOEditingContext.h @@ -26,10 +26,22 @@ #ifndef __EOEditingContext_h__ #define __EOEditingContext_h__ -#import +#import +#import +#import + #import #import + +@class NSArray; +@class NSMutableArray; +@class NSDictionary; +@class NSMutableDictionary; +@class NSAutoreleasePool; +@class NSUndoManager; + + @interface EOEditingContext : EOObjectStore { EOObjectStore *_objectStore; diff --git a/EOControl/EOEditingContext.m b/EOControl/EOEditingContext.m index d218eeb..c1651d8 100644 --- a/EOControl/EOEditingContext.m +++ b/EOControl/EOEditingContext.m @@ -33,12 +33,8 @@ static char rcsId[] = "$Id$"; //TODO EOMultiReaderLocks -#import #import -#import -#import - #import #import #import @@ -47,9 +43,9 @@ static char rcsId[] = "$Id$"; #import #import #import +#import #import -#import @implementation EOEditingContext diff --git a/EOControl/EOFault.h b/EOControl/EOFault.h index 04ca35b..7e8807f 100644 --- a/EOControl/EOFault.h +++ b/EOControl/EOFault.h @@ -30,9 +30,16 @@ #ifndef __EOFault_h__ #define __EOFault_h__ -#include +#import +#import -#include +#import + + +@class NSInvocation; +@class NSMethodSignature; +@class NSDictionary; +@class NSString; @class EOFaultHandler; diff --git a/EOControl/EOFault.m b/EOControl/EOFault.m index 6d465c1..36f0f4f 100644 --- a/EOControl/EOFault.m +++ b/EOControl/EOFault.m @@ -46,12 +46,14 @@ static char rcsId[] = "$Id$"; #import #import #import +#import +#import +#import -#include #include -#import #import +#import #import @@ -141,7 +143,7 @@ typedef struct { EOFault *fault = object; unsigned int refs; - NSAssert(handler,@"No Handler"); + NSAssert(handler, @"No Handler"); refs = [object retainCount]; @@ -579,4 +581,3 @@ typedef struct { } @end - diff --git a/EOControl/EOFaultHandler.m b/EOControl/EOFaultHandler.m index cf07bae..4f3dcac 100644 --- a/EOControl/EOFaultHandler.m +++ b/EOControl/EOFaultHandler.m @@ -41,8 +41,8 @@ static char rcsId[] = "$Id$"; #import #import -#include -#import +#import + #import diff --git a/EOControl/EOFetchSpecification.h b/EOControl/EOFetchSpecification.h index 4eed871..bf7f5e1 100644 --- a/EOControl/EOFetchSpecification.h +++ b/EOControl/EOFetchSpecification.h @@ -27,31 +27,37 @@ #ifndef __EOFetchSpecification_h__ #define __EOFetchSpecification_h__ -#import +#import +@class NSArray; +@class NSDictionary; +@class NSString; + @class EOQualifier; @class EOKeyValueArchiver; @class EOKeyValueUnarchiver; +@class EOFetchSpecification; + @interface EOFetchSpecification : NSObject { - EOQualifier *_qualifier; - NSArray *_sortOrderings; - NSString *_entityName; - NSDictionary *_hints; - unsigned int _fetchLimit; - NSArray *_prefetchingRelationshipKeys; - NSArray *_rawAttributeKeys; - struct { - unsigned usesDistinct:1; - unsigned isDeep:1; - unsigned locksObjects:1; - unsigned refreshesRefetchedObjects:1; - unsigned promptsAfterFetchLimit:1; - unsigned allVariablesRequiredFromBindings:1; - unsigned :26; //padding - }_flags; + EOQualifier *_qualifier; + NSArray *_sortOrderings; + NSString *_entityName; + NSDictionary *_hints; + unsigned int _fetchLimit; + NSArray *_prefetchingRelationshipKeys; + NSArray *_rawAttributeKeys; + struct { + unsigned usesDistinct:1; + unsigned isDeep:1; + unsigned locksObjects:1; + unsigned refreshesRefetchedObjects:1; + unsigned promptsAfterFetchLimit:1; + unsigned allVariablesRequiredFromBindings:1; + unsigned :26; //padding + }_flags; } + (EOFetchSpecification *)fetchSpecification; diff --git a/EOControl/EOFetchSpecification.m b/EOControl/EOFetchSpecification.m index 7f07947..082fa26 100644 --- a/EOControl/EOFetchSpecification.m +++ b/EOControl/EOFetchSpecification.m @@ -33,6 +33,9 @@ static char rcsId[] = "$Id$"; +#import +#import + #import #import #import @@ -162,7 +165,7 @@ setPromptsAfterFetchLimit: promptsAfterFetchLimit setRequiresAllQualifierBindingVariables:requiresAllQualifierBindingVariables */ //call setXX fn instead to have "willChange" ?? - ret->_qualifier = [()_qualifier copyWithZone: zone]; + ret->_qualifier = [(id )_qualifier copyWithZone: zone]; ret->_sortOrderings = [_sortOrderings copyWithZone: zone]; //mirko: ASSIGN(ret->_sortOrderings, _sortOrderings); ret->_entityName = [_entityName copyWithZone: zone]; ret->_hints = [_hints copyWithZone: zone]; @@ -431,7 +434,7 @@ setRequiresAllQualifierBindingVariables:requiresAllQualifierBindingVariables - (NSDictionary *)hints { - NSMutableDictionary *hints = _hints; + NSMutableDictionary *hints = (NSMutableDictionary *)_hints; BOOL promptsAfterFetchLimit; NSArray *prefetchingRelationshipKeyPaths; unsigned fetchLimit; diff --git a/EOControl/EOGenericRecord.h b/EOControl/EOGenericRecord.h index a8f4080..db5ec78 100644 --- a/EOControl/EOGenericRecord.h +++ b/EOControl/EOGenericRecord.h @@ -29,13 +29,16 @@ #import + @class NSString; @class NSMutableDictionary; + @class EOClassDescription; @class EOEditingContext; @class EOGlobalID; @class EOMutableKnownKeyDictionary; + @interface EOGenericRecord : NSObject { EOClassDescription *classDescription; @@ -54,6 +57,10 @@ + (void)eoCalculateAllSizeWith: (NSMutableDictionary*)dict; - (unsigned int)eoCalculateSizeWith: (NSMutableDictionary*)dict; ++ (unsigned int)eoCalculateSizeWith: (NSMutableDictionary *)dict + forArray: (NSArray *)array; + +- (NSString *)debugDictionaryDescription; @end /* EOGenericRecord */ diff --git a/EOControl/EOGenericRecord.m b/EOControl/EOGenericRecord.m index 7310405..ce7dc9f 100644 --- a/EOControl/EOGenericRecord.m +++ b/EOControl/EOGenericRecord.m @@ -36,11 +36,12 @@ static char rcsId[] = "$Id$"; -#import - #import #import #import +#import +#import +#import #import #import @@ -53,7 +54,7 @@ static char rcsId[] = "$Id$"; #import #import #import - +#import @interface NSObject (EOCalculateSize) diff --git a/EOControl/EOGlobalID.h b/EOControl/EOGlobalID.h index d716de7..da04cce 100644 --- a/EOControl/EOGlobalID.h +++ b/EOControl/EOGlobalID.h @@ -27,11 +27,12 @@ #ifndef __EOGlobalID_h__ #define __EOGlobalID_h__ -#import +#import extern NSString *EOGlobalIDChangedNotification; + @interface EOGlobalID : NSObject - (BOOL)isEqual:other; - (unsigned)hash; diff --git a/EOControl/EOGlobalID.m b/EOControl/EOGlobalID.m index c0234f2..ea17e17 100644 --- a/EOControl/EOGlobalID.m +++ b/EOControl/EOGlobalID.m @@ -33,11 +33,15 @@ static char rcsId[] = "$Id$"; -#import +#import +#import + #import + #include #include + NSString *EOGlobalIDChangedNotification = @"EOGlobalIDChangedNotification"; diff --git a/EOControl/EOKeyComparisonQualifier.m b/EOControl/EOKeyComparisonQualifier.m index 8417a87..8e30505 100644 --- a/EOControl/EOKeyComparisonQualifier.m +++ b/EOControl/EOKeyComparisonQualifier.m @@ -41,6 +41,7 @@ static char rcsId[] = "$Id$"; #import #import + @implementation EOKeyComparisonQualifier + (EOQualifier *)qualifierWithLeftKey: (NSString *)leftKey diff --git a/EOControl/EOKeyGlobalID.h b/EOControl/EOKeyGlobalID.h index 1d0650e..710e367 100644 --- a/EOControl/EOKeyGlobalID.h +++ b/EOControl/EOKeyGlobalID.h @@ -29,6 +29,7 @@ #import + @interface EOKeyGlobalID : EOGlobalID { unsigned short _keyCount; diff --git a/EOControl/EOKeyGlobalID.m b/EOControl/EOKeyGlobalID.m index 49dc072..3b6f3fe 100644 --- a/EOControl/EOKeyGlobalID.m +++ b/EOControl/EOKeyGlobalID.m @@ -33,6 +33,10 @@ static char rcsId[] = "$Id$"; +#import +#import +#import + #import #import #import diff --git a/EOControl/EOKeyValueArchiver.h b/EOControl/EOKeyValueArchiver.h index a78f25e..61713b7 100644 --- a/EOControl/EOKeyValueArchiver.h +++ b/EOControl/EOKeyValueArchiver.h @@ -28,7 +28,15 @@ #define __EOKeyValueArchiving_h__ -#import +#import +#import + + +@class NSArray; +@class NSDictionary; +@class NSMutableDictionary; +@class NSString; + @interface EOKeyValueArchiver : NSObject { @@ -77,12 +85,12 @@ referenceToEncodeForObject: (id)object; @interface EOKeyValueUnarchiver : NSObject { - NSDictionary* _propertyList; + NSDictionary *_propertyList; id _parent; id _nextParent; - NSMutableArray* _allUnarchivedObjects; + NSMutableArray *_allUnarchivedObjects; id _delegate; - NSHashTable* _awakenedObjects; + NSHashTable *_awakenedObjects; } - (id)initWithDictionary: (NSDictionary *)dictionary; diff --git a/EOControl/EOKeyValueArchiver.m b/EOControl/EOKeyValueArchiver.m index 0a45c8c..56d57c7 100644 --- a/EOControl/EOKeyValueArchiver.m +++ b/EOControl/EOKeyValueArchiver.m @@ -34,7 +34,7 @@ static char rcsId[] = "$Id$"; #import -#import + #import diff --git a/EOControl/EOKeyValueCoding.m b/EOControl/EOKeyValueCoding.m index 4cce87a..798f978 100644 --- a/EOControl/EOKeyValueCoding.m +++ b/EOControl/EOKeyValueCoding.m @@ -52,13 +52,12 @@ static char rcsId[] = "$Id$"; #import #import -#include #include -#import #import #import #import +#import /* diff --git a/EOControl/EOKeyValueCodingBase.h b/EOControl/EOKeyValueCodingBase.h index ebfdb1a..16e2e12 100644 --- a/EOControl/EOKeyValueCodingBase.h +++ b/EOControl/EOKeyValueCodingBase.h @@ -28,11 +28,12 @@ #define __EOKeyValueCoding_h__ #if !FOUNDATION_HAS_KVC + #import #import -@class NSDictionary; +@class NSDictionary; @interface NSObject (EOKeyValueCodingPrimitives) diff --git a/EOControl/EOKeyValueCodingBase.m b/EOControl/EOKeyValueCodingBase.m index d457173..c22237f 100644 --- a/EOControl/EOKeyValueCodingBase.m +++ b/EOControl/EOKeyValueCodingBase.m @@ -48,8 +48,8 @@ static char rcsId[] = "$Id$"; #import #import #import +#import -#include #include #include "config.h" diff --git a/EOControl/EOKeyValueQualifier.m b/EOControl/EOKeyValueQualifier.m index 18f07f5..3ce91fc 100644 --- a/EOControl/EOKeyValueQualifier.m +++ b/EOControl/EOKeyValueQualifier.m @@ -45,6 +45,7 @@ static char rcsId[] = "$Id$"; #import #import + @implementation EOKeyValueQualifier + (EOKeyValueQualifier *)qualifierWithKey: (NSString *)key diff --git a/EOControl/EOMutableKnownKeyDictionary.h b/EOControl/EOMutableKnownKeyDictionary.h index ce04f32..66cd734 100644 --- a/EOControl/EOMutableKnownKeyDictionary.h +++ b/EOControl/EOMutableKnownKeyDictionary.h @@ -27,11 +27,20 @@ #ifndef __EOMultipleKnownKeyDictionary_h__ #define __EOMultipleKnownKeyDictionary_h__ -#import -#include +#import +#import +#import + +#import + + +@class NSArray; +@class NSDictionary; +@class NSMutableDictionary; @class EOMutableKnownKeyDictionary; + @interface EOMKKDInitializer : GCObject { unsigned int _count; diff --git a/EOControl/EOMutableKnownKeyDictionary.m b/EOControl/EOMutableKnownKeyDictionary.m index f84585b..3b38cbc 100644 --- a/EOControl/EOMutableKnownKeyDictionary.m +++ b/EOControl/EOMutableKnownKeyDictionary.m @@ -35,7 +35,6 @@ static char rcsId[] = "$Id$"; #import -#import #import #import diff --git a/EOControl/EONSAddOns.h b/EOControl/EONSAddOns.h index 353f6aa..aeb01fb 100644 --- a/EOControl/EONSAddOns.h +++ b/EOControl/EONSAddOns.h @@ -27,7 +27,11 @@ #ifndef __EONSAddOns_h__ #define __EONSAddOns_h__ -#import +#import +#import + + +@class NSArray; @interface NSObject (NSObjectPerformingSelector) diff --git a/EOControl/EONotQualifier.m b/EOControl/EONotQualifier.m index a3f1e3f..8295974 100644 --- a/EOControl/EONotQualifier.m +++ b/EOControl/EONotQualifier.m @@ -39,6 +39,7 @@ static char rcsId[] = "$Id$"; #import + @implementation EONotQualifier + (EOQualifier *)qualifierWithQualifier: (EOQualifier *)qualifier diff --git a/EOControl/EONull.h b/EOControl/EONull.h index 77144b9..ae2fa14 100644 --- a/EOControl/EONull.h +++ b/EOControl/EONull.h @@ -29,6 +29,7 @@ #import + @interface EONull : NSObject + null; @end /* EONull */ diff --git a/EOControl/EONull.m b/EOControl/EONull.m index fdadb00..ab8753a 100644 --- a/EOControl/EONull.m +++ b/EOControl/EONull.m @@ -38,8 +38,8 @@ static char rcsId[] = "$Id$"; #import #import -#import #import + #include "config.h" diff --git a/EOControl/EOObjectStore.h b/EOControl/EOObjectStore.h index 62af738..8dd24f6 100644 --- a/EOControl/EOObjectStore.h +++ b/EOControl/EOObjectStore.h @@ -27,7 +27,12 @@ #ifndef __EOObjectStore_h__ #define __EOObjectStore_h__ -#import +#import + + +@class NSArray; +@class NSDictionary; +@class NSString; @class EOEditingContext; @class EOGlobalID; diff --git a/EOControl/EOObjectStore.m b/EOControl/EOObjectStore.m index 9e2a07a..337cf48 100644 --- a/EOControl/EOObjectStore.m +++ b/EOControl/EOObjectStore.m @@ -33,7 +33,8 @@ static char rcsId[] = "$Id$"; -#import +#import + #import diff --git a/EOControl/EOObjectStoreCoordinator.h b/EOControl/EOObjectStoreCoordinator.h index bfacf68..06722d6 100644 --- a/EOControl/EOObjectStoreCoordinator.h +++ b/EOControl/EOObjectStoreCoordinator.h @@ -26,13 +26,20 @@ #ifndef __EOObjectStoreCoordinator_h__ #define __EOObjectStoreCoordinator_h__ -#import + #import + +@class NSArray; +@class NSMutableArray; +@class NSDictionary; +@class NSString; + @class EOCooperatingObjectStore; @class EOQualifier; @class EOModelGroup; + @interface EOObjectStoreCoordinator:EOObjectStore { NSMutableArray *_stores; diff --git a/EOControl/EOObjectStoreCoordinator.m b/EOControl/EOObjectStoreCoordinator.m index 276c99b..78c7ea8 100644 --- a/EOControl/EOObjectStoreCoordinator.m +++ b/EOControl/EOObjectStoreCoordinator.m @@ -35,6 +35,7 @@ static char rcsId[] = "$Id$"; #import #import +#import #import #import diff --git a/EOControl/EOObserver.h b/EOControl/EOObserver.h index 0d094e8..d732904 100644 --- a/EOControl/EOObserver.h +++ b/EOControl/EOObserver.h @@ -27,7 +27,12 @@ #ifndef __EOObserver_h__ #define __EOObserver_h__ -#import + +#import + + +@class NSArray; + @interface NSObject (EOObserver) @@ -75,10 +80,12 @@ typedef enum { EOObserverPrioritySixth, EOObserverPriorityLater } EOObserverPriority; + #define EOObserverNumberOfPriorities ((unsigned)EOObserverPriorityLater + 1) -@interface EODelayedObserver : NSObject { +@interface EODelayedObserver : NSObject +{ @public EODelayedObserver *_next; // linked list. Nil if not on list. } @@ -97,17 +104,18 @@ typedef enum { @end // used with NSRunLoop's performSelector:target:argument:order:modes: -enum { - EOFlushDelayedObserversRunLoopOrdering = 400000 +enum +{ + EOFlushDelayedObserversRunLoopOrdering = 400000 }; @interface EODelayedObserverQueue : NSObject { - EODelayedObserver *_queue[EOObserverNumberOfPriorities]; // lists for each priority - unsigned _highestNonEmptyQueue; - BOOL _haveEntryInNotificationQueue; - NSArray *_modes; + EODelayedObserver *_queue[EOObserverNumberOfPriorities]; // lists for each priority + unsigned _highestNonEmptyQueue; + BOOL _haveEntryInNotificationQueue; + NSArray *_modes; } + (EODelayedObserverQueue *)defaultObserverQueue; @@ -123,10 +131,11 @@ enum { @end -@interface EOObserverProxy : EODelayedObserver { - id _target; - SEL _action; - EOObserverPriority _priority; +@interface EOObserverProxy : EODelayedObserver +{ + id _target; + SEL _action; + EOObserverPriority _priority; } - initWithTarget: (id)target diff --git a/EOControl/EOObserver.m b/EOControl/EOObserver.m index 9bf3bd4..0c73412 100644 --- a/EOControl/EOObserver.m +++ b/EOControl/EOObserver.m @@ -37,12 +37,12 @@ static char rcsId[] = "$Id$"; #import #import -#import #import #import #import #import + @implementation NSObject (EOObserver) - (void)willChange diff --git a/EOControl/EOOrQualifier.m b/EOControl/EOOrQualifier.m index 6e3c00f..6c9f365 100644 --- a/EOControl/EOOrQualifier.m +++ b/EOControl/EOOrQualifier.m @@ -38,9 +38,9 @@ static char rcsId[] = "$Id$"; #import #import -#import #import + @implementation EOOrQualifier + (EOQualifier *)qualifierWithQualifierArray: (NSArray *)array diff --git a/EOControl/EOQualifier.h b/EOControl/EOQualifier.h index e2c89f4..be99993 100644 --- a/EOControl/EOQualifier.h +++ b/EOControl/EOQualifier.h @@ -27,10 +27,15 @@ #ifndef __EOQualifier_h__ #define __EOQualifier_h__ -#import +#import + #import +@class NSArray; +@class NSDictionary; +@class NSString; + @class EOClassDescription; @class EOSQLExpression; @class EOQualifier; diff --git a/EOControl/EOQualifier.m b/EOControl/EOQualifier.m index c4ce819..515e2f6 100644 --- a/EOControl/EOQualifier.m +++ b/EOControl/EOQualifier.m @@ -39,14 +39,16 @@ static char rcsId[] = "$Id$"; #import #import #import - #import +#import +#import -#import #import #import + @implementation NSNumber (EOQualifierExtras) + - (id)initWithString:(NSString *)string { double dVal; diff --git a/EOControl/EOSortOrdering.h b/EOControl/EOSortOrdering.h index a39a207..7e37da3 100644 --- a/EOControl/EOSortOrdering.h +++ b/EOControl/EOSortOrdering.h @@ -28,7 +28,8 @@ #define __EOSortOrdering_h__ -#import +#import +#import #import diff --git a/EOControl/EOSortOrdering.m b/EOControl/EOSortOrdering.m index 3491e0e..36556cc 100644 --- a/EOControl/EOSortOrdering.m +++ b/EOControl/EOSortOrdering.m @@ -33,9 +33,11 @@ static char rcsId[] = "$Id$"; -#import +#import + #import #import +#import @implementation EOSortOrdering diff --git a/EOControl/EOUndoManager.h b/EOControl/EOUndoManager.h index b04a699..5cb3c22 100644 --- a/EOControl/EOUndoManager.h +++ b/EOControl/EOUndoManager.h @@ -26,6 +26,7 @@ #import + @interface EOUndoManager : NSUndoManager - (void) forgetAllWithTarget: (id)param0; diff --git a/EOControl/EOUndoManager.m b/EOControl/EOUndoManager.m index 3264ec2..ae4c745 100644 --- a/EOControl/EOUndoManager.m +++ b/EOControl/EOUndoManager.m @@ -35,9 +35,9 @@ static char rcsId[] = "$Id$"; #import -#import #import + @implementation EOUndoManager - (void) forgetAllWithTarget: (id)param0 diff --git a/EOModeler/EOModelExtensions.h b/EOModeler/EOModelExtensions.h index e23443f..ef3721e 100644 --- a/EOModeler/EOModelExtensions.h +++ b/EOModeler/EOModelExtensions.h @@ -27,8 +27,12 @@ #ifndef __EOModelExtensions_h__ #define __EOModelExtensions_h__ +#import +#import -#import +#import +#import +#import @interface EOEntity (EOModelExtensions)