libs-gdl2/EOControl/EOFaultHandler.m
David Ayers f3e520ee9a 2003-03-30 David Ayers <d.ayers@inode.at>
* *.h/m, *.h/m):
	Used #include instead of depricated #import.  Avoid including
	entire library headers.  Use export macro where applicable.

	* EOControl/GNUmakefile: Removed EOKeyValueCodingBase.m/h and
	EOUndoMananger.h.  Added EOArrayDataSource.m/h, EODefines.h
	and EODepricated.h.
	* EOControl/EODefines.h: Updated for GDL2 & gnustep-make.
	* EOControl/EODebug.h: Updated.
	* EOControl/EODepricated.h: Updated for current state of GDL2.
	([NSObject +flushClassKeyBindings]): Added declaration.
	([EOClassDescription +setDelegate:]): Added declaration.
	([EOClassDescription +delegate]): Added declaration.
	(EOUndoManager): Moved declaration of interface here.
	* EOControl/EOKeyValueCoding.m
	([EOClassDescription +flushClassKeyBindings]): Added empty
	implementation.
	([NSObject takeStoredValuesFromDictionary:]): Cache EONull
	instance and use it instead of isKindOfClass:.
	* EOControl/EOEditingContext.m
	([EOEditingContext +initialize]): Tidied.
	([EOEditingContest -deleteObject]): Use NSUndoManager instead of
	EOUndoManager.
	* EOControl/EOQualifier.m
	([NSArray -filteredArrayUsingQualifier:]): Added minor
	optimization tweak.
	* EOControl/EOClassDescription.m: Removed inactive commented
	code.  Added private declerations of EOAccess methods to avoid
	compiler warnings.
	([EOClassDescription +initialize]): Tidied.
	([EOClassDescription -classDescriptionForClass:]): Use
	GSObjCName() instead of objc runtime routines.
	* EOControl/EOFault.m: Exchanged direct usages of ObjC runtime
	routines with NS/GSObjCRuntime abstraction API.
	([EOFault +superclass]): Ditto.
	([EOFault +targetClassForFault:]): Ditto.
	([EOFault -respondsToSelector:]): Ditto.
	([EOFault +initialize]): Cache static class variable.
	([EOFault +isKindOfClass]): Use static class variable.
	([EOFault +handlerForFault:]): Ditto.
	([EOFault +targetClassForFault:]): Ditto.
	([EOFault -dealloc]): Ditto.
	* EOControl/EOGenericRecord.m:
	([EOGenericRecord +initialize]): Tidied.
	* EOControl/EOKeyComparisonQualifier.m: Tidied documentation.
	* EOControl/EOKeyValueQualifier.m: Ditto.
	* EOControl/EONSAddOns.h/m: Added declarations to surpress
	compiler warnings.
	([NSObject -eoCompareOnName:]): Adjusted casts to surpress
	compiler warnings.
	(GSUseStrictWO451Compatibility): Added function.
	(GDL2GlobalLock, GDL2GlobalRecursive): Ditto.
	* EOControl/EONull: Remove implementations for foundation
	libraries without key value coding and fully rely on NSNull.
	Added assertions in all intance methods as instances should never
	be created.
	([EONull +allocWithZone:]) Corrected method name so it will
	actually be used.
	* EOControl/EOSortOrdering.m
	([NSArray sortedArrayUsingKeyOrderArray:]): Tidied.
	([NSMutableArray sortUsingKeyOrderArray:]): Ditto.
	([EONull compareAscending:]): Sync with referencs implementation.
	([EONull compareDescending:]): Ditto.
	([EONull compareCaseInsensitiveAscending:]): Ditto.
	([EONull compareCaseInsensitiveDescending:]): Ditto.

	* EOAccess/EOAdaptor.h: Added comment about API compatibility.
	* EOAccess/EOAdaptor.m ([EOAdaptor -contexts]): Return array of
	adaptor contexts rather tham GC-wrapper objects containing adaptor
	contexts.
	([EOAdaptor -databaseEncoding]): Use GSEncodingName() instead of
	GetEncodingName().
	* EOAccess/EODatabaseContext.m
	([EODatabaseContext -_turnFault:gid:editingContext:isComplete:]):
	Use GSObjCClass() instead of trying to access isa by dereferencing
	from id with incorrect member.
	* EOAccess/EOModel.m ([EOModel -entityNames]): Sort returned array
	to insure comparable output.
	* EOAccess/EOSQLExpression.m
	([EOSQLExpression sqlStringForArrayOfQualifiers:operation:]):
	Added cast to surpress compiler warning.
	* EOAccess/EOUtilities.m
	([EOObjectStoreCoordinator setModelGroup:]): Ditto.
	* EOAccess/EORelationship.h ([EORelationship -docComment]):
	Added declaration.
	* EOAccess/GNUmakefile: Added EODefines.h and EODepricated.h.

	* Tools/*.m: Use RCS_ID macro.
	* Tools/EOAttribute+GSDoc.h:
	([EOAttribute gsdocContentWithTagName:idPtr:]): Corrected Typo.
	* Tools/EOModel+GSDoc.h/m:
	([EOModel gsdocContentSplittedByEntities:idPtr:]): Ditto.
	* Tools/EORelationship+GSDoc.m:
	([EORelationship gsdocContentWithTagName:idPtr:]): Change variable
	type to supress compiler warnings.
	* Tools/eoutil.m (dump): Initialize variables to supress compiler
	warnings.
	* Tools/gsdoc-model.m: Include GSCategories.h to supress compiler
	warnings.
	(main): Added cast to supress compiler warning.  Fixed typo in
	method invocation.

2003-03-25  Stephane Corthesy  <stephane@sente.ch>

	* EOControl/EODefines.h: Added new file for export/win32 support.
	* EOControl/EODepricated.h: Added new file for depricated features.
	* EOControl/EOControl.h: Added EOArrayDataSource.h and EODefines.h.
	* EOControl/EOArrayDataSource.h/m: Added new files.  Some methods
	(<NSCoding> and qualifier bindings) are empty stubs.
	* EOControl/EODebug.h: Use export macro instead of explicit extern for
	function and symbol declarations.
	* EOControl/EOGlobalID.h: Ditto.
	* EOControl/EONull.h: Ditto.
	* EOControl/EOObjectStore.h: Ditto.
	* EOControl/EOOrQualifier.m: Replaced autorelease by AUTORELEASE
	and fixed typo.
	* EOControl/EOQualifier.m
	([NSArray -filteredArrayUsingQualifier:]): Implemented.
	* EOControl/EONSAddOns.m: Use volatile in some exception handlers
	(man longjmp for more info).
	* EOControl/EOSortOrdering.h/m
	([EOSortOrdering -copyWithZone:]): Implemented <NSCopying>.
	([EOSortOrdering -encodeWithKeyValueArchiver:]): Implemented.

	* EOAccess/EODefines.h: Added new file for export/win32 support.
	* EOAccess/EODepricated.h: Added new file for depricated features.
	* EOAccess/EOAccess.h: Added EODefines.h.
	* EOAccess/EOSQLExpression.h/m: Fixed typo for
	EOPrimaryKeyConstraintKey.
	* EOAccess/EOExpressionArray.h/m: Use volatile for variables usein
	in exception handlers. (man longjmp for more info)
	* EOAccess/EODatabase.h: Use export macro instead of explicit
	extern for function and symbol declarations.
	* EOAccess/EOEntity.h: Ditto.
	* EOAccess/EOModel.h: Ditto.
	* EOAccess/EOSchemaGeneration.h: Ditto.
	* EOAccess/EOSQLExpression.h: Ditto.
	* EOAccess/EOUtilities.h: Ditto.
	* Tools/eoutil.m (dump): Implemented use of -postinstall option.
	Corrected bug when getting adaptor's expression class.  Renamed
	symbol EOPrimaryKeyContraintsKey into EOPrimaryKeyConstraintsKey.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@16298 72102866-910b-0410-8b05-ffd578937521
2003-03-31 00:24:15 +00:00

385 lines
6.6 KiB
Objective-C

/**
EOFaultHandler.m <title>EOFaultHandler Class</title>
Copyright (C) 2000 Free Software Foundation, Inc.
Author: Mirko Viviani <mirko.viviani@rccr.cremona.it>
Date: June 2000
$Revision$
$Date$
<abstract></abstract>
This file is part of the GNUstep Database Library.
<license>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
</license>
**/
#include "config.h"
RCS_ID("$Id$")
#ifndef NeXT_Foundation_LIBRARY
#include <Foundation/NSObject.h>
#include <Foundation/NSUtilities.h>
#include <Foundation/NSArray.h>
#include <Foundation/NSDictionary.h>
#include <Foundation/NSString.h>
#include <Foundation/NSObjCRuntime.h>
#include <Foundation/NSDebug.h>
#include <Foundation/NSException.h>
#else
#include <Foundation/Foundation.h>
#endif
#include <gnustep/base/GCObject.h>
#include <EOControl/EOFault.h>
#include <EOControl/EODebug.h>
#ifndef GNU_RUNTIME
#include <objc/objc-class.h>
#endif
#include <objc/Protocol.h>
BOOL __isGCEnabled(Class class_)
{
Class gcObjectClass = [GCObject class];
if ([class_ instancesRespondToSelector: @selector(gcIncrementRefCount)])
return YES;
else
{
Class class;
for (class = class_;
class != Nil;
class = class_get_super_class (class))
{
if (class == gcObjectClass)
return YES;
else if ([class instancesRespondToSelector: @selector(gcIncrementRefCount)])
return YES;
else if ([class instancesRespondToSelector: @selector(gcNextObject)])
return YES;
}
}
return NO;
}
@implementation EOFaultHandler
- (id)init
{
if ((self = [super init]))
{
}
return self;
}
- (void)setTargetClass: (Class)target
extraData: (void *)data
{
_targetClass = target;
_extraData = data;
gcEnabled = __isGCEnabled(_targetClass);
if (gcEnabled)
_extraRefCount++;
}
- (Class)targetClass
{
return _targetClass;
}
- (void *)extraData
{
return _extraData;
}
- (void)incrementExtraRefCount
{
_extraRefCount++;
}
- (BOOL)decrementExtraRefCountWasZero
{
if (!(--_extraRefCount))
return YES;
return NO;
}
- (unsigned)extraRefCount
{
return _extraRefCount;
}
- (NSString *)descriptionForObject: object
{
return [NSString stringWithFormat: @"%@ (EOFault 0x%08x)",
NSStringFromClass(_targetClass), object];
}
- (Class)classForFault: (id)fault
{
return [self targetClass];
}
- (BOOL)isKindOfClass: (Class)aclass
forFault: (id)fault
{
Class class;
for (class = _targetClass; class != Nil; class = class_get_super_class(class))
{
if (class == aclass)
return YES;
}
return NO;
}
- (BOOL)isMemberOfClass: (Class)aclass
forFault: (id)fault
{
return _targetClass == aclass;
}
- (BOOL)conformsToProtocol: (Protocol *)protocol
forFault: (id)fault
{
int i;
struct objc_protocol_list *proto_list;
Class class;
for(class = _targetClass; class != Nil; class = class_get_super_class(class))
{
for (proto_list =
((struct objc_class *)_targetClass)->class_pointer->protocols;
proto_list; proto_list = proto_list->next)
{
for (i = 0; i < proto_list->count; i++)
{
if ([proto_list->list[i] conformsTo: protocol])
return YES;
}
}
}
return NO;
}
- (BOOL)respondsToSelector: (SEL)sel
forFault: (id)fault
{
[self notImplemented: _cmd];
return NO;
// return __objc_responds_to((id)&self, sel);
}
- (NSMethodSignature *)methodSignatureForSelector: (SEL)selector
forFault: (id)fault
{ // TODO
NSMethodSignature *sig;
EOFLOGObjectFnStart();
NSDebugMLLog(@"gsdb", @"_targetClass=%p", _targetClass);
NSDebugMLLog(@"gsdb", @"_targetClass=%@", _targetClass);
NSDebugMLLog(@"gsdb", @"selector=%@", NSStringFromSelector(selector));
//TODO VERIFY
NSAssert(_targetClass, @"No target class");
sig = [_targetClass instanceMethodSignatureForSelector: selector];
NSDebugMLLog(@"gsdb",@"sig=%p", (void*)sig);
EOFLOGObjectFnStop();
return sig;
}
- (void)completeInitializationOfObject: (id)object
{
[self subclassResponsibility: _cmd];
}
- (BOOL)shouldPerformInvocation: (NSInvocation *)invocation
{
return YES;
}
- (void)faultWillFire: (id)object
{
return;
}
// GC
+ allocWithZone: (NSZone *)zone_
{
id newObject = [super allocWithZone: zone_];
((EOFaultHandler *)newObject)->gc.flags.refCount = 0;
return newObject;
}
/*
- retain
{
if (gcEnabled)
{
gc.flags.refCount++;
return self;
}
else
{
return [super retain];
};
}
- (unsigned int)retainCount
{
if (gcEnabled)
{
return gc.flags.refCount;
}
else
{
return [super retainCount];
};
}
*/
- gcSetNextObject: (id)anObject
{
if (gcEnabled)
gc.next = anObject;
return self;
}
- gcSetPreviousObject: (id)anObject
{
if (gcEnabled)
gc.previous = anObject;
return self;
}
- (id)gcNextObject
{
if (gcEnabled)
return gc.next;
return nil;
}
- (id)gcPreviousObject
{
if (gcEnabled)
return gc.previous;
return nil;
}
- (BOOL)gcAlreadyVisited
{
if (gcEnabled)
return gc.flags.visited;
return YES;
}
- (void)gcSetVisited: (BOOL)flag
{
if (gcEnabled)
gc.flags.visited = flag;
}
- (void)gcDecrementRefCountOfContainedObjects
{
EOFLOGObjectFnStart();
if (gcEnabled)
gcCountainedObjectRefCount--;
EOFLOGObjectFnStop();
}
- (BOOL)gcIncrementRefCountOfContainedObjects
{
if (gcEnabled)
{
if (gc.flags.visited)
return NO;
gcCountainedObjectRefCount++;
gc.flags.visited = YES;
return YES;
}
return NO;
}
- (BOOL)isGarbageCollectable
{
return gcEnabled;
}
- (void)gcIncrementRefCount
{
if (gcEnabled);
//gc.flags.refCount++;
// faultReferences++;
}
- (void)gcDecrementRefCount
{
if(gcEnabled);
//gc.flags.refCount--;
// faultReferences--;
}
/*
- (BOOL)afterFault
{
if (gcEnabled)
{
[fault gcIncrementRefCount];
fault->gc.next = gc.next;
fault->gc.previous = gc.previous;
while (gcCountainedObjectRefCount-- > 0)
{
[fault gcIncrementRefCountOfContainedObjects];
}
};
return NO;
}
*/
@end