gnustep/libs-gdl2
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gdl2.git synced 2025-04-22 12:55:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* EOAccess/EOUtilities.m|.h ([EOObjectStoreCoordinator -modelGroup]),

Browse source 
([EOObjectStoreCoordinator -setModelGroup:]): moved from EOControl/
EOObjectStoreCoordinator.m

* EOAccess/EOUtilities.m|.h ([EOFetchSpecification
+fetchSpecificationNamed:entityNamed:]): moved from EOControl/
EOFetchSpecification.m

* EOControl/EOFetchSpecification.m ([EOFetchSpecification
+fetchSpecificationNamed:entityNamed:]): return nil.

* EOAccess/EOAccessFault.m|.h ([EOFault -databaseContext]): moved from
EOControl/EOFault.m

* EOControl/EOEditingContext.m ([EOEditingContext -tryToSaveChanges]),
([EOEditingContext -saveChanges:]): use respondsToSelector:


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@15431 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
mirko 2002-12-31 16:25:21 +00:00
parent 88b7a52d33
commit 8810b9e5ae
64 changed files with 355 additions and 173 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ChangeLog
View file

@ -1,3 +1,24 @@
2002-12-31 Mirko Viviani <mirko.viviani@rccr.cremona.it>
* EOAccess/EOUtilities.m|.h ([EOObjectStoreCoordinator -modelGroup]),
([EOObjectStoreCoordinator -setModelGroup:]): moved from EOControl/
EOObjectStoreCoordinator.m
* EOAccess/EOUtilities.m|.h ([EOFetchSpecification
+fetchSpecificationNamed:entityNamed:]): moved from EOControl/
EOFetchSpecification.m
* EOControl/EOFetchSpecification.m ([EOFetchSpecification
+fetchSpecificationNamed:entityNamed:]): return nil.
* EOAccess/EOAccessFault.m|.h ([EOFault -databaseContext]): moved from
EOControl/EOFault.m
* added missing include, include config.h in all .m files.
* EOControl/EOEditingContext.m ([EOEditingContext -tryToSaveChanges]),
([EOEditingContext -saveChanges:]): use respondsToSelector:
2002-12-30 Markus Hitter <mah@jump-ing.de>
* EOAdaptors/Postgres95/Postgres95Channel.m ([Postgres95Channel

7
EOAccess/EOAccessFault.h
View file

@ -112,6 +112,13 @@
@end
@interface EOFault (EOAccess)
- (EODatabaseContext *)databaseContext;
@end
extern NSString *EOAccessFaultObjectNotAvailableException;

22
EOAccess/EOAccessFault.m
View file

@ -31,7 +31,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#ifdef GNUSTEP
#import <Foundation/NSObjCRuntime.h>
@ -43,8 +45,10 @@ static char rcsId[] = "$Id$";
#import <EOAccess/EOAccessFault.h>
#import <EOAccess/EOAccessFaultPriv.h>
#import <EOAccess/EODatabaseContext.h>
#import <EOAccess/EODatabaseContextPriv.h>
#import <EOControl/EOCheapArray.h>
#import <EOControl/EOKeyGlobalID.h>
#import <EOControl/EODebug.h>
@ -330,3 +334,19 @@ NSString *EOAccessFaultObjectNotAvailableException = @"EOAccessFaultObjectNotAva
}
@end
@implementation EOFault (EOAccess)
- (EODatabaseContext *)databaseContext
{
if ([_handler respondsToSelector: @selector(databaseContext)])
return [(id)_handler databaseContext];
else
{
[_handler completeInitializationOfObject: self];
return [self databaseContext];
}
}
@end

4
EOAccess/EOAdaptor.m
View file

@ -34,7 +34,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#if HAVE_LIBC_H
# include <libc.h>

4
EOAccess/EOAdaptorChannel.m
View file

@ -31,7 +31,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/Foundation.h>

4
EOAccess/EOAdaptorContext.m
View file

@ -31,7 +31,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSArray.h>
#import <Foundation/NSValue.h>

4
EOAccess/EOAdaptorOperation.m
View file

@ -31,7 +31,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSObject.h>
#import <Foundation/NSException.h>

6
EOAccess/EOAttribute.m
View file

@ -34,7 +34,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include <ctype.h>
@ -63,6 +65,8 @@ static char rcsId[] = "$Id$";
#import <EOControl/EOObserver.h>
#import <EOControl/EODebug.h>
#include <string.h>
@implementation EOAttribute

5
EOAccess/EODatabase.m
View file

@ -31,7 +31,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSArray.h>
#import <Foundation/NSDictionary.h>
@ -52,6 +54,7 @@ static char rcsId[] = "$Id$";
#import <EOControl/EOObjectStore.h>
#import <EOControl/EOKeyGlobalID.h>
#import <EOControl/EONull.h>
#import <EOControl/EODebug.h>

6
EOAccess/EODatabaseChannel.m
View file

@ -34,7 +34,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/Foundation.h>
@ -59,7 +61,7 @@ static char rcsId[] = "$Id$";
#import <EOControl/EOKeyValueCoding.h>
#import <EOControl/EOFetchSpecification.h>
#import <EOControl/EOClassDescription.h>
#import <EOControl/EOGlobalID.h>
#import <EOControl/EOKeyGlobalID.h>
#import <EOControl/EOObjectStore.h>
#import <EOControl/EODebug.h>

10
EOAccess/EODatabaseContext.m
View file

@ -34,7 +34,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSArray.h>
#import <Foundation/NSDictionary.h>
@ -83,6 +85,8 @@ static char rcsId[] = "$Id$";
#import <EOControl/EONull.h>
#import <EOControl/EODebug.h>
#include <string.h>
#define _LOCK_BUFFER 128
@ -823,7 +827,7 @@ classPropertyNames = [entity classPropertyNames];
[self notImplemented: _cmd]; //TODO
}
if (![globalID isFinal])
if (![(EOKeyGlobalID *)globalID isFinal])
{
NSEmitTODO();
[self notImplemented: _cmd]; //TODO
@ -5470,7 +5474,7 @@ Raises an exception is the adaptor is unable to perform the operations.
/*int maxNumberOfInstancesToBatchFetch =
[entity maxNumberOfInstancesToBatchFetch];
NSDictionary *snapshot = [self snapshotForGlobalID: gid];*///nil //TODO use it !
NSDictionary *pk = [entity primaryKeyForGlobalID: gid];
NSDictionary *pk = [entity primaryKeyForGlobalID: (EOKeyGlobalID *)gid];
EOQualifier *pkQualifier = [entity qualifierForPrimaryKey: pk];
NSMutableArray *qualifiers = [NSMutableArray array];

37
EOAccess/EODatabaseDataSource.m
View file

@ -36,12 +36,15 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSObject.h>
#import <Foundation/NSString.h>
#import <Foundation/NSException.h>
#import <Foundation/NSCoder.h>
#import <Foundation/NSEnumerator.h>
#import <Foundation/NSDebug.h>
#import <EOAccess/EODatabaseDataSource.h>
@ -354,6 +357,22 @@ static char rcsId[] = "$Id$";
// TODO flags
}
- (id)_partialInitWithEditingContext: (EOEditingContext*)editingContext
entityName: (NSString*)entityName
fetchSpecificationName: (NSString*)fetchSpecificationName
{
if ((self = [self initWithEditingContext: editingContext
entityName: entityName
fetchSpecificationName: nil]))
{
//turbocat ASSIGN(_editingContext,editingContext);
ASSIGN(_fetchSpecification, [EOFetchSpecification new]);
[_fetchSpecification setEntityName: entityName];
}
return self;
}
- (id) initWithKeyValueUnarchiver: (EOKeyValueUnarchiver *)unarchiver
{
NSString *entityName = nil;
@ -404,22 +423,6 @@ static char rcsId[] = "$Id$";
[self notImplemented: _cmd];
}
- (id)_partialInitWithEditingContext: (EOEditingContext*)editingContext
entityName: (NSString*)entityName
fetchSpecificationName: (NSString*)fetchSpecificationName
{
if ((self = [self initWithEditingContext: editingContext
entityName: entityName
fetchSpecificationName: nil]))
{
//turbocat ASSIGN(_editingContext,editingContext);
ASSIGN(_fetchSpecification, [EOFetchSpecification new]);
[_fetchSpecification setEntityName: entityName];
}
return self;
}
- (EOEditingContext*)editingContext
{
return _editingContext;

5
EOAccess/EODatabaseOperation.m
View file

@ -31,9 +31,12 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSException.h>
#import <Foundation/NSEnumerator.h>
#import <Foundation/NSDebug.h>
#import <EOAccess/EODatabaseOperation.h>

3
EOAccess/EOEntity.m
View file

@ -34,8 +34,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include <ctype.h>

4
EOAccess/EOExpressionArray.h
View file

@ -89,9 +89,9 @@
- (NSString *)expressionValueForContext: (id<EOExpressionContext>)ctx;
+ (EOExpressionArray *)parseExpression: (NSString *)expression
/*+ (EOExpressionArray *)parseExpression: (NSString *)expression
entity: (EOEntity *)entity
replacePropertyReferences: (BOOL)flag;
replacePropertyReferences: (BOOL)flag;*/
- (NSString*)valueForSQLExpression: (EOSQLExpression *)sqlExpression;

4
EOAccess/EOExpressionArray.m
View file

@ -34,7 +34,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include <ctype.h>

4
EOAccess/EOJoin.m
View file

@ -31,7 +31,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSString.h>
#import <Foundation/NSUtilities.h>

4
EOAccess/EOModel.m
View file

@ -32,7 +32,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSBundle.h>
#import <Foundation/NSValue.h>

6
EOAccess/EOModelGroup.m
View file

@ -31,10 +31,14 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSBundle.h>
#import <Foundation/NSNotification.h>
#import <Foundation/NSEnumerator.h>
#import <Foundation/NSPathUtilities.h>
#import <Foundation/NSDebug.h>
#import <EOAccess/EOModelGroup.h>

4
EOAccess/EORelationship.m
View file

@ -34,7 +34,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSArray.h>
#import <Foundation/NSUtilities.h>

4
EOAccess/EOSQLExpression.m
View file

@ -34,7 +34,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include <string.h>

4
EOAccess/EOSQLQualifier.m
View file

@ -31,7 +31,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include <stdio.h>
#include <string.h>

4
EOAccess/EOStoredProcedure.m
View file

@ -31,7 +31,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSException.h>
#import <Foundation/NSDebug.h>

18
EOAccess/EOUtilities.h
View file

@ -29,6 +29,7 @@
#import <EOControl/EOEditingContext.h>
#import <EOControl/EOFetchSpecification.h>
@class NSArray;
@ -111,4 +112,21 @@ connectionDictionaryOverrides: (NSDictionary*)overrides;
@end
@interface EOFetchSpecification (EOAccess)
+ (EOFetchSpecification *)fetchSpecificationNamed: (NSString *)name
entityNamed: (NSString *)entityName;
@end
@interface EOObjectStoreCoordinator (EOModelGroup)
- (id) modelGroup;
- (void) setModelGroup: (EOModelGroup*)modelGroup;
@end
#endif

82
EOAccess/EOUtilities.m
View file

@ -31,7 +31,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/Foundation.h>
@ -42,7 +44,6 @@ static char rcsId[] = "$Id$";
#import <EOControl/EODebug.h>
#import <EOAccess/EOAccess.h>
#import <EOAccess/EOEntityPriv.h>
static NSString *EOMoreThanOneException = @"EOMoreThanOneException";
@ -1023,7 +1024,7 @@ connectionDictionaryOverrides: (NSDictionary *)overrides
EOFLOGObjectFnStartOrCond(@"EOEditingContext");
classDesc = [object classDescription];
classDesc = (EOClassDescription *)[object classDescription];
if ([classDesc isKindOfClass: [EOEntityClassDescription class]] == NO)
[NSException raise: NSInvalidArgumentException
@ -1039,3 +1040,78 @@ connectionDictionaryOverrides: (NSDictionary *)overrides
}
@end
@implementation EOFetchSpecification (EOAccess)
+ (EOFetchSpecification *)fetchSpecificationNamed: (NSString *)name
entityNamed: (NSString *)entityName
{
EOFetchSpecification *newEOFetchSpecification = nil;
EOModelGroup *anModelGroup;
EOFLOGClassFnStartOrCond(@"EOFetchSpecification");
anModelGroup = [EOModelGroup defaultGroup];
if (anModelGroup)
newEOFetchSpecification = [anModelGroup fetchSpecificationNamed: name
entityNamed: entityName];
EOFLOGObjectFnStopOrCond(@"EOFetchSpecification");
return newEOFetchSpecification;
}
@end
@implementation EOObjectStoreCoordinator (EOModelGroup)
- (id) modelGroup
{
//Seems OK
EOModelGroup *modelGroup;
NSDictionary *userInfo;
EOFLOGObjectFnStart();
userInfo = [self userInfo];
modelGroup = [userInfo objectForKey: @"EOModelGroup"];
if (!modelGroup)
{
modelGroup = [EOModelGroup defaultGroup];
[self setModelGroup: modelGroup];
}
EOFLOGObjectFnStop();
return modelGroup;
}
- (void) setModelGroup: (EOModelGroup*)modelGroup
{
NSMutableDictionary *userInfo;
EOFLOGObjectFnStart();
userInfo = [self userInfo];
if (userInfo)
[userInfo setObject: modelGroup
forKey: @"EOModelGroup"];
else
{
userInfo = [NSMutableDictionary dictionary];
[userInfo setObject: modelGroup
forKey: @"EOModelGroup"];
[self setUserInfo: userInfo];
}
EOFLOGObjectFnStop();
}
@end

4
EOAdaptors/Postgres95/Postgres95Adaptor.m
View file

@ -37,7 +37,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSArray.h>
#import <Foundation/NSDictionary.h>

4
EOAdaptors/Postgres95/Postgres95Channel.m
View file

@ -37,7 +37,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSArray.h>
#import <Foundation/NSDictionary.h>

4
EOAdaptors/Postgres95/Postgres95Context.m
View file

@ -37,7 +37,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSString.h>
#import <Foundation/NSArray.h>

4
EOAdaptors/Postgres95/Postgres95SQLExpression.m
View file

@ -32,7 +32,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/Foundation.h>
#import <Foundation/NSUtilities.h>

4
EOAdaptors/Postgres95/Postgres95Values.m
View file

@ -31,7 +31,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSData.h>
#import <Foundation/NSDate.h>

4
EOControl/EOAndQualifier.m
View file

@ -34,7 +34,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSDictionary.h>
#import <Foundation/NSSet.h>

4
EOControl/EOCheapArray.m
View file

@ -31,7 +31,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/Foundation.h>

4
EOControl/EOClassDescription.m
View file

@ -34,7 +34,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/Foundation.h>

6
EOControl/EODataSource.m
View file

@ -31,13 +31,17 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <EOControl/EODataSource.h>
#import <EOControl/EOClassDescription.h>
#import <EOControl/EOEditingContext.h>
#import <EOControl/EODebug.h>
#include <string.h>
@implementation EODataSource

4
EOControl/EODebug.m
View file

@ -29,7 +29,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSThread.h>
#import <Foundation/NSAutoreleasePool.h>

4
EOControl/EODetailDataSource.m
View file

@ -31,7 +31,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSObject.h>
#import <Foundation/NSString.h>

8
EOControl/EOEditingContext.m
View file

@ -30,7 +30,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
//TODO EOMultiReaderLocks
#import <Foundation/Foundation.h>
@ -1965,7 +1967,7 @@ validateTable:(NSHashTable*)table
{
if(_messageHandler
&& [_messageHandler
respondsTo: @selector(editingContext:presentErrorMessage:)] == YES)
respondsToSelector: @selector(editingContext:presentErrorMessage:)] == YES)
[_messageHandler editingContext: self
presentErrorMessage: [localException reason]];
@ -2884,7 +2886,7 @@ shouldContinueFetchingWithCurrentObjectCount: (unsigned)count
{
if(_messageHandler
&& [_messageHandler
respondsTo: @selector(editingContext:presentErrorMessage:)] == YES)
respondsToSelector: @selector(editingContext:presentErrorMessage:)] == YES)
[_messageHandler editingContext: self
presentErrorMessage: [localException reason]];
}

18
EOControl/EOFault.m
View file

@ -34,7 +34,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include <objc/Object.h>
#include <objc/Protocol.h>
@ -55,10 +57,9 @@ static char rcsId[] = "$Id$";
#import <EOControl/EOFault.h>
#import <EOControl/EOKeyGlobalID.h>
#import <EOControl/EOEditingContext.h>
#import <EOControl/EODebug.h>
#import <EOAccess/EODatabaseContext.h>
typedef struct {
Class isa;
@ -407,17 +408,6 @@ typedef struct {
}
}
- (EODatabaseContext *)databaseContext
{
if ([_handler respondsToSelector: @selector(databaseContext)])
return [(id)_handler databaseContext];
else
{
[_handler completeInitializationOfObject: self];
return [self databaseContext];
}
}
- (EOEditingContext *)editingContext
{
if ([_handler respondsToSelector: @selector(editingContext)])

4
EOControl/EOFaultHandler.m
View file

@ -31,7 +31,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSObject.h>
#import <Foundation/NSUtilities.h>

22
EOControl/EOFetchSpecification.m
View file

@ -31,7 +31,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSCoder.h>
#import <Foundation/NSValue.h>
@ -42,8 +44,7 @@ static char rcsId[] = "$Id$";
#import <EOControl/EOObserver.h>
#import <EOControl/EODebug.h>
#import <EOControl/EONSAddOns.h>
#import <EOAccess/EOModelGroup.h>
#import <EOControl/EOQualifier.h>
@implementation EOFetchSpecification
@ -121,20 +122,7 @@ static char rcsId[] = "$Id$";
+ (EOFetchSpecification *)fetchSpecificationNamed: (NSString *)name
entityNamed: (NSString *)entityName
{
EOFetchSpecification *newEOFetchSpecification = nil;
EOModelGroup *anModelGroup;
EOFLOGClassFnStartOrCond(@"EOFetchSpecification");
anModelGroup = [EOModelGroup defaultGroup];
if (anModelGroup)
newEOFetchSpecification = [anModelGroup fetchSpecificationNamed: name
entityNamed: entityName];
EOFLOGObjectFnStopOrCond(@"EOFetchSpecification");
return newEOFetchSpecification;
return nil;
}
+ (EOFetchSpecification *)fetchSpecificationWithEntityName: (NSString *)name

4
EOControl/EOGenericRecord.m
View file

@ -34,7 +34,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSArray.h>
#import <Foundation/NSDictionary.h>

4
EOControl/EOGlobalID.m
View file

@ -31,7 +31,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSCoder.h>
#import <Foundation/NSString.h>

4
EOControl/EOKeyComparisonQualifier.m
View file

@ -31,7 +31,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSDictionary.h>
#import <Foundation/NSSet.h>

4
EOControl/EOKeyGlobalID.m
View file

@ -31,7 +31,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSString.h>
#import <Foundation/NSCoder.h>

4
EOControl/EOKeyValueArchiver.m
View file

@ -31,7 +31,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/Foundation.h>

4
EOControl/EOKeyValueCoding.h
View file

@ -30,13 +30,11 @@
#import <Foundation/NSObject.h>
#import <Foundation/NSArray.h>
#import <Foundation/NSKeyValueCoding.h>
#import <Foundation/NSDictionary.h>
#import <EOControl/EOKeyValueCodingBase.h>
@class NSDictionary;
@interface NSObject (EOKVCPAdditions2)
- (void)takeStoredValue: value
forKeyPath: (NSString *)key;

6
EOControl/EOKeyValueCoding.m
View file

@ -37,7 +37,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSObject.h>
#import <Foundation/NSArray.h>
@ -59,6 +61,8 @@ static char rcsId[] = "$Id$";
#import <EOControl/EODebug.h>
#import <EOControl/EONull.h>
#include <ctype.h>
/*
* EOKeyValueCodingAdditions implementation

6
EOControl/EOKeyValueCodingBase.m
View file

@ -34,7 +34,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSObject.h>
#import <Foundation/NSArray.h>
@ -52,8 +54,6 @@ static char rcsId[] = "$Id$";
#include <objc/objc-api.h>
#include "config.h"
#if !FOUNDATION_HAS_KVC
#import <EOControl/EOControl.h>

4
EOControl/EOKeyValueQualifier.m
View file

@ -34,7 +34,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/Foundation.h>

5
EOControl/EOMutableKnownKeyDictionary.m
View file

@ -31,12 +31,15 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/Foundation.h>
#import <EOControl/EOMutableKnownKeyDictionary.h>
#import <EOControl/EODebug.h>
#import <EOControl/EONull.h>
@implementation EOMKKDInitializer

4
EOControl/EONSAddOns.m
View file

@ -31,7 +31,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/Foundation.h>

4
EOControl/EONotQualifier.m
View file

@ -31,7 +31,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSDictionary.h>
#import <Foundation/NSSet.h>

6
EOControl/EONull.m
View file

@ -34,7 +34,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSNull.h>
#import <Foundation/NSString.h>
@ -43,8 +45,6 @@ static char rcsId[] = "$Id$";
#import <EOControl/EONull.h>
#import <EOControl/EODebug.h>
#include "config.h"
@implementation EONull

4
EOControl/EOObjectStore.m
View file

@ -31,7 +31,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSString.h>

6
EOControl/EOObjectStoreCoordinator.h
View file

@ -72,12 +72,6 @@
@end
@interface EOObjectStoreCoordinator (EOModelGroup)
- (id) modelGroup;
- (void) setModelGroup: (EOModelGroup*)modelGroup;
@end
// Notifications:
extern NSString *EOCooperatingObjectStoreWasAdded;

55
EOControl/EOObjectStoreCoordinator.m
View file

@ -30,7 +30,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/Foundation.h>
@ -38,9 +40,6 @@ static char rcsId[] = "$Id$";
#import <EOControl/EOEditingContext.h>
#import <EOControl/EODebug.h>
#import <EOAccess/EODatabaseContext.h>
#import <EOAccess/EOModelGroup.h>
@implementation EOObjectStoreCoordinator
@ -513,54 +512,6 @@ NSString *EOCooperatingObjectStoreNeeded = @"EOCooperatingObjectStoreNeeded";
@end
@implementation EOObjectStoreCoordinator (EOModelGroup)
- (id) modelGroup
{
//Seems OK
EOModelGroup *modelGroup;
NSDictionary *userInfo;
EOFLOGObjectFnStart();
userInfo = [self userInfo];
modelGroup = [userInfo objectForKey: @"EOModelGroup"];
if (!modelGroup)
{
modelGroup = [EOModelGroup defaultGroup];
[self setModelGroup: modelGroup];
}
EOFLOGObjectFnStop();
return modelGroup;
}
- (void) setModelGroup: (EOModelGroup*)modelGroup
{
NSMutableDictionary *userInfo;
EOFLOGObjectFnStart();
userInfo = [self userInfo];
if (userInfo)
[userInfo setObject: modelGroup
forKey: @"EOModelGroup"];
else
{
userInfo = [NSMutableDictionary dictionary];
[userInfo setObject: modelGroup
forKey: @"EOModelGroup"];
[self setUserInfo: userInfo];
}
EOFLOGObjectFnStop();
}
@end
@implementation EOCooperatingObjectStore

7
EOControl/EOObserver.m
View file

@ -31,11 +31,14 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSObject.h>
#import <Foundation/NSMapTable.h>
#import <Foundation/NSNotification.h>
#import <Foundation/NSEnumerator.h>
#import <Foundation/NSDebug.h>
#import <EOControl/EOClassDescription.h>
@ -44,6 +47,8 @@ static char rcsId[] = "$Id$";
#import <EOControl/EOObserver.h>
#import <EOControl/EODebug.h>
#include <string.h>
@implementation NSObject (EOObserver)

4
EOControl/EOOrQualifier.m
View file

@ -31,7 +31,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSDictionary.h>
#import <Foundation/NSSet.h>

1
EOControl/EOQualifier.h
View file

@ -35,6 +35,7 @@
@class NSArray;
@class NSDictionary;
@class NSString;
@class NSException;
@class EOClassDescription;
@class EOSQLExpression;

4
EOControl/EOQualifier.m
View file

@ -31,7 +31,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#include <stdio.h>
#include <string.h>

4
EOControl/EOSortOrdering.m
View file

@ -31,7 +31,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/NSCoder.h>
#import <Foundation/NSDebug.h>

4
EOControl/EOUndoManager.m
View file

@ -31,7 +31,9 @@
</license>
**/
static char rcsId[] = "$Id$";
#include "config.h"
RCS_ID("$Id$")
#import <Foundation/Foundation.h>

2
EOModeler/EOModelExtensions.m
View file

@ -24,6 +24,8 @@
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#import "config.h"
#import <EOModeler/EOModelExtensions.h>
#import <EOControl/EODebug.h>

4
config.h.in
View file

@ -32,4 +32,8 @@
#define FOUNDATION_HAS_KVC 1
#define RCS_ID(name) \
static const char rcsId[] = name; \
static const char *__rcsId_hack() {__rcsId_hack(); return rcsId;}
#endif /* __config_h__ */