diff --git a/mogeneratorTestMule/MOs/_ChildMO.h b/mogeneratorTestMule/MOs/_ChildMO.h index 2087f6d7..e8fce3ab 100644 --- a/mogeneratorTestMule/MOs/_ChildMO.h +++ b/mogeneratorTestMule/MOs/_ChildMO.h @@ -15,23 +15,15 @@ -- (NSString*)childName; -- (void)setChildName:(NSString*)value_; -#if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -@property (retain) NSString *childName; -#endif +@property (nonatomic, retain) NSString *childName; //- (BOOL)validateChildName:(id*)value_ error:(NSError**)error_; -- (ParentMO*)parent; -- (void)setParent:(ParentMO*)value_; +@property (nonatomic, retain) ParentMO* parent; //- (BOOL)validateParent:(id*)value_ error:(NSError**)error_; -#if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -@property (retain) ParentMO* parent; -#endif diff --git a/mogeneratorTestMule/MOs/_ChildMO.m b/mogeneratorTestMule/MOs/_ChildMO.m index a07cbbc4..ecd7c973 100644 --- a/mogeneratorTestMule/MOs/_ChildMO.m +++ b/mogeneratorTestMule/MOs/_ChildMO.m @@ -19,38 +19,14 @@ - (ChildMOID*)objectID { -- (NSString*)childName { - [self willAccessValueForKey:@"childName"]; - NSString *result = [self primitiveValueForKey:@"childName"]; - [self didAccessValueForKey:@"childName"]; - return result; -} - -- (void)setChildName:(NSString*)value_ { - [self willChangeValueForKey:@"childName"]; - [self setPrimitiveValue:value_ forKey:@"childName"]; - [self didChangeValueForKey:@"childName"]; -} - +@dynamic childName; - -- (ParentMO*)parent { - [self willAccessValueForKey:@"parent"]; - ParentMO *result = [self primitiveValueForKey:@"parent"]; - [self didAccessValueForKey:@"parent"]; - return result; -} - -- (void)setParent:(ParentMO*)value_ { - [self willChangeValueForKey:@"parent"]; - [self setPrimitiveValue:value_ forKey:@"parent"]; - [self didChangeValueForKey:@"parent"]; -} +@dynamic parent; diff --git a/mogeneratorTestMule/MOs/_HumanMO.h b/mogeneratorTestMule/MOs/_HumanMO.h index 1042baed..17c62cc2 100644 --- a/mogeneratorTestMule/MOs/_HumanMO.h +++ b/mogeneratorTestMule/MOs/_HumanMO.h @@ -15,21 +15,13 @@ -- (NSData*)hairColorStorage; -- (void)setHairColorStorage:(NSData*)value_; -#if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -@property (retain) NSData *hairColorStorage; -#endif +@property (nonatomic, retain) NSData *hairColorStorage; //- (BOOL)validateHairColorStorage:(id*)value_ error:(NSError**)error_; -- (NSString*)humanName; -- (void)setHumanName:(NSString*)value_; -#if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -@property (retain) NSString *humanName; -#endif +@property (nonatomic, retain) NSString *humanName; //- (BOOL)validateHumanName:(id*)value_ error:(NSError**)error_; @@ -38,12 +30,8 @@ -- (NSManagedObject*)meaninglessRelationship; -- (void)setMeaninglessRelationship:(NSManagedObject*)value_; +@property (nonatomic, retain) NSManagedObject* meaninglessRelationship; //- (BOOL)validateMeaninglessRelationship:(id*)value_ error:(NSError**)error_; -#if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -@property (retain) NSManagedObject* meaninglessRelationship; -#endif diff --git a/mogeneratorTestMule/MOs/_HumanMO.m b/mogeneratorTestMule/MOs/_HumanMO.m index 7126346f..a15c1a2c 100644 --- a/mogeneratorTestMule/MOs/_HumanMO.m +++ b/mogeneratorTestMule/MOs/_HumanMO.m @@ -19,58 +19,23 @@ - (HumanMOID*)objectID { -- (NSData*)hairColorStorage { - [self willAccessValueForKey:@"hairColorStorage"]; - NSData *result = [self primitiveValueForKey:@"hairColorStorage"]; - [self didAccessValueForKey:@"hairColorStorage"]; - return result; -} - -- (void)setHairColorStorage:(NSData*)value_ { - [self willChangeValueForKey:@"hairColorStorage"]; - [self setPrimitiveValue:value_ forKey:@"hairColorStorage"]; - [self didChangeValueForKey:@"hairColorStorage"]; -} - - - +@dynamic hairColorStorage; -- (NSString*)humanName { - [self willAccessValueForKey:@"humanName"]; - NSString *result = [self primitiveValueForKey:@"humanName"]; - [self didAccessValueForKey:@"humanName"]; - return result; -} -- (void)setHumanName:(NSString*)value_ { - [self willChangeValueForKey:@"humanName"]; - [self setPrimitiveValue:value_ forKey:@"humanName"]; - [self didChangeValueForKey:@"humanName"]; -} +@dynamic humanName; - -- (NSManagedObject*)meaninglessRelationship { - [self willAccessValueForKey:@"meaninglessRelationship"]; - NSManagedObject *result = [self primitiveValueForKey:@"meaninglessRelationship"]; - [self didAccessValueForKey:@"meaninglessRelationship"]; - return result; -} -- (void)setMeaninglessRelationship:(NSManagedObject*)value_ { - [self willChangeValueForKey:@"meaninglessRelationship"]; - [self setPrimitiveValue:value_ forKey:@"meaninglessRelationship"]; - [self didChangeValueForKey:@"meaninglessRelationship"]; -} +@dynamic meaninglessRelationship; diff --git a/mogeneratorTestMule/MOs/_ParentMO.h b/mogeneratorTestMule/MOs/_ParentMO.h index ea7abf56..08aa919b 100644 --- a/mogeneratorTestMule/MOs/_ParentMO.h +++ b/mogeneratorTestMule/MOs/_ParentMO.h @@ -15,11 +15,7 @@ -- (NSNumber*)myInt16Transient; -- (void)setMyInt16Transient:(NSNumber*)value_; -#if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -@property (retain) NSNumber *myInt16Transient; -#endif +@property (nonatomic, retain) NSNumber *myInt16Transient; - (short)myInt16TransientValue; - (void)setMyInt16TransientValue:(short)value_; @@ -28,61 +24,37 @@ -- (NSString*)parentName; -- (void)setParentName:(NSString*)value_; -#if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -@property (retain) NSString *parentName; -#endif +@property (nonatomic, retain) NSString *parentName; //- (BOOL)validateParentName:(id*)value_ error:(NSError**)error_; -- (NSObject*)myTransformableSansClassName; -- (void)setMyTransformableSansClassName:(NSObject*)value_; -#if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -@property (retain) NSObject *myTransformableSansClassName; -#endif +@property (nonatomic, retain) NSObject *myTransformableSansClassName; //- (BOOL)validateMyTransformableSansClassName:(id*)value_ error:(NSError**)error_; -- (NSDecimalNumber*)myDecimal; -- (void)setMyDecimal:(NSDecimalNumber*)value_; -#if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -@property (retain) NSDecimalNumber *myDecimal; -#endif +@property (nonatomic, retain) NSDecimalNumber *myDecimal; //- (BOOL)validateMyDecimal:(id*)value_ error:(NSError**)error_; -- (NSDate*)myDate; -- (void)setMyDate:(NSDate*)value_; -#if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -@property (retain) NSDate *myDate; -#endif +@property (nonatomic, retain) NSDate *myDate; //- (BOOL)validateMyDate:(id*)value_ error:(NSError**)error_; -- (NSColor*)myTransformableWithClassName; -- (void)setMyTransformableWithClassName:(NSColor*)value_; -#if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -@property (retain) NSColor *myTransformableWithClassName; -#endif +@property (nonatomic, retain) NSColor *myTransformableWithClassName; //- (BOOL)validateMyTransformableWithClassName:(id*)value_ error:(NSError**)error_; -- (NSNumber*)myBoolean; -- (void)setMyBoolean:(NSNumber*)value_; -#if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -@property (retain) NSNumber *myBoolean; -#endif +@property (nonatomic, retain) NSNumber *myBoolean; - (BOOL)myBooleanValue; - (void)setMyBooleanValue:(BOOL)value_; @@ -91,11 +63,7 @@ -- (NSNumber*)myInt64; -- (void)setMyInt64:(NSNumber*)value_; -#if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -@property (retain) NSNumber *myInt64; -#endif +@property (nonatomic, retain) NSNumber *myInt64; - (long long)myInt64Value; - (void)setMyInt64Value:(long long)value_; @@ -104,11 +72,7 @@ -- (NSNumber*)myDouble; -- (void)setMyDouble:(NSNumber*)value_; -#if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -@property (retain) NSNumber *myDouble; -#endif +@property (nonatomic, retain) NSNumber *myDouble; - (double)myDoubleValue; - (void)setMyDoubleValue:(double)value_; @@ -117,11 +81,7 @@ -- (NSNumber*)myInt16; -- (void)setMyInt16:(NSNumber*)value_; -#if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -@property (retain) NSNumber *myInt16; -#endif +@property (nonatomic, retain) NSNumber *myInt16; - (short)myInt16Value; - (void)setMyInt16Value:(short)value_; @@ -130,11 +90,7 @@ -- (NSNumber*)myFloat; -- (void)setMyFloat:(NSNumber*)value_; -#if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -@property (retain) NSNumber *myFloat; -#endif +@property (nonatomic, retain) NSNumber *myFloat; - (float)myFloatValue; - (void)setMyFloatValue:(float)value_; @@ -143,31 +99,19 @@ -- (NSData*)myBinaryData; -- (void)setMyBinaryData:(NSData*)value_; -#if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -@property (retain) NSData *myBinaryData; -#endif +@property (nonatomic, retain) NSData *myBinaryData; //- (BOOL)validateMyBinaryData:(id*)value_ error:(NSError**)error_; -- (NSString*)myString; -- (void)setMyString:(NSString*)value_; -#if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -@property (retain) NSString *myString; -#endif +@property (nonatomic, retain) NSString *myString; //- (BOOL)validateMyString:(id*)value_ error:(NSError**)error_; -- (NSNumber*)myInt32; -- (void)setMyInt32:(NSNumber*)value_; -#if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -@property (retain) NSNumber *myInt32; -#endif +@property (nonatomic, retain) NSNumber *myInt32; - (int)myInt32Value; - (void)setMyInt32Value:(int)value_; @@ -177,15 +121,13 @@ -- (NSSet*)children; +@property (nonatomic, retain) NSSet* children; + - (void)addChildren:(NSSet*)value_; - (void)removeChildren:(NSSet*)value_; - (void)addChildrenObject:(ChildMO*)value_; - (void)removeChildrenObject:(ChildMO*)value_; - (NSMutableSet*)childrenSet; -#if defined(MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -@property (retain) NSSet* children; -#endif diff --git a/mogeneratorTestMule/MOs/_ParentMO.m b/mogeneratorTestMule/MOs/_ParentMO.m index 1833bc98..46128e72 100644 --- a/mogeneratorTestMule/MOs/_ParentMO.m +++ b/mogeneratorTestMule/MOs/_ParentMO.m @@ -19,18 +19,7 @@ - (ParentMOID*)objectID { -- (NSNumber*)myInt16Transient { - [self willAccessValueForKey:@"myInt16Transient"]; - NSNumber *result = [self primitiveValueForKey:@"myInt16Transient"]; - [self didAccessValueForKey:@"myInt16Transient"]; - return result; -} - -- (void)setMyInt16Transient:(NSNumber*)value_ { - [self willChangeValueForKey:@"myInt16Transient"]; - [self setPrimitiveValue:value_ forKey:@"myInt16Transient"]; - [self didChangeValueForKey:@"myInt16Transient"]; -} +@dynamic myInt16Transient; @@ -48,108 +37,42 @@ - (void)setMyInt16TransientValue:(short)value_ { -- (NSString*)parentName { - [self willAccessValueForKey:@"parentName"]; - NSString *result = [self primitiveValueForKey:@"parentName"]; - [self didAccessValueForKey:@"parentName"]; - return result; -} +@dynamic parentName; -- (void)setParentName:(NSString*)value_ { - [self willChangeValueForKey:@"parentName"]; - [self setPrimitiveValue:value_ forKey:@"parentName"]; - [self didChangeValueForKey:@"parentName"]; -} +@dynamic myTransformableSansClassName; -- (NSObject*)myTransformableSansClassName { - [self willAccessValueForKey:@"myTransformableSansClassName"]; - NSObject *result = [self primitiveValueForKey:@"myTransformableSansClassName"]; - [self didAccessValueForKey:@"myTransformableSansClassName"]; - return result; -} -- (void)setMyTransformableSansClassName:(NSObject*)value_ { - [self willChangeValueForKey:@"myTransformableSansClassName"]; - [self setPrimitiveValue:value_ forKey:@"myTransformableSansClassName"]; - [self didChangeValueForKey:@"myTransformableSansClassName"]; -} +@dynamic myDecimal; -- (NSDecimalNumber*)myDecimal { - [self willAccessValueForKey:@"myDecimal"]; - NSDecimalNumber *result = [self primitiveValueForKey:@"myDecimal"]; - [self didAccessValueForKey:@"myDecimal"]; - return result; -} -- (void)setMyDecimal:(NSDecimalNumber*)value_ { - [self willChangeValueForKey:@"myDecimal"]; - [self setPrimitiveValue:value_ forKey:@"myDecimal"]; - [self didChangeValueForKey:@"myDecimal"]; -} +@dynamic myDate; -- (NSDate*)myDate { - [self willAccessValueForKey:@"myDate"]; - NSDate *result = [self primitiveValueForKey:@"myDate"]; - [self didAccessValueForKey:@"myDate"]; - return result; -} -- (void)setMyDate:(NSDate*)value_ { - [self willChangeValueForKey:@"myDate"]; - [self setPrimitiveValue:value_ forKey:@"myDate"]; - [self didChangeValueForKey:@"myDate"]; -} - - - - -- (NSColor*)myTransformableWithClassName { - [self willAccessValueForKey:@"myTransformableWithClassName"]; - NSColor *result = [self primitiveValueForKey:@"myTransformableWithClassName"]; - [self didAccessValueForKey:@"myTransformableWithClassName"]; - return result; -} - -- (void)setMyTransformableWithClassName:(NSColor*)value_ { - [self willChangeValueForKey:@"myTransformableWithClassName"]; - [self setPrimitiveValue:value_ forKey:@"myTransformableWithClassName"]; - [self didChangeValueForKey:@"myTransformableWithClassName"]; -} - +@dynamic myTransformableWithClassName; -- (NSNumber*)myBoolean { - [self willAccessValueForKey:@"myBoolean"]; - NSNumber *result = [self primitiveValueForKey:@"myBoolean"]; - [self didAccessValueForKey:@"myBoolean"]; - return result; -} -- (void)setMyBoolean:(NSNumber*)value_ { - [self willChangeValueForKey:@"myBoolean"]; - [self setPrimitiveValue:value_ forKey:@"myBoolean"]; - [self didChangeValueForKey:@"myBoolean"]; -} +@dynamic myBoolean; @@ -167,18 +90,7 @@ - (void)setMyBooleanValue:(BOOL)value_ { -- (NSNumber*)myInt64 { - [self willAccessValueForKey:@"myInt64"]; - NSNumber *result = [self primitiveValueForKey:@"myInt64"]; - [self didAccessValueForKey:@"myInt64"]; - return result; -} - -- (void)setMyInt64:(NSNumber*)value_ { - [self willChangeValueForKey:@"myInt64"]; - [self setPrimitiveValue:value_ forKey:@"myInt64"]; - [self didChangeValueForKey:@"myInt64"]; -} +@dynamic myInt64; @@ -196,18 +108,7 @@ - (void)setMyInt64Value:(long long)value_ { -- (NSNumber*)myDouble { - [self willAccessValueForKey:@"myDouble"]; - NSNumber *result = [self primitiveValueForKey:@"myDouble"]; - [self didAccessValueForKey:@"myDouble"]; - return result; -} - -- (void)setMyDouble:(NSNumber*)value_ { - [self willChangeValueForKey:@"myDouble"]; - [self setPrimitiveValue:value_ forKey:@"myDouble"]; - [self didChangeValueForKey:@"myDouble"]; -} +@dynamic myDouble; @@ -225,18 +126,7 @@ - (void)setMyDoubleValue:(double)value_ { -- (NSNumber*)myInt16 { - [self willAccessValueForKey:@"myInt16"]; - NSNumber *result = [self primitiveValueForKey:@"myInt16"]; - [self didAccessValueForKey:@"myInt16"]; - return result; -} - -- (void)setMyInt16:(NSNumber*)value_ { - [self willChangeValueForKey:@"myInt16"]; - [self setPrimitiveValue:value_ forKey:@"myInt16"]; - [self didChangeValueForKey:@"myInt16"]; -} +@dynamic myInt16; @@ -254,18 +144,7 @@ - (void)setMyInt16Value:(short)value_ { -- (NSNumber*)myFloat { - [self willAccessValueForKey:@"myFloat"]; - NSNumber *result = [self primitiveValueForKey:@"myFloat"]; - [self didAccessValueForKey:@"myFloat"]; - return result; -} - -- (void)setMyFloat:(NSNumber*)value_ { - [self willChangeValueForKey:@"myFloat"]; - [self setPrimitiveValue:value_ forKey:@"myFloat"]; - [self didChangeValueForKey:@"myFloat"]; -} +@dynamic myFloat; @@ -283,54 +162,21 @@ - (void)setMyFloatValue:(float)value_ { -- (NSData*)myBinaryData { - [self willAccessValueForKey:@"myBinaryData"]; - NSData *result = [self primitiveValueForKey:@"myBinaryData"]; - [self didAccessValueForKey:@"myBinaryData"]; - return result; -} - -- (void)setMyBinaryData:(NSData*)value_ { - [self willChangeValueForKey:@"myBinaryData"]; - [self setPrimitiveValue:value_ forKey:@"myBinaryData"]; - [self didChangeValueForKey:@"myBinaryData"]; -} - - +@dynamic myBinaryData; -- (NSString*)myString { - [self willAccessValueForKey:@"myString"]; - NSString *result = [self primitiveValueForKey:@"myString"]; - [self didAccessValueForKey:@"myString"]; - return result; -} -- (void)setMyString:(NSString*)value_ { - [self willChangeValueForKey:@"myString"]; - [self setPrimitiveValue:value_ forKey:@"myString"]; - [self didChangeValueForKey:@"myString"]; -} +@dynamic myString; -- (NSNumber*)myInt32 { - [self willAccessValueForKey:@"myInt32"]; - NSNumber *result = [self primitiveValueForKey:@"myInt32"]; - [self didAccessValueForKey:@"myInt32"]; - return result; -} -- (void)setMyInt32:(NSNumber*)value_ { - [self willChangeValueForKey:@"myInt32"]; - [self setPrimitiveValue:value_ forKey:@"myInt32"]; - [self didChangeValueForKey:@"myInt32"]; -} +@dynamic myInt32; @@ -348,20 +194,9 @@ - (void)setMyInt32Value:(int)value_ { - - -- (NSSet*)children { - [self willAccessValueForKey:@"children"]; - NSSet *result = [self primitiveValueForKey:@"children"]; - [self didAccessValueForKey:@"children"]; - return result; -} +@dynamic children; -- (void)setChildren:(NSSet*)value_ { - [self willChangeValueForKey:@"children" withSetMutation:NSKeyValueSetSetMutation usingObjects:value_]; - [[self primitiveValueForKey:@"children"] setSet:value_]; - [self didChangeValueForKey:@"children" withSetMutation:NSKeyValueSetSetMutation usingObjects:value_]; -} + - (void)addChildren:(NSSet*)value_ { [self willChangeValueForKey:@"children" withSetMutation:NSKeyValueUnionSetMutation usingObjects:value_]; @@ -397,6 +232,7 @@ - (NSMutableSet*)childrenSet { [self didAccessValueForKey:@"children"]; return result; } +