gnustep/libs-gdl2
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gdl2.git synced 2025-02-21 10:30:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* EOControl/GNUmakefile: Simplify documentation declarations.

Browse source 
* EOAccess/GNUmakefile: Ditto.
	* EOInterface/GNUmakefile: Ditto.
	* Tools/GNUmakefile: Ditto.

	* common.make (ADDITIONAL_LIB_DIRS): Move handling from here...
	* variable-processing.make: ... to new file.
	* EOControl/GNUmakefile: Use variable-processing.make.
	Include common.make early.
	* EOAccess/GNUmakefile: Ditto.
	* EOInterface/GNUmakefile: Ditto.
	* Tools/GNUmakefile: Ditto. 
	* DBModeler/GNUmakefile: Ditto.
	* EOModeler/GNUmakefile: Ditto.
	* GDL2Palette/GNUmakefile: Ditto.
	
	* EOControl/EOFetchSpecification.h/m: Cleanup for documentation
	generation.
	* EOControl/EOGenericRecord.m: Ditto.
	* EOControl/EOClassDescription.h/m: Ditto.	
	* EOControl/EONSAddOns.m: Ditto.
	* EOControl/EOObjectStore.h: Ditto.
	* EOControl/EOEditingContext.h: Ditto.
	* EOControl/EODataSource.m: Ditto.
	* EOControl/EOKeyValueArchiver.h/m: Ditto.
	* EOControl/EOFault.h/m: Ditto.
	* EOControl/EOObserver.h: Ditto.
	* EOControl/EOEventCenter.m: Ditto.
	* EOControl/EOMultiReaderLock.m: Ditto.
	* EOControl/EOKeyGlobalID.h/m: Ditto.
	* EOControl/EOObserver.m: Ditto.
	* EOControl/EOEvent.m: Ditto.
	* EOControl/EOObjectStoreCoordinator.h: Ditto.
	* EOControl/EODeprecated.h: Ditto.
	* EOControl/EOUndoManager.m: Ditto.
	* EOControl/EOKeyValueCoding.h/m: Ditto.
	* EOControl/EOQualifier.h: Ditto.
	
	* EOControl/EOClassDescription.h/m (editingContext): Remove
	duplicate declartion and definition (see EOEditingContext.h/m)
	* EOControl/EOFetchSpecification.h (EOPrefetchingRelationshipHintKey)
	(EOFetchLimitHintKey, EOPromptsAfterFetchLimitHintKey): Remove
	deprecated declarations.
	
	* EOAccess/EOAttribute.m: Cleanup for documentation.
	* EOAccess/EOAttribute.m (newValueForBytes:length:encoding:):
	Avoid creating intermediate NSData object.

	* EOControl/EOControl.gsdoc: Added Documentation.

	* EOControl/EOUndoManager.h: Remove content of deprecated header
	and add warning.
	
	* common.make (GDL2_AGSDOC_FLAGS): Add global GDL2 documenation
	flags.
	* config.h.in (RCSID): Avoid reserved names by relying
	in static declarations and avoid recursive call.

	* EOAdaptors/PostgreSQLAdaptor/PostgreSQLAdaptor.m
	(assignExternalInfoForAttribute:) Move implementation to...
	(assignExternalTypeForAttribute:) ...here.

	* Version: Update variable names.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@24297 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Ayers 2006-12-30 17:41:02 +00:00
parent 460fda5fa8
commit 4e1e4eea27
45 changed files with 404 additions and 329 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
ChangeLog
View file

@ -1,3 +1,69 @@
2006-12-30 David Ayers <ayers@fsfe.org>
* EOControl/GNUmakefile: Simplify documentation declarations.
* EOAccess/GNUmakefile: Ditto.
* EOInterface/GNUmakefile: Ditto.
* Tools/GNUmakefile: Ditto.
* common.make (ADDITIONAL_LIB_DIRS): Move handling from here...
* variable-processing.make: ... to new file.
* EOControl/GNUmakefile: Use variable-processing.make.
Include common.make early.
* EOAccess/GNUmakefile: Ditto.
* EOInterface/GNUmakefile: Ditto.
* Tools/GNUmakefile: Ditto.
* DBModeler/GNUmakefile: Ditto.
* EOModeler/GNUmakefile: Ditto.
* GDL2Palette/GNUmakefile: Ditto.
* EOControl/EOFetchSpecification.h/m: Cleanup for documentation
generation.
* EOControl/EOGenericRecord.m: Ditto.
* EOControl/EOClassDescription.h/m: Ditto.
* EOControl/EONSAddOns.m: Ditto.
* EOControl/EOObjectStore.h: Ditto.
* EOControl/EOEditingContext.h: Ditto.
* EOControl/EODataSource.m: Ditto.
* EOControl/EOKeyValueArchiver.h/m: Ditto.
* EOControl/EOFault.h/m: Ditto.
* EOControl/EOObserver.h: Ditto.
* EOControl/EOEventCenter.m: Ditto.
* EOControl/EOMultiReaderLock.m: Ditto.
* EOControl/EOKeyGlobalID.h/m: Ditto.
* EOControl/EOObserver.m: Ditto.
* EOControl/EOEvent.m: Ditto.
* EOControl/EOObjectStoreCoordinator.h: Ditto.
* EOControl/EODeprecated.h: Ditto.
* EOControl/EOUndoManager.m: Ditto.
* EOControl/EOKeyValueCoding.h/m: Ditto.
* EOControl/EOQualifier.h: Ditto.
* EOControl/EOClassDescription.h/m (editingContext): Remove
duplicate declartion and definition (see EOEditingContext.h/m)
* EOControl/EOFetchSpecification.h (EOPrefetchingRelationshipHintKey)
(EOFetchLimitHintKey, EOPromptsAfterFetchLimitHintKey): Remove
deprecated declarations.
* EOAccess/EOAttribute.m: Cleanup for documentation.
* EOAccess/EOAttribute.m (newValueForBytes:length:encoding:):
Avoid creating intermediate NSData object.
* EOControl/EOControl.gsdoc: Added Documentation.
* EOControl/EOUndoManager.h: Remove content of deprecated header
and add warning.
* common.make (GDL2_AGSDOC_FLAGS): Add global GDL2 documenation
flags.
* config.h.in (RCSID): Avoid reserved names by relying
in static declarations and avoid recursive call.
* EOAdaptors/PostgreSQLAdaptor/PostgreSQLAdaptor.m
(assignExternalInfoForAttribute:) Move implementation to...
(assignExternalTypeForAttribute:) ...here.
* Version: Update variable names.
2006-12-28 Matt Rice <ratmice@gmail.com> 2006-12-28 Matt Rice <ratmice@gmail.com>
* EOAdaptors/PostgreSQL/LoginPanel/GNUmakefile: Fix path to * EOAdaptors/PostgreSQL/LoginPanel/GNUmakefile: Fix path to

3
DBModeler/GNUmakefile
View file

@ -24,6 +24,7 @@
# #
include $(GNUSTEP_MAKEFILES)/common.make include $(GNUSTEP_MAKEFILES)/common.make
include ../common.make
APP_NAME = DBModeler APP_NAME = DBModeler
DBModeler_SUBPROJECTS=Inspectors DBModeler_SUBPROJECTS=Inspectors
@ -72,5 +73,5 @@ $(APP_NAME)_OBJC_FILES = \
EntityView.m \ EntityView.m \
DiagramEditor.m DiagramEditor.m
include ../common.make include ../variable-processing.make
include $(GNUSTEP_MAKEFILES)/application.make include $(GNUSTEP_MAKEFILES)/application.make

156
EOAccess/EOAttribute.m
View file

@ -614,13 +614,13 @@ RCS_ID("$Id$")
* <p>Returns the name of the class values of this attribute * <p>Returns the name of the class values of this attribute
* are represented by. The standard classes are NSNumber, * are represented by. The standard classes are NSNumber,
* NSString, NSData and NSDate for the corresponding * NSString, NSData and NSDate for the corresponding
* [adaptorValueType]. A model can define more specific * [-adaptorValueType]. A model can define more specific
* classes like NSDecimalNumber, NSCalendarDate and NSImage * classes like NSDecimalNumber, NSCalendarDate and NSImage
* or custom classes which implement a factory method * or custom classes which implement a factory method
* specified by [valueFactoryMethodName] to create instances * specified by [-valueFactoryMethodName] to create instances
* with the data supplied by the data source.</p> * with the data supplied by the data source.</p>
* <p>If the valueClassName has not been set explicitly and the * <p>If the valueClassName has not been set explicitly and the
* reciever [isFlattened], the valueClassName of the flattened * reciever [-isFlattened], the valueClassName of the flattened
* attribute is returned.</p> * attribute is returned.</p>
* <p>Otherwise, if the reciever has a prototype then the * <p>Otherwise, if the reciever has a prototype then the
* valueClassName of the prototype is returned.</p> * valueClassName of the prototype is returned.</p>
@ -642,7 +642,7 @@ RCS_ID("$Id$")
* <p>Returns the adaptor specific name of externalType. This is * <p>Returns the adaptor specific name of externalType. This is
* the name use during SQL generation.</p> * the name use during SQL generation.</p>
* <p>If the externalType has not been set explicitly and the * <p>If the externalType has not been set explicitly and the
* reciever [isFlattened], the valueClassName of the flattened * reciever [-isFlattened], the valueClassName of the flattened
* attribute is returned.</p> * attribute is returned.</p>
* <p>Otherwise, if the reciever has a prototype then the * <p>Otherwise, if the reciever has a prototype then the
* externalType of the prototype is returned.</p> * externalType of the prototype is returned.</p>
@ -661,23 +661,23 @@ RCS_ID("$Id$")
/** /**
* <p>Returns a one character string identifiying the underlying * <p>Returns a one character string identifiying the underlying
* C type of an NSNumber [valueTypeName]. The legal values in GDL2 are:</p> * C type of an NSNumber [-valueType]. The legal values in GDL2 are:</p>
* <ul> * <list>
* <li>@"c": char</li> * <item>@"c": char</item>
* <li>@"C": unsigned char</li> * <item>@"C": unsigned char</item>
* <li>@"s": short</li> * <item>@"s": short</item>
* <li>@"S": unsigned short</li> * <item>@"S": unsigned short</item>
* <li>@"i": int</li> * <item>@"i": int</item>
* <li>@"I": unsigned int</li> * <item>@"I": unsigned int</item>
* <li>@"l": long</li> * <item>@"l": long</item>
* <li>@"L": unsigned long</li> * <item>@"L": unsigned long</item>
* <li>@"u": long long</li> * <item>@"u": long long</item>
* <li>@"U": unsigned long long</li> * <item>@"U": unsigned long long</item>
* <li>@"f": float</li> * <item>@"f": float</item>
* <li>@"d": double</li> * <item>@"d": double</item>
* </ul> * </list>
* <p>If the valueType has not been set explicitly and the * <p>If the valueType has not been set explicitly and the
* reciever [isFlattened], the valueClassName of the flattened * reciever [-isFlattened], the valueClassName of the flattened
* attribute is returned.</p> * attribute is returned.</p>
* <p>Otherwise, if the reciever has a prototype then the * <p>Otherwise, if the reciever has a prototype then the
* valueType of the prototype is returned.</p> * valueType of the prototype is returned.</p>
@ -1212,13 +1212,10 @@ return nexexp
{ {
case EOFactoryMethodArgumentIsNSString: case EOFactoryMethodArgumentIsNSString:
{ {
NSData *data = nil;
NSString *string = nil; NSString *string = nil;
data = AUTORELEASE([(GDL2_alloc(NSData)) initWithBytes: bytes string = [(GDL2_alloc(NSString)) initWithBytes: bytes
length: length]); length: length
string = [(GDL2_alloc(NSString)) initWithData: data
encoding: encoding]; encoding: encoding];
// If we have a value factiry method, call it to get the final value // If we have a value factiry method, call it to get the final value
@ -1291,12 +1288,9 @@ return nexexp
if(!value) if(!value)
{ {
NSData *data;
data = AUTORELEASE([(GDL2_alloc(NSData)) initWithBytes: bytes
length: length]);
//For efficiency reasons, the returned value is NOT autoreleased ! //For efficiency reasons, the returned value is NOT autoreleased !
value = [(GDL2_alloc(NSString)) initWithData: data value = [(GDL2_alloc(NSString)) initWithBytes: bytes
length: length
encoding: encoding]; encoding: encoding];
} }
@ -1339,30 +1333,31 @@ return nexexp
return date; return date;
} }
/** Returns the name of the method to use for creating a custom class /**
value for this attribute. * <p>Returns the name of the method to use for creating a custom class
* value for this attribute.</p>
See Also: - valueFactoryMethod, -newValueForBytes:length: * See Also: [-valueFactoryMethod], [-newValueForBytes:length:]
**/ */
- (NSString *)valueFactoryMethodName - (NSString *)valueFactoryMethodName
{ {
return _valueFactoryMethodName; return _valueFactoryMethodName;
} }
/** Returns the selector of the method to use for creating a custom class /**
value for this attribute. * <p>Returns the selector of the method to use for creating a custom class
Default implementation returns selector for name returned by * value for this attribute.</p>
-valueFactoryMethodName or NULL if no selector is found. * <p>Default implementation returns selector for name returned by
* [-valueFactoryMethodName] or NULL if no selector is found.</p>
See Also: - valueFactoryMethodName, -newValueForBytes:length: *
**/ * See Also: [-valueFactoryMethodName], [-newValueForBytes:length:]
*/
- (SEL)valueFactoryMethod - (SEL)valueFactoryMethod
{ {
return _valueFactoryMethod; return _valueFactoryMethod;
} }
/** /**
* Depending on -adaptorValueType this method checks whether the value * Depending on [-adaptorValueType] this method checks whether the value
* is a NSNumber, NSString, NSData or NSDate instance respectively. * is a NSNumber, NSString, NSData or NSDate instance respectively.
* If not, it attempts to retrieve the -adaptorValueConversionMethod * If not, it attempts to retrieve the -adaptorValueConversionMethod
* which should be used to convert the value accordingly. If none * which should be used to convert the value accordingly. If none
@ -1419,7 +1414,8 @@ See Also: - valueFactoryMethodName, -newValueForBytes:length:
} }
else else
{ {
/* This exception might not be conformant, but seems helpful. */ /* This exception might not be conformant,
but seems helpful. */
[NSException raise: NSInvalidArgumentException [NSException raise: NSInvalidArgumentException
format: @"Value of class: %@ needs conversion " format: @"Value of class: %@ needs conversion "
@"yet no conversion method specified. " @"yet no conversion method specified. "
@ -1437,38 +1433,49 @@ See Also: - valueFactoryMethodName, -newValueForBytes:length:
return value; return value;
} }
/** Returns method name to use to convert value of a class /**
different than attribute adaptor value type. * <p>Returns method name to use to convert value of a class
* different than attribute adaptor value type.</p>
See also: -adaptorValueByConvertingAttributeValue, -adaptorValueConversionMethod *
**/ * See also: [-adaptorValueByConvertingAttributeValue:],
* [-adaptorValueConversionMethod]
*/
- (NSString *)adaptorValueConversionMethodName - (NSString *)adaptorValueConversionMethodName
{ {
return _adaptorValueConversionMethodName; return _adaptorValueConversionMethodName;
} }
/** Returns selector of the method to use to convert value of a class /**
different than attribute adaptor value type. * <p>Returns selector of the method to use to convert value of a class
Default implementation returns selector of method returned by * different than attribute adaptor value type.</p>
adaptorValueConversionMethodName or NULL if there's not selector for the method * <p>The default implementation returns the selector corresponding to
* [-adaptorValueConversionMethodName] or NULL if there's not selector
See also: -adaptorValueByConvertingAttributeValue, -adaptorValueConversionMethodName * for the method.</p>
**/ *
* See also: [-adaptorValueByConvertingAttributeValue:],
* [-adaptorValueConversionMethodName]
*/
- (SEL)adaptorValueConversionMethod - (SEL)adaptorValueConversionMethod
{ {
return _adaptorValueConversionMethod; return _adaptorValueConversionMethod;
} }
/** Returns an EOAdaptorValueType describing the adaptor /**
(i.e. database) type of data for this attribute. * <p>Returns an EOAdaptorValueType describing the adaptor
* (i.e. database) type of data for this attribute.</p>
Returned value can be: *
EOAdaptorBytesType Raw bytes (default type) * <p>Returned value can be:</p>
EOAdaptorNumberType Number value (attribute valueClass is kind of NSNumber) * <list>
EOAdaptorCharactersType String value (attribute valueClass is kind of NSString) * <item>EOAdaptorBytesType
EOAdaptorDateType Date value (attribute valueClass is kind of NSDate) * Raw bytes (default type)</item>
* <item>EOAdaptorNumberType
**/ * Number value (attribute valueClass is kind of NSNumber) </item>
* <item>EOAdaptorCharactersType
* String value (attribute valueClass is kind of NSString)</item>
* <item>EOAdaptorDateType
* Date value (attribute valueClass is kind of NSDate)</item>
* </list>
*/
- (EOAdaptorValueType)adaptorValueType - (EOAdaptorValueType)adaptorValueType
{ {
if (!_flags.isAttributeValueInitialized) if (!_flags.isAttributeValueInitialized)
@ -1543,19 +1550,20 @@ See also: -setFactoryMethodArgumentType:
_valueFactoryMethod = NSSelectorFromString(_valueFactoryMethodName); _valueFactoryMethod = NSSelectorFromString(_valueFactoryMethodName);
} }
/** Set method name to use to convert value of a class /**
different than attribute adaptor value type. * <p>Set method name to use to convert value of a class
* different than attribute adaptor value type.</p>
See also: -adaptorValueByConvertingAttributeValue, -adaptorValueConversionMethod, *
-adaptorValueConversionMethodName * See also: [-adaptorValueByConvertingAttributeValue:],
**/ * [-adaptorValueConversionMethod], [-adaptorValueConversionMethodName]
*/
- (void)setAdaptorValueConversionMethodName: (NSString *)conversionMethodName - (void)setAdaptorValueConversionMethodName: (NSString *)conversionMethodName
{ {
[self willChange]; [self willChange];
ASSIGN(_adaptorValueConversionMethodName, conversionMethodName); ASSIGN(_adaptorValueConversionMethodName, conversionMethodName);
_adaptorValueConversionMethod = NSSelectorFromString(_adaptorValueConversionMethodName); _adaptorValueConversionMethod
= NSSelectorFromString(_adaptorValueConversionMethodName);
} }
/** Set the type of argument needed by the factoryMethod. /** Set the type of argument needed by the factoryMethod.

24
EOAccess/GNUmakefile
View file

@ -27,6 +27,7 @@
include $(GNUSTEP_MAKEFILES)/common.make include $(GNUSTEP_MAKEFILES)/common.make
include ../Version include ../Version
include ../common.make
# The library to be compiled # The library to be compiled
NATIVE_LIBRARY_NAME=EOAccess NATIVE_LIBRARY_NAME=EOAccess
@ -88,26 +89,21 @@ EOAccess.h
DOCUMENT_NAME = EOAccess DOCUMENT_NAME = EOAccess
EOAccess_AUTOGSDOC_HEADERS = $(EOAccess_HEADER_FILES)
EOAccess_AUTOGSDOC_SOURCE = $(EOAccess_OBJC_FILES) # autogsdoc scan the source files corresponding to the headers
EOAccess_HEADER_FILES_DIR = $(HEADER_DIR) EOAccess_AGSDOC_FILES = EOAccess.gsdoc \
EOAccess_AGSDOC_FILES = EOAccess.gsdoc $(EOAccess_AUTOGSDOC_HEADERS) $(EOAccess_HEADER_FILES) \
#$(EOAccess_AUTOGSDOC_SOURCE) $(EOAccess_OBJC_FILES)
EOAccess_AGSDOC_FLAGS = \ EOAccess_AGSDOC_FLAGS = \
-Declared EOAccess \ -Declared EOAccess \
-Standards YES \
-Project EOAccess \ -Project EOAccess \
-WordMap '{\ -Up EOAccess \
FOUNDATION_EXPORT=extern;FOUNDATION_STATIC_INLINE="";\ $(GDL2_AGSDOC_FLAGS)
GS_GEOM_SCOPE=extern;GS_GEOM_ATTR="";\
GS_EXPORT=extern;GS_DECLARE="";\
GS_RANGE_SCOPE=extern;GS_RANGE_ATTR="";\
GS_ZONE_SCOPE=extern;GS_ZONE_ATTR="";\
}' -Up EOAccess
-include Makefile.preamble -include Makefile.preamble
include ../common.make include ../variable-processing.make
-include GNUmakefile.local -include GNUmakefile.local

9
EOAdaptors/PostgreSQLAdaptor/PostgreSQLAdaptor.m
View file

@ -259,7 +259,7 @@ static NSString *typeNames[][2] = {
return [[self externalToInternalTypeMap] allKeys]; return [[self externalToInternalTypeMap] allKeys];
} }
+ (void)assignExternalInfoForAttribute: (EOAttribute *)attribute + (void)assignExternalTypeForAttribute: (EOAttribute *)attribute
{ {
// TODO // TODO
EOAdaptorValueType value = [attribute adaptorValueType]; EOAdaptorValueType value = [attribute adaptorValueType];
@ -326,12 +326,13 @@ static NSString *typeNames[][2] = {
- (void)assertConnectionDictionaryIsValid - (void)assertConnectionDictionaryIsValid
{ {
NSException *exception = nil;
EOAdaptorContext *adaptorContext;
EOAdaptorChannel *adaptorChannel;
if (![self hasOpenChannels]) if (![self hasOpenChannels])
{ {
EOAdaptorContext *adaptorContext;
EOAdaptorChannel *adaptorChannel;
volatile NSException *exception = nil;
adaptorContext = [self createAdaptorContext]; adaptorContext = [self createAdaptorContext];
adaptorChannel = [adaptorContext createAdaptorChannel]; adaptorChannel = [adaptorContext createAdaptorChannel];

4
EOControl/EOClassDescription.h
View file

@ -233,8 +233,4 @@ GDL2CONTROL_EXPORT NSString *EOValidatedPropertyUserInfoKey;
@end @end
@interface NSObject (_EOEditingContext)
- (EOEditingContext *)editingContext;
@end
#endif #endif

73
EOControl/EOClassDescription.m
View file

@ -86,8 +86,6 @@ RCS_ID("$Id$")
+(id)defaultGroup; +(id)defaultGroup;
@end @end
@implementation EOClassDescription
NSString *EOClassDescriptionNeededNotification NSString *EOClassDescriptionNeededNotification
= @"EOClassDescriptionNeededNotification"; = @"EOClassDescriptionNeededNotification";
@ -111,6 +109,8 @@ static NSMapTable *classDescriptionForClass = NULL;
static id classDelegate = nil; static id classDelegate = nil;
static NSRecursiveLock *local_lock = nil; static NSRecursiveLock *local_lock = nil;
@implementation EOClassDescription
+ (void) initialize + (void) initialize
{ {
static BOOL initialized=NO; static BOOL initialized=NO;
@ -303,17 +303,18 @@ static NSRecursiveLock *local_lock = nil;
EOFLOGObjectFnStop(); EOFLOGObjectFnStop();
return dictionary; return dictionary;
};
- (void)awakeObject: (id)object
fromFetchInEditingContext: (EOEditingContext *)anEditingContext
{
//OK
//nothing to do
} }
- (void)awakeObject: (id)object - (void)awakeObject: (id)object
fromInsertionInEditingContext: (EOEditingContext *)anEditingContext fromFetchInEditingContext: (EOEditingContext *)editingContext
{
//OK
//nothing to do
return;
}
- (void)awakeObject: (id)object
fromInsertionInEditingContext: (EOEditingContext *)editingContext
{ {
//Near OK //Near OK
NSArray *toManyRelationshipKeys = nil; NSArray *toManyRelationshipKeys = nil;
@ -357,7 +358,7 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext
return nil; return nil;
} }
- (id)createInstanceWithEditingContext: (EOEditingContext *)anEditingContext - (id)createInstanceWithEditingContext: (EOEditingContext *)editingContext
globalID: (EOGlobalID *)globalID globalID: (EOGlobalID *)globalID
zone: (NSZone *)zone zone: (NSZone *)zone
{ {
@ -440,7 +441,7 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext
} }
- (void)propagateDeleteForObject: (id)object - (void)propagateDeleteForObject: (id)object
editingContext: (EOEditingContext *)context editingContext: (EOEditingContext *)editingContext
{ {
NSArray *toRelArray; NSArray *toRelArray;
NSEnumerator *toRelEnum; NSEnumerator *toRelEnum;
@ -478,9 +479,12 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext
NSDebugMLLog(@"gsdb", @"ToOne key=%@", key); NSDebugMLLog(@"gsdb", @"ToOne key=%@", key);
if (classDelegate) if (classDelegate)
shouldPropagate = [classDelegate shouldPropagateDeleteForObject: object {
inEditingContext: context shouldPropagate
= [classDelegate shouldPropagateDeleteForObject: object
inEditingContext: editingContext
forRelationshipKey: key]; forRelationshipKey: key];
}
NSDebugMLLog(@"gsdb", @"ToOne key=%@ shouldPropagate=%s", key, NSDebugMLLog(@"gsdb", @"ToOne key=%@ shouldPropagate=%s", key,
(shouldPropagate ? "YES" : "NO")); (shouldPropagate ? "YES" : "NO"));
@ -523,8 +527,8 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext
EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleCascade"); EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleCascade");
[object removeObject: destination [object removeObject: destination
fromBothSidesOfRelationshipWithKey: key]; fromBothSidesOfRelationshipWithKey: key];
[context deleteObject: destination]; [editingContext deleteObject: destination];
[destination propagateDeleteWithEditingContext: context]; [destination propagateDeleteWithEditingContext: editingContext];
break; break;
case EODeleteRuleDeny: case EODeleteRuleDeny:
@ -554,9 +558,12 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext
NSDebugMLLog(@"gsdb", @"ToMany key=%@", key); NSDebugMLLog(@"gsdb", @"ToMany key=%@", key);
if (classDelegate) if (classDelegate)
shouldPropagate = [classDelegate shouldPropagateDeleteForObject: object {
inEditingContext: context shouldPropagate
= [classDelegate shouldPropagateDeleteForObject: object
inEditingContext: editingContext
forRelationshipKey: key]; forRelationshipKey: key];
}
NSDebugMLLog(@"gsdb", @"ToMany key=%@ shouldPropagate=%s", key, NSDebugMLLog(@"gsdb", @"ToMany key=%@ shouldPropagate=%s", key,
(shouldPropagate ? "YES" : "NO")); (shouldPropagate ? "YES" : "NO"));
@ -612,8 +619,8 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext
[object removeObject: destination [object removeObject: destination
fromBothSidesOfRelationshipWithKey: key]; fromBothSidesOfRelationshipWithKey: key];
[context deleteObject: destination]; [editingContext deleteObject: destination];
[destination propagateDeleteWithEditingContext: context]; [destination propagateDeleteWithEditingContext: editingContext];
} }
NSDebugMLLog(@"gsdb", @"toManyArray %p=%@", NSDebugMLLog(@"gsdb", @"toManyArray %p=%@",
toManyArray, toManyArray); toManyArray, toManyArray);
@ -661,17 +668,17 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext
return nil; return nil;
} }
- (EORelationship *)anyRelationshipNamed:(NSString *)relationshipNamed - (EORelationship *)anyRelationshipNamed:(NSString *)relationshipName
{ {
return nil; return nil;
} }
- (NSString *)userPresentableDescriptionForObject:(id)anObject - (NSString *)userPresentableDescriptionForObject:(id)object
{ {
NSArray *attrArray = [self attributeKeys]; NSArray *attrArray = [self attributeKeys];
NSEnumerator *attrEnum = [attrArray objectEnumerator]; NSEnumerator *attrEnum = [attrArray objectEnumerator];
NSMutableString *values = [NSMutableString stringWithCapacity: NSMutableString *values
4 * [attrArray count]]; = [NSMutableString stringWithCapacity: 4 * [attrArray count]];
NSString *key; NSString *key;
BOOL init = YES; BOOL init = YES;
@ -729,9 +736,9 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext
@implementation NSObject (EOInitialization) @implementation NSObject (EOInitialization)
- (id)initWithEditingContext: (EOEditingContext *)ec - (id)initWithEditingContext: (EOEditingContext *)editingContext
classDescription: (EOClassDescription *)classDesc classDescription: (EOClassDescription *)classDescription
globalID: (EOGlobalID *)globalID; globalID: (EOGlobalID *)globalID
{ {
return [self init]; return [self init];
} }
@ -1870,7 +1877,7 @@ fromBothSidesOfRelationshipWithKey: (NSString *)key
@implementation NSObject (EOClassDescriptionClassDelegate) @implementation NSObject (EOClassDescriptionClassDelegate)
- (BOOL)shouldPropagateDeleteForObject: (id)object - (BOOL)shouldPropagateDeleteForObject: (id)object
inEditingContext: (EOEditingContext *)ec inEditingContext: (EOEditingContext *)editingContext
forRelationshipKey: (NSString *)key forRelationshipKey: (NSString *)key
{ {
return YES; return YES;
@ -2007,13 +2014,3 @@ fromBothSidesOfRelationshipWithKey: (NSString *)key
@end @end
@implementation NSObject (_EOEditingContext)
- (EOEditingContext*)editingContext
{
return [EOObserverCenter observerForObject: self
ofClass: [EOEditingContext class]];
}
@end

18
EOControl/EOControl.gsdoc
View file

@ -3,20 +3,30 @@
<gsdoc base="index"> <gsdoc base="index">
<head> <head>
<title>GDL2 - EOControl</title> <title>GDL2 - EOControl</title>
<author name="David Ayers">
<email address="ayers@fsfe.org"/>
<url url="http://www.gnustep.org/developers/whoiswho.html"/></author>
<author name="Mirko Viviani"> <author name="Mirko Viviani">
<email address="mirko.viviani@gmail.com"/> <email address="mirko.viviani@gmail.com"/>
<url url="http://www.gnustep.org/developers/whoiswho.html"/></author> <url url="http://www.gnustep.org/developers/whoiswho.html"/></author>
<author name="Manuel Guesdon"> <author name="Manuel Guesdon">
<email address="mguesdon@orange-concept.com"/> <email address="mguesdon@orange-concept.com"/>
<url url="http://www.gnustep.org/developers/whoiswho.html"/></author> <url url="http://www.gnustep.org/developers/whoiswho.html"/></author>
<author name="David Ayers"> <version>$Revision$</version>
<email address="ayers@fsfe.org"/> <date>$Date$</date>
<url url="http://www.gnustep.org/developers/whoiswho.html"/></author> <copy>2006 Free Software Foundation, Inc.</copy>
</head> </head>
<body> <body>
<chapter> <chapter>
<heading>GDL2 - EOControl</heading> <heading>GDL2 - EOControl</heading>
<p>... <p>
EOControl is the fundemantal framework of GDL2 which implements the
the abstraction of a database from the view of an object oriented
application. To be useful it generally requires support from a
suppurting framework like EOAccess which implements the components
needed for SQL based RDBMS implementations. In theory EOControl could
be used together with supporting Libraries with other storage models
but these are hardely used in practice.
</p> </p>
</chapter> </chapter>
<back> <back>

1
EOControl/EODataSource.m
View file

@ -120,6 +120,7 @@ RCS_ID("$Id$")
- (void)setQualifierBindings: (NSDictionary *)bindings - (void)setQualifierBindings: (NSDictionary *)bindings
{ {
return;
} }
- (NSDictionary *)qualifierBindings - (NSDictionary *)qualifierBindings

20
EOControl/EODeprecated.h
View file

@ -43,27 +43,27 @@
@end @end
@interface EOClassDescription (EODeprecated) @interface EOClassDescription (EODeprecated)
/** Deprecated. Use +setClassDelegate. */ /** Deprecated. Use [+setClassDelegate:]. */
+ (void)setDelegate: (id)delegate; + (void)setDelegate: (id)delegate;
/** Deprecated. Use +classDelegate. */ /** Deprecated. Use [+classDelegate]. */
+ (id)delegate; + (id)delegate;
@end @end
/** Deprecated. Use NSUndoManager. */ /** Deprecated. Use NSUndoManager. */
@interface EOUndoManager : NSUndoManager @interface EOUndoManager : NSUndoManager
/** Deprecated. Use -removeAllActionsWithTarget:. */ /** Deprecated. Use <code>removeAllActionsWithTarget:</code>. */
- (void)forgetAllWithTarget: (id)param0; - (void)forgetAllWithTarget: (id)target;
/** Deprecated. Use -removeAllActionsWithTarget:. */ /** Deprecated. Use <code>removeAllActionsWithTarget:</code>. */
- (void)forgetAll; - (void)forgetAll;
/** Deprecated. Use -registerUndoWithTarget:selector:object:. */ /** Deprecated. Use <code>registerUndoWithTarget:selector:object:</code>. */
- (void)registerUndoWithTarget: (id)param0 - (void)registerUndoWithTarget: (id)target
selector: (SEL)param1 selector: (SEL)selector
arg: (id)param2; arg: (id)argument;
/** Deprecated. Use -enableUndoRegistration. */ /** Deprecated. Use <code>enableUndoRegistration</code>. */
- (void)reenableUndoRegistration; - (void)reenableUndoRegistration;
@end @end

10
EOControl/EOEditingContext.h
View file

@ -163,7 +163,7 @@
- (void)validateDeletesUsingTable: (NSHashTable *)deleteTable; - (void)validateDeletesUsingTable: (NSHashTable *)deleteTable;
- (BOOL)validateTable: (NSHashTable *)table - (BOOL)validateTable: (NSHashTable *)table
withSelector: (SEL)sel withSelector: (SEL)sel
exceptionArray: (NSMutableArray**)exceptionArray exceptionArray: (NSMutableArray**)exceptionArrayPtr
continueAfterFailure: (BOOL)continueAfterFailure; continueAfterFailure: (BOOL)continueAfterFailure;
@ -173,10 +173,10 @@
- (void)setPropagatesDeletesAtEndOfEvent: (BOOL)propagatesDeletesAtEndOfEvent; - (void)setPropagatesDeletesAtEndOfEvent: (BOOL)propagatesDeletesAtEndOfEvent;
- (BOOL)stopsValidationAfterFirstError; - (BOOL)stopsValidationAfterFirstError;
- (void)setStopsValidationAfterFirstError: (BOOL)yn; - (void)setStopsValidationAfterFirstError: (BOOL)flag;
- (BOOL)locksObjectsBeforeFirstModification; - (BOOL)locksObjectsBeforeFirstModification;
- (void)setLocksObjectsBeforeFirstModification: (BOOL)yn; - (void)setLocksObjectsBeforeFirstModification: (BOOL)flag;
- (EOSharedEditingContext *)sharedEditingContext; - (EOSharedEditingContext *)sharedEditingContext;
- (void)setSharedEditingContext:(EOSharedEditingContext *)sharedEditingContext; - (void)setSharedEditingContext:(EOSharedEditingContext *)sharedEditingContext;
@ -201,7 +201,7 @@ modified state of the object.**/
- (void)refaultObjects; - (void)refaultObjects;
- (void)setInvalidatesObjectsWhenFreed: (BOOL)yn; - (void)setInvalidatesObjectsWhenFreed: (BOOL)flag;
- (BOOL)invalidatesObjectsWhenFreed; - (BOOL)invalidatesObjectsWhenFreed;
- (void)addEditor: (id)editor; - (void)addEditor: (id)editor;
@ -334,7 +334,7 @@ shouldContinueFetchingWithCurrentObjectCount: (unsigned)count
@interface EOEditingContext (EOStateArchiving) @interface EOEditingContext (EOStateArchiving)
+ (void)setUsesContextRelativeEncoding: (BOOL)yn; + (void)setUsesContextRelativeEncoding: (BOOL)flag;
+ (BOOL)usesContextRelativeEncoding; + (BOOL)usesContextRelativeEncoding;
+ (void)encodeObject: (id)object withCoder: (NSCoder *)coder; + (void)encodeObject: (id)object withCoder: (NSCoder *)coder;
+ (id)initObject: (id)object withCoder: (NSCoder *)coder; + (id)initObject: (id)object withCoder: (NSCoder *)coder;

13
EOControl/EOEditingContext.m
View file

@ -1293,13 +1293,13 @@ _mergeValueForKey(id obj, id value,
EOFLOGObjectFnStop(); EOFLOGObjectFnStop();
} }
- (NSArray *)objectsWithFetchSpecification: (EOFetchSpecification *)fetch - (NSArray *)objectsWithFetchSpecification: (EOFetchSpecification *)fetchSpecification
{ {
NSArray *objects; NSArray *objects;
EOFLOGObjectFnStart(); EOFLOGObjectFnStart();
objects = [self objectsWithFetchSpecification: fetch objects = [self objectsWithFetchSpecification: fetchSpecification
editingContext: self]; editingContext: self];
EOFLOGObjectFnStop(); EOFLOGObjectFnStop();
@ -2354,6 +2354,7 @@ _mergeValueForKey(id obj, id value,
-(void)setLevelsOfUndo:(int)levels -(void)setLevelsOfUndo:(int)levels
{ {
//TODO //TODO
return;
}; };
- (void) _registerClearStateWithUndoManager - (void) _registerClearStateWithUndoManager
@ -3654,7 +3655,7 @@ modified state of the object.**/
} }
} }
- (NSArray *)objectsWithFetchSpecification: (EOFetchSpecification *)fetch - (NSArray *)objectsWithFetchSpecification: (EOFetchSpecification *)fetchSpecification
editingContext: (EOEditingContext *)context editingContext: (EOEditingContext *)context
{ {
//OK //OK
@ -3663,14 +3664,14 @@ modified state of the object.**/
EOFLOGObjectFnStart(); EOFLOGObjectFnStart();
EOFLOGObjectLevelArgs(@"EOEditingContext", EOFLOGObjectLevelArgs(@"EOEditingContext",
@"_objectStore=%@ fetch=%@ context=%@", @"_objectStore=%@ fetchSpecification=%@ context=%@",
_objectStore, fetch, context); _objectStore, fetchSpecification, context);
[self lock]; //TODOLOCK [self lock]; //TODOLOCK
NS_DURING NS_DURING
{ {
objects = [_objectStore objectsWithFetchSpecification: fetch objects = [_objectStore objectsWithFetchSpecification: fetchSpecification
editingContext: context]; editingContext: context];
} }
NS_HANDLER NS_HANDLER

5
EOControl/EOEvent.m
View file

@ -58,15 +58,19 @@ NSString *EOEventGroupName = @"EOEventGroupName";
- (void)markStartWithInfo: (id)info - (void)markStartWithInfo: (id)info
{ {
return;
} }
- (void)markAtomicWithInfo: (id)info - (void)markAtomicWithInfo: (id)info
{ {
return;
} }
- (void)markEnd - (void)markEnd
{ {
return;
} }
- (void)setInfo: (id)info - (void)setInfo: (id)info
{ {
return;
} }
- (id)info - (id)info
{ {
@ -74,6 +78,7 @@ NSString *EOEventGroupName = @"EOEventGroupName";
} }
- (void)setType: (NSString *)type - (void)setType: (NSString *)type
{ {
return;
} }
- (NSString *)type - (NSString *)type
{ {

11
EOControl/EOEventCenter.m
View file

@ -73,23 +73,29 @@ NSString *EOEventLoggingLimit = @"EOEventLoggingLimit";
} }
+ (void)suspendLogging + (void)suspendLogging
{ {
return;
} }
+ (void)resumeLogging + (void)resumeLogging
{ {
return;
} }
+ (void)resetLogging + (void)resetLogging
{ {
return;
} }
- (void)resetLogging - (void)resetLogging
{ {
return;
} }
+ (void)registerEventClass: (Class)eventClass + (void)registerEventClass: (Class)eventClass
classPointer: (Class *)classPtr classPointer: (Class *)classPtr
{ {
return;
} }
+ (void)registerEventClass: (Class)eventClass + (void)registerEventClass: (Class)eventClass
handler: (id <EOEventRecordingHandler>)handler handler: (id <EOEventRecordingHandler>)handler
{ {
return;
} }
+ (NSArray *)registeredEventClasses + (NSArray *)registeredEventClasses
{ {
@ -102,6 +108,7 @@ NSString *EOEventLoggingLimit = @"EOEventLoggingLimit";
+ (void)setRecordsEvents: (BOOL)flag + (void)setRecordsEvents: (BOOL)flag
forClass: (Class)eventClass forClass: (Class)eventClass
{ {
return;
} }
+ (id)newEventOfClass: (Class)eventClass + (id)newEventOfClass: (Class)eventClass
type: (NSString *)type type: (NSString *)type
@ -111,16 +118,20 @@ NSString *EOEventLoggingLimit = @"EOEventLoggingLimit";
+ (void)markStartOfEvent: (EOEvent *)event + (void)markStartOfEvent: (EOEvent *)event
info: (id)info info: (id)info
{ {
return;
} }
+ (void)markAtomicEvent: (EOEvent *)event + (void)markAtomicEvent: (EOEvent *)event
info: (id)info info: (id)info
{ {
return;
} }
+ (void)markEndOfEvent:(EOEvent *)event + (void)markEndOfEvent:(EOEvent *)event
{ {
return;
} }
+ (void)cancelEvent:(EOEvent *)event + (void)cancelEvent:(EOEvent *)event
{ {
return;
} }
- (NSArray *)eventsOfClass: (Class)eventClass - (NSArray *)eventsOfClass: (Class)eventClass
type: (NSString *)type type: (NSString *)type

8
EOControl/EOFault.h
View file

@ -71,8 +71,8 @@
+ (unsigned)retainCount; + (unsigned)retainCount;
+ (BOOL)isKindOfClass: (Class)aClass; + (BOOL)isKindOfClass: (Class)aClass;
+ (void)doesNotRecognizeSelector: (SEL)sel; + (void)doesNotRecognizeSelector: (SEL)selector;
+ (BOOL)respondsToSelector: (SEL)sel; + (BOOL)respondsToSelector: (SEL)selector;
+ (void)makeObjectIntoFault: (id)object withHandler: (EOFaultHandler *)handler; + (void)makeObjectIntoFault: (id)object withHandler: (EOFaultHandler *)handler;
@ -92,7 +92,7 @@
- (BOOL)isKindOfClass: (Class)aClass; - (BOOL)isKindOfClass: (Class)aClass;
- (BOOL)isMemberOfClass: (Class)aClass; - (BOOL)isMemberOfClass: (Class)aClass;
- (BOOL)conformsToProtocol: (Protocol *)protocol; - (BOOL)conformsToProtocol: (Protocol *)protocol;
- (BOOL)respondsToSelector: (SEL)sel; - (BOOL)respondsToSelector: (SEL)selector;
- (NSMethodSignature *)methodSignatureForSelector: (SEL)selector; - (NSMethodSignature *)methodSignatureForSelector: (SEL)selector;
- (id)retain; - (id)retain;
@ -116,7 +116,7 @@
- (id)self; - (id)self;
- (void)doesNotRecognizeSelector: (SEL)sel; - (void)doesNotRecognizeSelector: (SEL)selector;
- (void)forwardInvocation: (NSInvocation *)invocation; - (void)forwardInvocation: (NSInvocation *)invocation;
- (id)gcSetNextObject: (id)object; - (id)gcSetNextObject: (id)object;

52
EOControl/EOFault.m
View file

@ -130,38 +130,38 @@ static Class EOFaultClass = NULL;
return NO; return NO;
} }
+ (void)doesNotRecognizeSelector: (SEL)sel + (void)doesNotRecognizeSelector: (SEL)selector
{ {
[NSException raise: NSInvalidArgumentException [NSException raise: NSInvalidArgumentException
format: @"%@ -- %@ 0x%x: selector \"%@\" not recognized", format: @"%@ -- %@ 0x%x: selector \"%@\" not recognized",
NSStringFromSelector(_cmd), NSStringFromSelector(_cmd),
NSStringFromClass([self class]), NSStringFromClass([self class]),
self, self,
NSStringFromSelector(sel)]; NSStringFromSelector(selector)];
} }
+ (BOOL)respondsToSelector: (SEL)sel + (BOOL)respondsToSelector: (SEL)selector
{ {
return (GSGetMethod(self, sel, NO, YES) != (GSMethod)0); return (GSGetMethod(self, selector, NO, YES) != (GSMethod)0);
} }
/** /**
* Returns a pointer to the C function implementing the method used * Returns a pointer to the C function implementing the method used
* to respond to messages with aSelector by instances of the receiving * to respond to messages with selector by instances of the receiving
* class. * class.
* <br />Raises NSInvalidArgumentException if given a null selector. * <br />Raises NSInvalidArgumentException if given a null selector.
* *
* It's a temporary fix to support NSAutoreleasePool optimization * It's a temporary fix to support NSAutoreleasePool optimization
*/ */
+ (IMP) instanceMethodForSelector: (SEL)aSelector + (IMP) instanceMethodForSelector: (SEL)selector
{ {
if (aSelector == 0) if (selector == 0)
[NSException raise: NSInvalidArgumentException [NSException raise: NSInvalidArgumentException
format: @"%@ null selector given", NSStringFromSelector(_cmd)]; format: @"%@ null selector given", NSStringFromSelector(_cmd)];
/* /*
* Since 'self' is an class, get_imp() will get the instance method. * Since 'self' is an class, get_imp() will get the instance method.
*/ */
return get_imp((Class)self, aSelector); return get_imp((Class)self, selector);
} }
// Fault class methods // Fault class methods
@ -294,7 +294,7 @@ static Class EOFaultClass = NULL;
return [_handler targetClass]; return [_handler targetClass];
} }
- (BOOL)isKindOfClass: (Class)aclass; - (BOOL)isKindOfClass: (Class)aClass
{ {
Class class; Class class;
BOOL koc=NO; BOOL koc=NO;
@ -302,15 +302,15 @@ static Class EOFaultClass = NULL;
class = [_handler targetClass]; class = [_handler targetClass];
for (; !koc && class != Nil; class = GSObjCSuper(class)) for (; !koc && class != Nil; class = GSObjCSuper(class))
if (class == aclass) if (class == aClass)
koc = YES; koc = YES;
return koc; return koc;
} }
- (BOOL)isMemberOfClass: (Class)aclass - (BOOL)isMemberOfClass: (Class)aClass
{ {
return [_handler targetClass] == aclass; return [_handler targetClass] == aClass;
} }
- (BOOL)conformsToProtocol: (Protocol *)protocol - (BOOL)conformsToProtocol: (Protocol *)protocol
@ -336,7 +336,7 @@ static Class EOFaultClass = NULL;
return NO; return NO;
} }
- (BOOL)respondsToSelector: (SEL)aSelector - (BOOL)respondsToSelector: (SEL)selector
{ {
Class class; Class class;
BOOL respondsToSelector; BOOL respondsToSelector;
@ -344,24 +344,24 @@ static Class EOFaultClass = NULL;
NSDebugFLLog(@"gsdb", @"START self=%p", self); NSDebugFLLog(@"gsdb", @"START self=%p", self);
class = [_handler targetClass]; class = [_handler targetClass];
NSDebugFLLog(@"gsdb", @"class=%@ aSelector=%@", class, NSDebugFLLog(@"gsdb", @"class=%@ selector=%@", class,
NSStringFromSelector(aSelector)); NSStringFromSelector(selector));
respondsToSelector respondsToSelector
= (GSGetMethod(class, aSelector, YES, YES) != (GSMethod)0); = (GSGetMethod(class, selector, YES, YES) != (GSMethod)0);
NSDebugFLLog(@"gsdb", @"STOP self=%p", self); NSDebugFLLog(@"gsdb", @"STOP self=%p", self);
return respondsToSelector; return respondsToSelector;
} }
- (NSMethodSignature *)methodSignatureForSelector: (SEL)aSelector - (NSMethodSignature *)methodSignatureForSelector: (SEL)selector
{ {
NSMethodSignature *sig; NSMethodSignature *sig;
NSDebugFLLog(@"gsdb", @"START self=%p", self); NSDebugFLLog(@"gsdb", @"START self=%p", self);
NSDebugFLLog(@"gsdb", @"_handler=%p", _handler); NSDebugFLLog(@"gsdb", @"_handler=%p", _handler);
sig = [_handler methodSignatureForSelector: aSelector sig = [_handler methodSignatureForSelector: selector
forFault: self]; forFault: self];
NSDebugFLLog(@"gsdb", @"STOP self=%p", self); NSDebugFLLog(@"gsdb", @"STOP self=%p", self);
@ -482,24 +482,24 @@ static Class EOFaultClass = NULL;
return self; return self;
} }
- (void)doesNotRecognizeSelector: (SEL)sel - (void)doesNotRecognizeSelector: (SEL)selector
{ {
[NSException raise: NSInvalidArgumentException [NSException raise: NSInvalidArgumentException
format: @"%@ -- %@ 0x%x: selector \"%@\" not recognized", format: @"%@ -- %@ 0x%x: selector \"%@\" not recognized",
NSStringFromSelector(_cmd), NSStringFromSelector(_cmd),
NSStringFromClass([self class]), NSStringFromClass([self class]),
self, self,
NSStringFromSelector(sel)]; NSStringFromSelector(selector)];
} }
- (retval_t)forward: (SEL)sel - (retval_t)forward: (SEL)selector
: (arglist_t)args : (arglist_t)args
{ {
retval_t ret; retval_t ret;
NSInvocation *inv; NSInvocation *inv;
inv = [[[NSInvocation alloc] initWithArgframe: args inv = [[[NSInvocation alloc] initWithArgframe: args
selector: sel] selector: selector]
autorelease]; autorelease];
[self forwardInvocation: inv]; [self forwardInvocation: inv];
@ -542,14 +542,14 @@ static Class EOFaultClass = NULL;
// GC // GC
- gcSetNextObject: (id)anObject - gcSetNextObject: (id)object
{ {
return [_handler gcSetNextObject: anObject]; return [_handler gcSetNextObject: object];
} }
- gcSetPreviousObject: (id)anObject - gcSetPreviousObject: (id)object
{ {
return [_handler gcSetPreviousObject: anObject]; return [_handler gcSetPreviousObject: object];
} }
- (id)gcNextObject - (id)gcNextObject

7
EOControl/EOFetchSpecification.h
View file

@ -115,7 +115,7 @@
- (void)setIsDeep: (BOOL)isDeep; - (void)setIsDeep: (BOOL)isDeep;
- (BOOL)isDeep; - (BOOL)isDeep;
- (void)setLocksObjects: (BOOL)setLocksObjects; - (void)setLocksObjects: (BOOL)locksObjects;
- (BOOL)locksObjects; - (BOOL)locksObjects;
- (void)setRefreshesRefetchedObjects: (BOOL)refreshesRefetchedObjects; - (void)setRefreshesRefetchedObjects: (BOOL)refreshesRefetchedObjects;
@ -148,10 +148,5 @@
@end @end
GDL2CONTROL_EXPORT NSString *EOPrefetchingRelationshipHintKey;
GDL2CONTROL_EXPORT NSString *EOFetchLimitHintKey;
GDL2CONTROL_EXPORT NSString *EOPromptsAfterFetchLimitHintKey;
#endif #endif

4
EOControl/EOFetchSpecification.m
View file

@ -392,10 +392,10 @@ setRequiresAllQualifierBindingVariables:requiresAllQualifierBindingVariables
return _qualifier; return _qualifier;
} }
- (void)setUsesDistinct: (BOOL)flag - (void)setUsesDistinct: (BOOL)usesDistinct
{ {
[self willChange]; [self willChange];
_flags.usesDistinct = flag ? YES : NO; _flags.usesDistinct = usesDistinct ? YES : NO;
} }
- (BOOL)usesDistinct - (BOOL)usesDistinct

2
EOControl/EOGenericRecord.m
View file

@ -160,7 +160,7 @@ static NSRecursiveLock *allGenericRecordsLock = nil;
- (id) initWithEditingContext: (EOEditingContext *)context - (id) initWithEditingContext: (EOEditingContext *)context
classDescription: (EOClassDescription *)classDesc classDescription: (EOClassDescription *)classDesc
globalID: (EOGlobalID *)globalID; globalID: (EOGlobalID *)globalID
{ {
if ((self = [self init])) if ((self = [self init]))
{ {

3
EOControl/EOGlobalID.h
View file

@ -73,9 +73,6 @@ enum {
- (BOOL)isTemporary; - (BOOL)isTemporary;
- (void)encodeWithCoder: (NSCoder *)coder;
- (id)initWithCoder: (NSCoder *)decoder;
@end @end
#endif #endif

3
EOControl/EOKeyGlobalID.h
View file

@ -52,9 +52,6 @@
- (BOOL)isEqual: (id)other; - (BOOL)isEqual: (id)other;
- (unsigned)hash; - (unsigned)hash;
- (void)encodeWithCoder: (NSCoder *)coder;
- (id)initWithCoder: (NSCoder *)decoder;
- (BOOL)isFinal; - (BOOL)isFinal;
- (NSString *)description; - (NSString *)description;
- (BOOL)areKeysAllNulls; - (BOOL)areKeysAllNulls;

2
EOControl/EOKeyGlobalID.m
View file

@ -155,7 +155,7 @@ RCS_ID("$Id$")
} }
- (unsigned int)hash // TODO - (unsigned int)hash
{ {
int i; int i;
unsigned int hash = 0; unsigned int hash = 0;

2
EOControl/EOKeyValueArchiver.h
View file

@ -109,7 +109,7 @@ referenceToEncodeForObject: (id)object;
- (void)setDelegate: (id)delegate; - (void)setDelegate: (id)delegate;
- (id)delegate; - (id)delegate;
- (id)_findTypeForPropertyListDecoding: (id)param0; - (id)_findTypeForPropertyListDecoding: (id)obj;
- (id)_dictionaryForPropertyList: (NSDictionary *)propList; - (id)_dictionaryForPropertyList: (NSDictionary *)propList;
- (id)_objectsForPropertyList: (NSArray *)propList; - (id)_objectsForPropertyList: (NSArray *)propList;
- (id)_objectForPropertyList: (NSDictionary *)propList; - (id)_objectForPropertyList: (NSDictionary *)propList;

15
EOControl/EOKeyValueArchiver.m
View file

@ -621,7 +621,7 @@ NO if no object is found **/
/** Returns unarchived object for the reference archived as 'key'. /** Returns unarchived object for the reference archived as 'key'.
The receiver gets the object for reference by calling The receiver gets the object for reference by calling
its delegate method -archiver:objectForReference: **/ its delegate method -unarchiver:objectForReference: **/
- (id) decodeObjectReferenceForKey: (NSString*)key - (id) decodeObjectReferenceForKey: (NSString*)key
{ {
id objectReference = nil; id objectReference = nil;
@ -838,11 +838,12 @@ class instances should implements -initWithKeyValueUnarchiver: **/
@implementation NSObject (EOKeyValueUnarchiverDelegation) @implementation NSObject (EOKeyValueUnarchiverDelegation)
/** Returns an object for archived 'reference'. /**
Should be overriden by EOKeyValueUnarchiver's delegates * Returns an object for archived 'reference'.
**/ * Implemented by EOKeyValueUnarchiver's delegate.
*/
- (id)unarchiver: (EOKeyValueUnarchiver*)archiver - (id)unarchiver: (EOKeyValueUnarchiver*)archiver
objectForReference: (id)reference objectForReference: (id)keyPath
{ {
[self subclassResponsibility:_cmd]; [self subclassResponsibility:_cmd];
return nil; return nil;
@ -856,11 +857,13 @@ objectForReference: (id)reference
- (void)finishInitializationWithKeyValueUnarchiver: (EOKeyValueUnarchiver *)unarchiver - (void)finishInitializationWithKeyValueUnarchiver: (EOKeyValueUnarchiver *)unarchiver
{ {
//Does nothing ? //Does nothing ?
return;
} }
- (void)awakeFromKeyValueUnarchiver: (EOKeyValueUnarchiver *)unarchiver; - (void)awakeFromKeyValueUnarchiver: (EOKeyValueUnarchiver *)unarchiver
{ {
//Does nothing ? //Does nothing ?
return;
} }
@end @end

2
EOControl/EOKeyValueCoding.h
View file

@ -109,7 +109,7 @@
* Contrary to the TOC of the documentation, this method is called * Contrary to the TOC of the documentation, this method is called
* unableToSetNilForKey: and not unableToSetNullForKey:<br/> * unableToSetNilForKey: and not unableToSetNullForKey:<br/>
* This implementation raises an NSInvalidArgument exception. <br/> * This implementation raises an NSInvalidArgument exception. <br/>
* The NSKeyValueCoding -setNilValueForKey: is overriden to invoke this * The NSKeyValueCoding setNilValueForKey: is overriden to invoke this
* method instead. We manipulate the runtime to insure that our implementation * method instead. We manipulate the runtime to insure that our implementation
* of unableToSetNilForKey: is used in favor of the one in gnustep-base or * of unableToSetNilForKey: is used in favor of the one in gnustep-base or
* Foundation. * Foundation.

4
EOControl/EOKeyValueCoding.m
View file

@ -254,7 +254,7 @@ initialize(void)
* returned by invoking [NSObject-valueForKey:] * returned by invoking [NSObject-valueForKey:]
* for each item in the receiver, substituting EONull for nil. * for each item in the receiver, substituting EONull for nil.
* Keys formated like "@function.someKey" are resolved by invoking * Keys formated like "@function.someKey" are resolved by invoking
* [NSArray-computeFuncionWithKey:] "someKey" on the receiver. * <code>NSArray compute<em>Function</em>WithKey:</code> "someKey" on the receiver.
* If the key is omitted, the function will be called with nil. * If the key is omitted, the function will be called with nil.
* The following functions are supported by default: * The following functions are supported by default:
* <list> * <list>
@ -431,7 +431,7 @@ initialize(void)
* Iterates over the objects of the receiver send each object valueForKey: * Iterates over the objects of the receiver send each object valueForKey:
* with the parameter. The decimalValue of the returned object is accumalted * with the parameter. The decimalValue of the returned object is accumalted
* and then divided by number of objects contained by the receiver as returned * and then divided by number of objects contained by the receiver as returned
* by [NSArray-coung]. An empty array returns NSDecimalNumber 0. * by <code>NSArray count</code>. An empty array returns NSDecimalNumber 0.
*/ */
- (id)computeAvgForKey: (NSString *)key - (id)computeAvgForKey: (NSString *)key
{ {

4
EOControl/EOMultiReaderLock.m
View file

@ -225,6 +225,7 @@
*/ */
- (void)lockForWriting - (void)lockForWriting
{ {
return;
} }
/** /**
@ -235,6 +236,7 @@
*/ */
- (void)unlockForWriting - (void)unlockForWriting
{ {
return;
} }
/** /**
@ -244,6 +246,7 @@
*/ */
- (void)suspendReaderLocks - (void)suspendReaderLocks
{ {
return;
} }
/** /**
@ -253,6 +256,7 @@
*/ */
- (void)retrieveReaderLocks - (void)retrieveReaderLocks
{ {
return;
} }
@end @end

18
EOControl/EONSAddOns.m
View file

@ -426,13 +426,13 @@ GDL2_ActivateAllGDL2Categories(void)
return result; return result;
} }
- (NSArray *)arrayExcludingObject: (id)anObject - (NSArray *)arrayExcludingObject: (id)object
{ {
//Verify: mutable/non mutable,.. //Verify: mutable/non mutable,..
NSArray *result = nil; NSArray *result = nil;
unsigned int selfCount = [self count]; unsigned int selfCount = [self count];
if (selfCount > 0 && anObject) //else return nil if (selfCount > 0 && object) //else return nil
{ {
int i; int i;
@ -440,7 +440,7 @@ GDL2_ActivateAllGDL2Categories(void)
{ {
id object = [self objectAtIndex: i]; id object = [self objectAtIndex: i];
if (object != anObject) if (object != object)
{ {
if (result) if (result)
[(NSMutableArray *)result addObject: object]; [(NSMutableArray *)result addObject: object];
@ -617,7 +617,7 @@ GDL2_ActivateAllGDL2Categories(void)
}; };
return (short)v; return (short)v;
}; };
-(unsigned short)unsignedShortValue; -(unsigned short)unsignedShortValue
{ {
int v=atoi([self lossyCString]); int v=atoi([self lossyCString]);
if (v<0 || v>USHRT_MAX) if (v<0 || v>USHRT_MAX)
@ -633,7 +633,7 @@ GDL2_ActivateAllGDL2Categories(void)
return atol([self lossyCString]); return atol([self lossyCString]);
}; };
-(unsigned long)unsignedLongValue; -(unsigned long)unsignedLongValue
{ {
long long v=atoll([self lossyCString]); long long v=atoll([self lossyCString]);
if (v<0 || v>ULONG_MAX) if (v<0 || v>ULONG_MAX)
@ -665,18 +665,18 @@ GDL2_ActivateAllGDL2Categories(void)
* The method must be one which takes three arguments and returns an object. * The method must be one which takes three arguments and returns an object.
* <br />Raises NSInvalidArgumentException if given a null selector. * <br />Raises NSInvalidArgumentException if given a null selector.
*/ */
- (id) performSelector: (SEL)aSelector - (id) performSelector: (SEL)selector
withObject: (id) object1 withObject: (id) object1
withObject: (id) object2 withObject: (id) object2
withObject: (id) object3 withObject: (id) object3
{ {
IMP msg; IMP msg;
if (aSelector == 0) if (selector == 0)
[NSException raise: NSInvalidArgumentException [NSException raise: NSInvalidArgumentException
format: @"%@ null selector given", NSStringFromSelector(_cmd)]; format: @"%@ null selector given", NSStringFromSelector(_cmd)];
msg = get_imp(GSObjCClass(self), aSelector); msg = get_imp(GSObjCClass(self), selector);
if (!msg) if (!msg)
{ {
[NSException raise: NSGenericException [NSException raise: NSGenericException
@ -684,7 +684,7 @@ GDL2_ActivateAllGDL2Categories(void)
return nil; return nil;
} }
return (*msg)(self, aSelector, object1, object2, object3); return (*msg)(self, selector, object1, object2, object3);
} }
@end @end

2
EOControl/EOObjectStore.h
View file

@ -71,7 +71,7 @@
- (void)saveChangesInEditingContext: (EOEditingContext *)context; - (void)saveChangesInEditingContext: (EOEditingContext *)context;
- (NSArray *)objectsWithFetchSpecification: (EOFetchSpecification *)fetchSpec - (NSArray *)objectsWithFetchSpecification: (EOFetchSpecification *)fetchSpecification
editingContext: (EOEditingContext *)context; editingContext: (EOEditingContext *)context;
- (BOOL)isObjectLockedWithGlobalID: (EOGlobalID *)gid - (BOOL)isObjectLockedWithGlobalID: (EOGlobalID *)gid

2
EOControl/EOObjectStoreCoordinator.h
View file

@ -58,7 +58,7 @@
- (NSDictionary *)valuesForKeys: (NSArray *)keys object: (id)object; - (NSDictionary *)valuesForKeys: (NSArray *)keys object: (id)object;
- (EOCooperatingObjectStore *)objectStoreForGlobalID: (EOGlobalID *)gloablID; - (EOCooperatingObjectStore *)objectStoreForGlobalID: (EOGlobalID *)globalID;
- (EOCooperatingObjectStore *)objectStoreForObject: (id)object; - (EOCooperatingObjectStore *)objectStoreForObject: (id)object;

2
EOControl/EOObserver.h
View file

@ -127,7 +127,7 @@ enum
- (void)enqueueObserver: (EODelayedObserver *)observer; - (void)enqueueObserver: (EODelayedObserver *)observer;
- (void)dequeueObserver: (EODelayedObserver *)observer; - (void)dequeueObserver: (EODelayedObserver *)observer;
- (void)notifyObserversUpToPriority: (EOObserverPriority)lastPriority; - (void)notifyObserversUpToPriority: (EOObserverPriority)priority;
- (void)setRunLoopModes: (NSArray *)modes; - (void)setRunLoopModes: (NSArray *)modes;
- (NSArray *)runLoopModes; - (NSArray *)runLoopModes;

60
EOControl/EOObserver.m
View file

@ -64,7 +64,7 @@ RCS_ID("$Id$")
* all mutating accessor methods before the state of the receiver changes. * all mutating accessor methods before the state of the receiver changes.
* This method invokes [EOObserverCenter+notifyObserversObjectWillChange:] * This method invokes [EOObserverCenter+notifyObserversObjectWillChange:]
* with the receiver. It is responsible for invoking * with the receiver. It is responsible for invoking
* [EOObserving-objectWillChange:] for all corresponding observers. * [(EOObserving)-objectWillChange:] for all corresponding observers.
*/ */
- (void)willChange - (void)willChange
{ {
@ -80,14 +80,14 @@ RCS_ID("$Id$")
/** /**
* <p>This is the central coordinating class of the change tracking system * <p>This is the central coordinating class of the change tracking system
* of EOControl. It manages the observers [EOObserving] and the objects * of EOControl. It manages the observers [(EOObserving)] and the objects
* to be observed. No instances of this class should be needed or created. * to be observed. No instances of this class should be needed or created.
* All methods for coordinating the tracking mechanism are class methods.</p> * All methods for coordinating the tracking mechanism are class methods.</p>
* <p>Observers must implement the [EObserving] protocol, in particular * <p>Observers must implement the [(EOObserving)] protocol, in particular
* [EOObserving-objectWillChange:] while the observed objects must invoke * [(EOObserving)-objectWillChange:] while the observed objects must invoke
* [NSObject-willChange]. Invoke [+addObserver:forObject:] to register an * [NSObject-willChange]. Invoke [+addObserver:forObject:] to register an
* observer for a particular object. That will setup for * observer for a particular object. That will setup for
* [EOObserving-objectWillChange:] to be invoked on the observer each time * [(EOObserving)-objectWillChange:] to be invoked on the observer each time
* [NSObject-willChange] gets called. To remove an observer invoke * [NSObject-willChange] gets called. To remove an observer invoke
* [+removeObserver:forObject:]. For observers who wish to be notified for * [+removeObserver:forObject:]. For observers who wish to be notified for
* every change the methods [+addOmniscientObserver:] and * every change the methods [+addOmniscientObserver:] and
@ -115,22 +115,25 @@ static id lastObject;
/** /**
* <p> * <p>
* Adds the observer to be notified with a [EOObserving-objectWillChange:] * Adds the observer to be notified with a [(EOObserving)-objectWillChange:]
* on the first of consecutive [NSObject-willChange] methods invoked on * on the first of consecutive [NSObject-willChange] methods invoked on
* the object. * the object.
* </p>
* <p> * <p>
* This does not retain the object. It is the observers * This does not retain the object. It is the observers
* responsibility to unregister the object with [-removeObserver:forObject:] * responsibility to unregister the object with [+removeObserver:forObject:]
* before the object ceases to exist. * before the object ceases to exist.
* The observer is also not retained. It is the observers responsibility * The observer is also not retained. It is the observers responsibility
* to unregister before it ceases to exist. * to unregister before it ceases to exist.
* </p> * </p>
* <p> * <p>
* Both observer and object equality are considered equal through pointer * Both observer and object equality are considered equal through pointer
* equality, so an observer observing multiple objects considered -isEqual: * equality, so an observer observing multiple objects considered
* will recieve multiple observer notifications,<br> * <code>isEqual:</code>
* objects considered -isEqual may contain different sets of observers, * will recieve multiple observer notifications,
* and an object can have multiple observers considered -isEqual:. * objects considered <code>isEqual:</code> may contain different sets of
* observers, and an object can have multiple observers considered
* <code>isEqual:</code>.
* </p> * </p>
*/ */
+ (void)addObserver: (id <EOObserving>)observer forObject: (id)object + (void)addObserver: (id <EOObserving>)observer forObject: (id)object
@ -186,7 +189,7 @@ static id lastObject;
/** /**
* This method is invoked from [NSObject-willChange] to dispatch * This method is invoked from [NSObject-willChange] to dispatch
* [EOObserving-objectWillChange:] to all observers registered * [(EOObserving)-objectWillChange:] to all observers registered
* to observe object. This method records the last object it was * to observe object. This method records the last object it was
* invoked with so that subsequent invocations with the same object * invoked with so that subsequent invocations with the same object
* get ignored. Invoke this method with nil as the object to insure * get ignored. Invoke this method with nil as the object to insure
@ -309,7 +312,7 @@ static id lastObject;
/** /**
* Increases the notification suppression count. When the count is * Increases the notification suppression count. When the count is
* non zero [+notifyObserversObjectWillChange:] invocations do nothing. * non zero [+notifyObserversObjectWillChange:] invocations do nothing.
* Call [+enableObserverNotificaion] a matching amount of times * Call [+enableObserverNotification] a matching amount of times
* to enable the dispatch of those notifications again. * to enable the dispatch of those notifications again.
*/ */
+ (void)suppressObserverNotification + (void)suppressObserverNotification
@ -321,9 +324,9 @@ static id lastObject;
* Decreases the notification suppression count. This should be called * Decreases the notification suppression count. This should be called
* to pair up [+suppressObserverNotification] invocations. When they * to pair up [+suppressObserverNotification] invocations. When they
* all have been paired up [+notifyObserversObjectWillChange:] will * all have been paired up [+notifyObserversObjectWillChange:] will
* continue to dispatch [EOObserving-objectWillChange:] methods again. * continue to dispatch [(EOObserving)-objectWillChange:] methods again.
* If this is invoked when the [+observerNotificationCount] is 0, this * If this is invoked when the [+observerNotificationSuppressCount] is 0,
* method raises an NSInternalInconsistencyException. * this method raises an NSInternalInconsistencyException.
*/ */
+ (void)enableObserverNotification + (void)enableObserverNotification
{ {
@ -348,7 +351,7 @@ static id lastObject;
/** /**
* Adds observer as an omniscient observer to receive * Adds observer as an omniscient observer to receive
* [EOObserving-objectWillChange:] for all objects and nil. * [(EOObserving)-objectWillChange:] for all objects and nil.
*/ */
+ (void)addOmniscientObserver: (id <EOObserving>)observer + (void)addOmniscientObserver: (id <EOObserving>)observer
{ {
@ -371,7 +374,7 @@ static id lastObject;
@implementation EODelayedObserver @implementation EODelayedObserver
/** /**
* EOObserving implementation which enqueues the receiver in the * [(EOObserving)] implementation which enqueues the receiver in the
* queue returned by observerQueue. * queue returned by observerQueue.
*/ */
- (void)objectWillChange: (id)subject - (void)objectWillChange: (id)subject
@ -400,13 +403,14 @@ static id lastObject;
} }
/** /**
* Invoked by [EODelayedObserverQueue-notifyObserverUpToPriority:] or * Invoked by [EODelayedObserverQueue-notifyObserversUpToPriority:] or
* [EODelayedObserverQueue-enqueueObserver:]. Overridden by subclasses * [EODelayedObserverQueue-enqueueObserver:]. Overridden by subclasses
* to process the delayed change notification. EODelayesObserver does * to process the delayed change notification. EODelayesObserver does
* nothing. * nothing.
*/ */
- (void)subjectChanged - (void)subjectChanged
{ {
return;
} }
/** /**
@ -424,14 +428,15 @@ static id lastObject;
/** /**
* EODelayedObserverQueue manages the delayed observer notifications * EODelayedObserverQueue manages the delayed observer notifications
* for [EODelayedObservers] that register with it. A delayed observer * for [EODelayedObserver] that register with it. A delayed observer
* may only register itself with one queue and a fixed priority. * may only register itself with one queue and a fixed priority.
* Upon [-notifyObserversUpToPriority:] all enqueued observers are sent * Upon [-notifyObserversUpToPriority:] all enqueued observers are sent
* [EODelyedObserver-subjectChanged] according to the EOObserverPriority * [EODelayedObserver-subjectChanged] according to the EOObserverPriority
* of the observer. The first time an observer is enqueued with * of the observer. The first time an observer is enqueued with
* [-enqueueObserver:] (with a priority other than * [-enqueueObserver:] (with a priority other than
* EOObserverPriorityImmediate) the queue registers itself with the * EOObserverPriorityImmediate) the queue registers itself with the
* [NSRunLoop-currentRunLoop] with EOFlushDelayedObserverRunLoopOrdering * <code>NSRunLoop currentRunLoop</code> with
* EOFlushDelayedObserverRunLoopOrdering
* to invoke [-notifyObserversUpToPriority:] with EOObserverPrioritySixth. * to invoke [-notifyObserversUpToPriority:] with EOObserverPrioritySixth.
* In general this mechanism is used by [EOAssociation] subclasses and * In general this mechanism is used by [EOAssociation] subclasses and
* in part [EODisplayGroup] or even [EOEditingContext]. * in part [EODisplayGroup] or even [EOEditingContext].
@ -482,11 +487,12 @@ static EODelayedObserverQueue *observerQueue;
* for the current processing.</p> * for the current processing.</p>
* <p>Upon the first invocation within a run loop, this method registers * <p>Upon the first invocation within a run loop, this method registers
* a callback method to have [-notifyObserversUpToPriority:] invoked * a callback method to have [-notifyObserversUpToPriority:] invoked
* with EOObserverPrioritySixth with the [NSRunLoop-currentRunLoop] with * with EOObserverPrioritySixth with the
* <code>NSRunLoop currentRunLoop </code>with
* EOFlushDelayedObserverRunLoopOrdering and the receivers run loop modes.</p> * EOFlushDelayedObserverRunLoopOrdering and the receivers run loop modes.</p>
* <p>The observer is not retained and should be removed from the receiver * <p>The observer is not retained and should be removed from the receiver
* with [-dequeueObserver:] during the EODelayedObservers [NSObject-dealloc] * with [-dequeueObserver:] during the EODelayedObservers
* method.</p> * <code>NSObject dealloc</code> method.</p>
*/ */
- (void)enqueueObserver: (EODelayedObserver *)observer - (void)enqueueObserver: (EODelayedObserver *)observer
{ {
@ -635,7 +641,7 @@ static EODelayedObserverQueue *observerQueue;
/** /**
* Sets the run loop modes the receiver uses when registering * Sets the run loop modes the receiver uses when registering
* for [-notifyObserversUpToPriority:] during [-enqueueObserver:]. * for [-notifyObserversUpToPriority:] during [-enqueueObserver:].
* (see [NSRunLoop]). * (see <code>NSRunLoop</code>).
*/ */
- (void)setRunLoopModes: (NSArray *)modes - (void)setRunLoopModes: (NSArray *)modes
{ {
@ -645,7 +651,7 @@ static EODelayedObserverQueue *observerQueue;
/** /**
* Returns the run loop modes the receiver uses when registering * Returns the run loop modes the receiver uses when registering
* for [-notifyObserversUpToPriority:] during [-enqueueObserver:]. * for [-notifyObserversUpToPriority:] during [-enqueueObserver:].
* (see [NSRunLoop]). * (see <code>NSRunLoop</code>).
*/ */
- (NSArray *)runLoopModes - (NSArray *)runLoopModes
{ {

4
EOControl/EOQualifier.h
View file

@ -63,7 +63,7 @@
+ (EOQualifier *)qualifierToMatchAllValues: (NSDictionary *)values; + (EOQualifier *)qualifierToMatchAllValues: (NSDictionary *)values;
+ (EOQualifier *)qualifierToMatchAnyValue: (NSDictionary *)values; + (EOQualifier *)qualifierToMatchAnyValue: (NSDictionary *)values;
- (NSException *)validateKeysWithRootClassDescription: (EOClassDescription *)classDesc; - (NSException *)validateKeysWithRootClassDescription: (EOClassDescription *)classDescription;
+ (NSArray *)allQualifierOperators; + (NSArray *)allQualifierOperators;
@ -83,7 +83,7 @@
- (NSString *)keyPathForBindingKey: (NSString *)key; - (NSString *)keyPathForBindingKey: (NSString *)key;
- (NSSet *)allQualifierKeys; - (NSSet *)allQualifierKeys;
- (void)addQualifierKeysToSet: (NSMutableSet *)qualKeys; - (void)addQualifierKeysToSet: (NSMutableSet *)keys;
- (BOOL)evaluateWithObject: (id)object; - (BOOL)evaluateWithObject: (id)object;

6
EOControl/EOSharedEditingContext.m
View file

@ -39,6 +39,7 @@ RCS_ID("$Id$")
#include <Foundation/NSNotification.h> #include <Foundation/NSNotification.h>
#include <Foundation/NSSet.h> #include <Foundation/NSSet.h>
#include <Foundation/NSString.h> #include <Foundation/NSString.h>
#include <Foundation/NSUndoManager.h>
#endif #endif
#include <GNUstepBase/GSLock.h> #include <GNUstepBase/GSLock.h>
@ -48,7 +49,6 @@ RCS_ID("$Id$")
#include "EOFetchSpecification.h" #include "EOFetchSpecification.h"
#include "EOGlobalID.h" #include "EOGlobalID.h"
#include "EOObjectStoreCoordinator.h" #include "EOObjectStoreCoordinator.h"
#include "EOUndoManager.h"
NSString *EODefaultSharedEditingContextWasInitializedNotification NSString *EODefaultSharedEditingContextWasInitializedNotification
@ -420,6 +420,7 @@ static EOSharedEditingContext *dfltSharedEditingContext = nil;
*/ */
- (void)reset - (void)reset
{ {
return;
} }
/** /**
@ -551,6 +552,7 @@ static EOSharedEditingContext *dfltSharedEditingContext = nil;
*/ */
- (void)validateChangesForSave - (void)validateChangesForSave
{ {
return;
} }
/** /**
@ -580,7 +582,7 @@ static EOSharedEditingContext *dfltSharedEditingContext = nil;
* Raises an NSInternalInconsistencyException * Raises an NSInternalInconsistencyException
* since objects in a shared editing context may not be modified. * since objects in a shared editing context may not be modified.
*/ */
- (void)objectWillChange: (id)object; - (void)objectWillChange: (id)object
{ {
[NSException raise: NSInternalInconsistencyException [NSException raise: NSInternalInconsistencyException
format: @"+[%@ deleteObject:] attempted to delete object in shared editing context", [self class]]; format: @"+[%@ deleteObject:] attempted to delete object in shared editing context", [self class]];

18
EOControl/EOUndoManager.h
View file

@ -27,21 +27,7 @@
#ifndef __EOUndoManager_h__ #ifndef __EOUndoManager_h__
#define __EOUndoManager_h__ #define __EOUndoManager_h__
#ifdef GNUSTEP #warning This file is deprecated. Use NSUndoManager.
#include <Foundation/NSUndoManager.h> #include <EOControl/EODeprecated.h>
#else
#include <Foundation/Foundation.h>
#endif
@interface EOUndoManager : NSUndoManager
- (void)forgetAllWithTarget: (id)param0;
- (void)forgetAll;
- (void)registerUndoWithTarget: (id)param0
selector: (SEL)param1
arg: (id)param2;
- (void)reenableUndoRegistration;
@end
#endif // __EOUndoManager_h__ #endif // __EOUndoManager_h__

6
EOControl/EOUndoManager.m
View file

@ -46,7 +46,7 @@ RCS_ID("$Id$")
@implementation EOUndoManager @implementation EOUndoManager
- (void) forgetAllWithTarget: (id)param0 - (void) forgetAllWithTarget: (id)target
{ {
EOFLOGObjectFnStart(); EOFLOGObjectFnStart();
@ -65,8 +65,8 @@ RCS_ID("$Id$")
} }
- (void) registerUndoWithTarget: (id)target - (void) registerUndoWithTarget: (id)target
selector: (SEL)sel selector: (SEL)selector
arg: (id)arg arg: (id)argument
{ {
EOFLOGObjectFnStart(); EOFLOGObjectFnStart();

24
EOControl/GNUmakefile
View file

@ -27,6 +27,7 @@
include $(GNUSTEP_MAKEFILES)/common.make include $(GNUSTEP_MAKEFILES)/common.make
include ../Version include ../Version
include ../common.make
# The library to be compiled # The library to be compiled
NATIVE_LIBRARY_NAME=EOControl NATIVE_LIBRARY_NAME=EOControl
@ -104,26 +105,19 @@ EODeprecated.h \
EOControl.h EOControl.h
DOCUMENT_NAME = EOControl DOCUMENT_NAME = EOControl
EOControl_AUTOGSDOC_HEADERS = $(EOControl_HEADER_FILES)
EOControl_AUTOGSDOC_SOURCE = $(EOControl_OBJC_FILES) EOControl_AGSDOC_FILES = EOControl.gsdoc \
EOControl_HEADER_FILES_DIR = $(HEADER_DIR) $(EOControl_HEADER_FILES) \
EOControl_AGSDOC_FILES = EOControl.gsdoc $(EOControl_AUTOGSDOC_HEADERS) $(EOControl_OBJC_FILES)
#$(EOControl_AUTOGSDOC_SOURCE)
EOControl_AGSDOC_FLAGS = \ EOControl_AGSDOC_FLAGS = \
-Declared EOControl \ -Declared EOControl \
-Standards YES \
-SystemProjects System \
-Project EOControl \ -Project EOControl \
-WordMap '{\ -Up EOControl \
FOUNDATION_EXPORT=extern;FOUNDATION_STATIC_INLINE="";\ $(GDL2_AGSDOC_FLAGS)
GS_GEOM_SCOPE=extern;GS_GEOM_ATTR="";\
GS_EXPORT=extern;GS_DECLARE="";\
GS_RANGE_SCOPE=extern;GS_RANGE_ATTR="";\
GS_ZONE_SCOPE=extern;GS_ZONE_ATTR="";\
}' -Up EOControl
-include Makefile.preamble -include Makefile.preamble
include ../common.make include ../variable-processing.make
-include GNUmakefile.local -include GNUmakefile.local
include $(GNUSTEP_MAKEFILES)/native-library.make include $(GNUSTEP_MAKEFILES)/native-library.make

13
EOInterface/GNUmakefile
View file

@ -27,6 +27,7 @@
include $(GNUSTEP_MAKEFILES)/common.make include $(GNUSTEP_MAKEFILES)/common.make
include ../Version include ../Version
include ../common.make
# The library to be compiled # The library to be compiled
NATIVE_LIBRARY_NAME=EOInterface NATIVE_LIBRARY_NAME=EOInterface
@ -87,19 +88,13 @@ EOInterface_AGSDOC_FILES = EOInterface.gsdoc $(EOInterface_AUTOGSDOC_HEADERS)
#$(EOInterface_AUTOGSDOC_SOURCE) #$(EOInterface_AUTOGSDOC_SOURCE)
EOInterface_AGSDOC_FLAGS = \ EOInterface_AGSDOC_FLAGS = \
-Declared EOInterface \ -Declared EOInterface \
-Standards YES \
-Project EOInterface \ -Project EOInterface \
-WordMap '{\ -Up EOInterface \
FOUNDATION_EXPORT=extern;FOUNDATION_STATIC_INLINE="";\ $(GDL2_AGSDOC_FLAGS)
GS_GEOM_SCOPE=extern;GS_GEOM_ATTR="";\
GS_EXPORT=extern;GS_DECLARE="";\
GS_RANGE_SCOPE=extern;GS_RANGE_ATTR="";\
GS_ZONE_SCOPE=extern;GS_ZONE_ATTR="";\
}' -Up EOInterface
-include Makefile.preamble -include Makefile.preamble
include ../common.make include ../variable-processing.make
-include GNUmakefile.local -include GNUmakefile.local
include $(GNUSTEP_MAKEFILES)/native-library.make include $(GNUSTEP_MAKEFILES)/native-library.make

3
EOModeler/GNUmakefile
View file

@ -27,6 +27,7 @@
include $(GNUSTEP_MAKEFILES)/common.make include $(GNUSTEP_MAKEFILES)/common.make
include ../Version include ../Version
include ../common.make
# The library to be compiled # The library to be compiled
NATIVE_LIBRARY_NAME=EOModeler NATIVE_LIBRARY_NAME=EOModeler
@ -59,7 +60,7 @@ EOModelerEditor.h \
EODefines.h EODefines.h
-include Makefile.preamble -include Makefile.preamble
include ../common.make include ../variable-processing.make
-include GNUmakefile.local -include GNUmakefile.local

4
GDL2Palette/GNUmakefile
View file

@ -25,7 +25,7 @@
include $(GNUSTEP_MAKEFILES)/common.make include $(GNUSTEP_MAKEFILES)/common.make
include ../gdl2.make include ../common.make
PALETTE_NAME=GDL2 PALETTE_NAME=GDL2
GDL2_PRINCIPAL_CLASS = GDL2Palette GDL2_PRINCIPAL_CLASS = GDL2Palette
@ -50,7 +50,7 @@ GDL2_OBJC_FILES= \
KeyWrapper.m \ KeyWrapper.m \
DisplayGroupInspector.m DisplayGroupInspector.m
include ../common.make include ../variable-processing.make
PALETTE_LIBS=$(ADDITIONAL_OBJC_LIBS) PALETTE_LIBS=$(ADDITIONAL_OBJC_LIBS)
include $(GNUSTEP_MAKEFILES)/palette.make include $(GNUSTEP_MAKEFILES)/palette.make

13
Tools/GNUmakefile
View file

@ -27,6 +27,7 @@
include $(GNUSTEP_MAKEFILES)/common.make include $(GNUSTEP_MAKEFILES)/common.make
include ../Version include ../Version
include ../common.make
# The library to be compiled # The library to be compiled
TOOL_NAME=gdlgsdoc eoutil TOOL_NAME=gdlgsdoc eoutil
@ -65,15 +66,9 @@ gdl2gsdoc_AGSDOC_FILES = gdl2gsdoc.gsdoc $(gdl2gsdoc_AUTOGSDOC_HEADERS)
#$(gdl2gsdoc_AUTOGSDOC_SOURCE) #$(gdl2gsdoc_AUTOGSDOC_SOURCE)
gdl2gsdoc_AGSDOC_FLAGS = \ gdl2gsdoc_AGSDOC_FLAGS = \
-Declared gdlgsdoc \ -Declared gdlgsdoc \
-Standards YES \
-Project gdl2gsdoc \ -Project gdl2gsdoc \
-WordMap '{\ -Up gdl2gsdoc \
FOUNDATION_EXPORT=extern;FOUNDATION_STATIC_INLINE="";\ $(GDL2_AGSDOC_FLAGS)
GS_GEOM_SCOPE=extern;GS_GEOM_ATTR="";\
GS_EXPORT=extern;GS_DECLARE="";\
GS_RANGE_SCOPE=extern;GS_RANGE_ATTR="";\
GS_ZONE_SCOPE=extern;GS_ZONE_ATTR="";\
}' -Up gdl2gsdoc
eoutil_OBJC_FILES = eoutil.m eoutil_OBJC_FILES = eoutil.m
@ -82,7 +77,7 @@ eoutil_HEADER_FILES =
-include Makefile.preamble -include Makefile.preamble
include ../common.make include ../variable-processing.make
-include GNUmakefile.local -include GNUmakefile.local

12
Version
View file

@ -8,10 +8,10 @@ GNUSTEP_GCC=2.95.2
MAJOR_VERSION=0 MAJOR_VERSION=0
MINOR_VERSION=10 MINOR_VERSION=10
SUBMINOR_VERSION=1 SUBMINOR_VERSION=1
GDL_VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${SUBMINOR_VERSION} GDL2_VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${SUBMINOR_VERSION}
VERSION=${GDL_VERSION} VERSION=${GDL2_VERSION}
GDL_FTP_MACHINE=ftp.gnustep.org GDL2_FTP_MACHINE=ftp.gnustep.org
GDL_FTP_DIRECTORY=pub/gnustep/gdl2 GDL2_FTP_DIRECTORY=pub/gnustep/gdl2
GDL_SNAP_FTP_MACHINE=ftp.gnustep.org GDL2_SNAP_FTP_MACHINE=ftp.gnustep.org
GDL_SNAP_FTP_DIRECTORY=pub/daily-snapshots GDL2_SNAP_FTP_DIRECTORY=pub/daily-snapshots

12
common.make
View file

@ -1,6 +1,8 @@
ifeq ($(FOUNDATION_LIB), apple)
ADDITIONAL_LIB_DIRS += $(foreach libdir,$(ADDITIONAL_NATIVE_LIB_DIRS),-F$(libdir))
else
ADDITIONAL_LIB_DIRS += $(foreach libdir,$(ADDITIONAL_NATIVE_LIB_DIRS),-L$(libdir)/$(GNUSTEP_OBJ_DIR))
endif
GDL2_AGSDOC_FLAGS = \
-WordMap '{ \
RCS_ID = "//"; \
GDL2CONTROL_EXPORT = extern; \
}'
# -SystemProjects System \

4
config.h.in
View file

@ -38,7 +38,7 @@
#define RCS_ID(name) \ #define RCS_ID(name) \
static const char rcsId[] = name; \ static const char RCSID[] = name; \
static const char *__rcsId_hack() {__rcsId_hack(); return rcsId;} static const char *getRCSID() { if (0) getRCSID(); return RCSID;}
#endif /* __config_h__ */ #endif /* __config_h__ */

5
variable-processing.make Normal file
View file

@ -0,0 +1,5 @@
ifeq ($(FOUNDATION_LIB), apple)
ADDITIONAL_LIB_DIRS += $(foreach libdir,$(ADDITIONAL_NATIVE_LIB_DIRS),-F$(libdir))
else
ADDITIONAL_LIB_DIRS += $(foreach libdir,$(ADDITIONAL_NATIVE_LIB_DIRS),-L$(libdir)/$(GNUSTEP_OBJ_DIR))
endif