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/EOAdaptor.m: Include GNUstep-specific headers for

Browse source 
non-GNUstep systems.
        * EOAccess/EOAdaptorChannel.m: Ditto.
        * EOAccess/EOAdaptorContext.m: Ditto.
        * EOAccess/EOAttribute.m: Ditto.
        * EOAccess/EODatabaseChannel.m: Ditto.
        * EOAccess/EODatabaseDataSource.m: Ditto.
        * EOAccess/EOEntity.m: Ditto.
        * EOAccess/EOModel.m: Ditto.
        * EOAccess/EOModelGroup.m: Ditto.
        * EOAccess/EORelationship.m: Ditto.
        * EOAccess/EOSQLQualifier.m: Ditto.
        * EOAccess/EOUtilities.m: Ditto.
        * EOControl/EOAndQualifier.m: Ditto.
        * EOControl/EOClassDescription.m: Ditto.
        * EOControl/EODataSource.m: Ditto.
        * EOControl/EOEditingContext.m: Ditto.
        * EOControl/EOFault.m: Ditto.
        * EOControl/EOFaultHandler.m: Ditto.
        * EOControl/EOFetchSpecification.m: Ditto.
        * EOControl/EOKeyValueArchiver.m: Ditto.
        * EOControl/EOKeyValueQualifier.m: Ditto.
        * EOControl/EOMutableKnownKeyDictionary.m: Ditto.
        * EOControl/EONSAddOns.m: Ditto.
        * EOControl/EOObjectStore.m: Ditto.
        * EOControl/EOObjectStoreCoordinator.m: Ditto.
        * EOControl/EOObserver.m: Ditto.
        * EOControl/EOOrQualifier.m: Ditto.
        * EOControl/EOQualifier.m: Ditto.
        * EOControl/EOUndoManager.m: Ditto.
        * EOModeler/EOModelExtensions.m: Ditto.

        * EOAccess/EOModel.h/m (+/-[EOModel version]) Remove.
        ([EOModel init]): Handle version internally.
        ([EOModel encodeTableOfContentsIntoPropertyList:]): Ditto.
        ([EOModel encodeIntoPropertyList:]): Ditto.
        * EOAccess/EODatabaseContext.m ([EODatabaseContext dealloc]):
        Use NSCountHashTable instead of NSCountMapTable on hash table.
        * EOAccess/EOAttribute.m ([EOAttribute
        newValueForBytes:length:]):
        Added casts to avoid warnings.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@18500 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
ayers 2004-01-29 13:23:22 +00:00
parent e9faeacbfe
commit 1c3803114f
33 changed files with 82 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
ChangeLog
View file

@ -5,6 +5,47 @@
* EOControl/GNUmakefile: Ditto.
* EOModeler/GNUmakefile: Ditto.
* Tools/GNUmakefile: Ditto. Update title.
* EOAccess/EOAdaptor.m: Include GNUstep-specific headers for
non-GNUstep systems.
* EOAccess/EOAdaptorChannel.m: Ditto.
* EOAccess/EOAdaptorContext.m: Ditto.
* EOAccess/EOAttribute.m: Ditto.
* EOAccess/EODatabaseChannel.m: Ditto.
* EOAccess/EODatabaseDataSource.m: Ditto.
* EOAccess/EOEntity.m: Ditto.
* EOAccess/EOModel.m: Ditto.
* EOAccess/EOModelGroup.m: Ditto.
* EOAccess/EORelationship.m: Ditto.
* EOAccess/EOSQLQualifier.m: Ditto.
* EOAccess/EOUtilities.m: Ditto.
* EOControl/EOAndQualifier.m: Ditto.
* EOControl/EOClassDescription.m: Ditto.
* EOControl/EODataSource.m: Ditto.
* EOControl/EOEditingContext.m: Ditto.
* EOControl/EOFault.m: Ditto.
* EOControl/EOFaultHandler.m: Ditto.
* EOControl/EOFetchSpecification.m: Ditto.
* EOControl/EOKeyValueArchiver.m: Ditto.
* EOControl/EOKeyValueQualifier.m: Ditto.
* EOControl/EOMutableKnownKeyDictionary.m: Ditto.
* EOControl/EONSAddOns.m: Ditto.
* EOControl/EOObjectStore.m: Ditto.
* EOControl/EOObjectStoreCoordinator.m: Ditto.
* EOControl/EOObserver.m: Ditto.
* EOControl/EOOrQualifier.m: Ditto.
* EOControl/EOQualifier.m: Ditto.
* EOControl/EOUndoManager.m: Ditto.
* EOModeler/EOModelExtensions.m: Ditto.
* EOAccess/EOModel.h/m (+/-[EOModel version]) Remove.
([EOModel init]): Handle version internally.
([EOModel encodeTableOfContentsIntoPropertyList:]): Ditto.
([EOModel encodeIntoPropertyList:]): Ditto.
* EOAccess/EODatabaseContext.m ([EODatabaseContext dealloc]):
Use NSCountHashTable instead of NSCountMapTable on hash table.
* EOAccess/EOAttribute.m ([EOAttribute newValueForBytes:length:]):
Added casts to avoid warnings.
2003-11-28 Manuel Guesdon <mguesdon@orange-concept.com>

1
EOAccess/EOAdaptor.m
View file

@ -65,6 +65,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <GNUstepBase/Unicode.h>

1
EOAccess/EOAdaptorChannel.m
View file

@ -50,6 +50,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOControl/EOMutableKnownKeyDictionary.h>

1
EOAccess/EOAdaptorContext.m
View file

@ -48,6 +48,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOControl/EODebug.h>

9
EOAccess/EOAttribute.m
View file

@ -59,6 +59,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOControl/EONull.h>
@ -1040,8 +1041,8 @@ return nexexp
value = [[NSData alloc] initWithBytes:bytes length: length]; //For efficiency reasons, the returned value is NOT autoreleased !
if(_valueFactoryMethod != NULL)
value = [valueClass performSelector: _valueFactoryMethod
withObject: [value autorelease]];
value = [(id)valueClass performSelector: _valueFactoryMethod
withObject: [value autorelease]];
break;
case EOFactoryMethodArgumentIsBytes:
@ -1097,8 +1098,8 @@ return nexexp
length: length]
encoding: encoding];//For efficiency reasons, the returned value is NOT autoreleased !
value = [valueClass performSelector: _valueFactoryMethod
withObject: [value autorelease]];
value = [(id)valueClass performSelector: _valueFactoryMethod
withObject: [value autorelease]];
break;
case EOFactoryMethodArgumentIsBytes:

1
EOAccess/EODatabaseChannel.m
View file

@ -53,6 +53,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOControl/EOEditingContext.h>

3
EOAccess/EODatabaseContext.m
View file

@ -57,6 +57,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <GNUstepBase/GSObjCRuntime.h>
@ -312,7 +313,7 @@ static Class _contextClass = Nil;
if (_nonPrimaryKeyGenerators)
{
NSDebugMLog(@"MEMORY: nonPrimaryKeyGnerators count=%u",
NSCountMapTable(_nonPrimaryKeyGenerators));
NSCountHashTable(_nonPrimaryKeyGenerators));
NSFreeHashTable(_nonPrimaryKeyGenerators);
_nonPrimaryKeyGenerators = NULL;

1
EOAccess/EODatabaseDataSource.m
View file

@ -54,6 +54,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOControl/EOEditingContext.h>

1
EOAccess/EOEntity.m
View file

@ -62,6 +62,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOControl/EOKeyValueCoding.h>

3
EOAccess/EOModel.h
View file

@ -86,9 +86,6 @@
- (NSString *)adaptorName;
- (NSString *)adaptorClassName;
- (float)version;
+ (float)version;
/** Using entities **/
- (EOEntity *)entityNamed: (NSString*)name;
- (NSArray *)entities;

19
EOAccess/EOModel.m
View file

@ -53,6 +53,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <GNUstepBase/GSObjCRuntime.h>
@ -74,6 +75,7 @@ RCS_ID("$Id$")
#include <EOAccess/EOAdaptor.h>
#include <EOAccess/EOAttribute.h>
#define DEFAULT_MODEL_VERSION 2
NSString *EOEntityLoadedNotification = @"EOEntityLoadedNotification";
@ -201,7 +203,7 @@ NSString *EOEntityLoadedNotification = @"EOEntityLoadedNotification";
if ((self = [super init]))
{
// Turbocat
_version = 2;
_version = DEFAULT_MODEL_VERSION;
_flags.createsMutableObjects = YES;
_entitiesByName = [GCMutableDictionary new];
@ -319,11 +321,6 @@ NSString *EOEntityLoadedNotification = @"EOEntityLoadedNotification";
return _adaptorClassName;
}
- (float) version
{
return _version;
}
- (EOEntity*) entityNamed: (NSString *)name
{
EOEntity *entity = nil;
@ -486,11 +483,6 @@ NSString *EOEntityLoadedNotification = @"EOEntityLoadedNotification";
return _group;
}
+ (float) version
{
return 2;
}
- (EOAttribute *)prototypeAttributeNamed: (NSString *)attributeName
{
NSString *entityName;
@ -759,7 +751,7 @@ NSString *EOEntityLoadedNotification = @"EOEntityLoadedNotification";
NSMutableArray *entitiesArray;
[propertyList setObject:
[[NSNumber numberWithFloat: [isa version]] stringValue]
[[NSNumber numberWithFloat: DEFAULT_MODEL_VERSION] stringValue]
forKey: @"EOModelVersion"];
if (_adaptorName)
@ -947,7 +939,8 @@ NSString *EOEntityLoadedNotification = @"EOEntityLoadedNotification";
{
int i, count;
[propertyList setObject: [[NSNumber numberWithFloat: [isa version]]
[propertyList setObject:
[[NSNumber numberWithFloat: DEFAULT_MODEL_VERSION]
stringValue]
forKey: @"EOModelVersion"];

1
EOAccess/EOModelGroup.m
View file

@ -47,6 +47,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOAccess/EOModelGroup.h>

1
EOAccess/EORelationship.m
View file

@ -49,6 +49,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOControl/EOObserver.h>

1
EOAccess/EOSQLQualifier.m
View file

@ -50,6 +50,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOAccess/EOSQLQualifier.h>

1
EOAccess/EOUtilities.m
View file

@ -49,6 +49,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOControl/EOKeyGlobalID.h>

1
EOControl/EOAndQualifier.m
View file

@ -50,6 +50,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSObjCRuntime.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOControl/EOQualifier.h>

1
EOControl/EOClassDescription.m
View file

@ -56,6 +56,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOControl/EOClassDescription.h>

1
EOControl/EODataSource.m
View file

@ -38,6 +38,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOControl/EODataSource.h>

1
EOControl/EOEditingContext.m
View file

@ -39,6 +39,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOControl/EOEditingContext.h>

1
EOControl/EOFault.m
View file

@ -57,6 +57,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSObjCRuntime.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOControl/EOFault.h>

1
EOControl/EOFaultHandler.m
View file

@ -50,6 +50,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <GNUstepBase/GCObject.h>

1
EOControl/EOFetchSpecification.m
View file

@ -46,6 +46,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOControl/EOFetchSpecification.h>

1
EOControl/EOKeyValueArchiver.m
View file

@ -47,6 +47,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOControl/EOKeyValueArchiver.h>

1
EOControl/EOKeyValueQualifier.m
View file

@ -49,6 +49,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOControl/EOQualifier.h>

1
EOControl/EOMutableKnownKeyDictionary.m
View file

@ -49,6 +49,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOControl/EOMutableKnownKeyDictionary.h>

1
EOControl/EONSAddOns.m
View file

@ -52,6 +52,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSObjCRuntime.h>
#endif
#include <EOControl/EONSAddOns.h>

1
EOControl/EOObjectStore.m
View file

@ -43,6 +43,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOControl/EOObjectStore.h>

1
EOControl/EOObjectStoreCoordinator.m
View file

@ -48,6 +48,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOControl/EOObjectStoreCoordinator.h>

1
EOControl/EOObserver.m
View file

@ -48,6 +48,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOControl/EOClassDescription.h>

1
EOControl/EOOrQualifier.m
View file

@ -48,6 +48,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSObjCRuntime.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOControl/EOQualifier.h>

1
EOControl/EOQualifier.m
View file

@ -53,6 +53,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOControl/EOQualifier.h>

1
EOControl/EOUndoManager.m
View file

@ -37,6 +37,7 @@ RCS_ID("$Id$")
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOControl/EODeprecated.h>

1
EOModeler/EOModelExtensions.m
View file

@ -28,6 +28,7 @@
#ifndef GNUSTEP
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#endif
#include <EOModeler/EOModelExtensions.h>