Merge pull request rentzsch#136 from davidAtGVC/master

Small defect fixed for when the base class is from an external library and a model has inheritance
ddrccw · Jan 14, 2013 · f150421 · f150421
2 parents 4c979d4 + 838b5c0
commit f150421
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/mogenerator.h b/mogenerator.h
@@ -21,6 +21,7 @@
 @end
 
 @interface NSEntityDescription (customBaseClass)
+- (BOOL)hasSuperentity;
 - (BOOL)hasCustomSuperentity;
 - (NSString*)customSuperentity;
 - (NSString*)forcedCustomBaseClass;

diff --git a/mogenerator.m b/mogenerator.m
@@ -79,6 +79,14 @@ - (BOOL)hasCustomBaseCaseImport {
 - (NSString*)baseClassImport {
     return gCustomBaseClassImport;
 }
+- (BOOL)hasSuperentity {
+    NSEntityDescription *superentity = [self superentity];
+    if (superentity) {
+        return YES;
+    }
+    return NO;
+}
+
 - (BOOL)hasCustomSuperentity {
     NSString *forcedBaseClass = [self forcedCustomBaseClass];
     if (!forcedBaseClass) {

diff --git a/templates/machine.h.motemplate b/templates/machine.h.motemplate
@@ -2,7 +2,8 @@
 // Make changes to <$managedObjectClassName$>.h instead.
 
 #import <CoreData/CoreData.h>
-<$if hasCustomSuperentity$>#import <$if hasCustomBaseCaseImport$><$baseClassImport$><$else$>"<$customSuperentity$>.h"<$endif$><$endif$>
+<$if hasCustomSuperentity$><$if hasSuperentity$>#import "<$customSuperentity$>.h"
+<$else$><$if hasCustomBaseCaseImport$>#import <$baseClassImport$><$else$>#import "<$customSuperentity$>.h"<$endif$><$endif$><$endif$>
 
 extern const struct <$managedObjectClassName$>Attributes {<$foreach Attribute noninheritedAttributes do$>
 	<$if TemplateVar.arc$>__unsafe_unretained<$endif$> NSString *<$Attribute.name$>;<$endforeach do$>