Skip to content

Commit

Permalink
Merge pull request rentzsch#94 from protocool/master
Browse files Browse the repository at this point in the history
[NEW] Per-entity custom base classes via `mogenerator.customBaseClass` entity userinfo key (overrides `--base-class-force`). ([Trevor Squires](rentzsch#94))
  • Loading branch information
rentzsch committed Mar 9, 2012
2 parents 53c5c2d + dd012a8 commit 3aea302
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
1 change: 1 addition & 0 deletions mogenerator.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
@interface NSEntityDescription (customBaseClass)
- (BOOL)hasCustomSuperentity;
- (NSString*)customSuperentity;
- (NSString*)forcedCustomBaseClass;
- (void)_processPredicate:(NSPredicate*)predicate_ bindings:(NSMutableArray*)bindings_;
- (NSArray*)prettyFetchRequests;
@end
Expand Down
9 changes: 7 additions & 2 deletions mogenerator.m
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,22 @@ - (BOOL)hasCustomSuperentity {
}
}
- (NSString*)customSuperentity {
if(!gCustomBaseClassForced) {
NSString *forcedBaseClass = [self forcedCustomBaseClass];
if(!forcedBaseClass) {
NSEntityDescription *superentity = [self superentity];
if (superentity) {
return [superentity managedObjectClassName];
} else {
return gCustomBaseClass ? gCustomBaseClass : @"NSManagedObject";
}
} else {
return gCustomBaseClassForced;
return forcedBaseClass;
}
}
- (NSString*)forcedCustomBaseClass {
NSString* userInfoCustomBaseClass = [[self userInfo] objectForKey:@"mogenerator.customBaseClass"];
return userInfoCustomBaseClass ? userInfoCustomBaseClass : gCustomBaseClassForced;
}
/** @TypeInfo NSAttributeDescription */
- (NSArray*)noninheritedAttributes {
NSArray *sortDescriptors = [NSArray arrayWithObject:[NSSortDescriptor sortDescriptorWithKey:@"name" ascending:YES]];
Expand Down

0 comments on commit 3aea302

Please sign in to comment.