* EOControl/EOMutableKnownKeyDictionary.m

removed __PRETTY_FUNCTION__ from Asserts
removed NSLogs
* EOModeler/EOModelExtensions.m
added - (NSString *)cScalarTypeString
* DBModeler/CodeGenerator.h/m: new file
Added a Code Generator like EOGenerator from www.rubicode.com



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@30256 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,12 @@
+2010-04-29  David Wetzel  <dave@turbocat.de>
+    * EOControl/EOMutableKnownKeyDictionary.m
+    removed __PRETTY_FUNCTION__ from Asserts
+    removed NSLogs
+    * EOModeler/EOModelExtensions.m
+    added - (NSString *)cScalarTypeString
+    * DBModeler/CodeGenerator.h/m: new file
+    Added a Code Generator like EOGenerator from www.rubicode.com
+
 2010-04-26  David Wetzel  <dave@turbocat.de>
 
 	* EOAdaptors/PostgreSQLAdaptor/PostgreSQLChannel.h/m

DBModeler/CodeGenerator.h

@@ -0,0 +1,49 @@
+/**
+  CodeGenerator.h
+  Created by David Wetzel on 16.11.2008.
+
+ This file is part of DBModeler.
+
+<license>
+DBModeler is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+DBModeler is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with DBModeler; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+</license>
+**/
+
+#import <Cocoa/Cocoa.h>
+#import <EOAccess/EOModel.h>
+
+#ifndef CodeGenerator_h
+#define CodeGenerator_h
+
+@interface NSString (GeneratorAddtions)
+
+- (NSString *)initialCapitalString;
+- (NSString *)initialLowercaseString;
+
+@end
+
+@interface CodeGenerator : NSObject
+{
+  NSString  * _generatedClassPath;
+  NSString  * _subclassPath;
+  NSString  * _superclassName;
+  EOModel   * _model;
+}
+
+- (void) generate;
+
+@end
+
+#endif

DBModeler/CodeGenerator.m

@@ -0,0 +1,707 @@
+/**
+ CodeGenerator.m
+ Created by David Wetzel on 16.11.2008.
+ 
+ This file is part of DBModeler.
+ 
+ <license>
+ DBModeler is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+ 
+ DBModeler is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU General Public License
+ along with DBModeler; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ </license>
+ **/
+
+#import "CodeGenerator.h"
+#import <Foundation/NSUserDefaults.h>
+#import <EOAccess/EOEntity.h>
+#import <EOAccess/EORelationship.h>
+#import <EOAccess/EOAttribute.h>
+
+#import <EOModeler/EOModelerApp.h>
+#import <EOModeler/EOModelExtensions.h>
+
+
+#import <AppKit/AppKit.h>
+
+@implementation NSString (GeneratorAddtions)
+
+- (NSString *)initialCapitalString
+{
+  NSRange  firstLetterRange;
+  NSString *firstLetterString;
+  NSString *restOfString;
+  
+  if ([self length] == 0) return self;
+  
+  firstLetterRange  = [self rangeOfComposedCharacterSequenceAtIndex:0];
+  firstLetterString = [[self substringWithRange:firstLetterRange] uppercaseString];
+  restOfString      = [self substringFromIndex:NSMaxRange(firstLetterRange)];
+  
+  return [firstLetterString stringByAppendingString:restOfString];
+}
+
+
+- (NSString *)initialLowercaseString
+{
+  NSRange  firstLetterRange;
+  NSString *firstLetterString;
+  NSString *restOfString;
+  
+  if ([self length] == 0) return self;
+  
+  firstLetterRange  = [self rangeOfComposedCharacterSequenceAtIndex:0];
+  firstLetterString = [[self substringWithRange:firstLetterRange] lowercaseString];
+  restOfString      = [self substringFromIndex:NSMaxRange(firstLetterRange)];
+  
+  return [firstLetterString stringByAppendingString:restOfString];
+}
+
+
+@end
+
+
+@implementation CodeGenerator
+
+
+- (id) init
+{
+  self = [super init];
+//  if (self != nil) {
+//    NSUserDefaults *defs;
+//    
+//    defs = [NSUserDefaults standardUserDefaults];
+//    _generatedClassPath = [defs stringForKey:GENERATED_CLASS_PATH];
+//    _subclassPath = [defs stringForKey:SUBCLASS_PATH];
+//    _superclassName = [defs stringForKey:SUPERCLASS_NAME];
+//    
+//  }
+  return self;
+}
+
+- (NSString*) copyright
+{
+  return @"";
+}
+
+/*
+ those are NOT added as '@class XXX;' lines to the _MyClass.h EO file.
+ */
+
+- (NSSet*) knownBaseClassNames
+{
+  return [NSSet setWithObjects:@"NSArray", @"NSNumber", @"NSDecimalNumber", @"NSCalendarDate", 
+          @"NSData", @"NSString", nil];
+}
+
+- (NSMutableString*) interfacePrologueForEntity:(EOEntity*) entity
+{
+  NSMutableString * cs = [NSMutableString string];
+  NSString        * copy = [self copyright];
+  NSString        * className = [entity className];
+
+  [cs appendFormat:@"// _%@.h\n", className];
+  
+  if ((copy != nil) && ([copy length])) {
+    [cs appendString:copy];
+  }
+
+  [cs appendString:@"//\n"];
+  [cs appendString:@"// Created by DBModeler.\n"];
+  [cs appendFormat:@"// DO NOT EDIT. Make changes to %@.h instead.\n\n", className];
+  [cs appendFormat:@"#ifndef ___%@_h_\n#define ___%@_h_\n\n", className, className];
+  [cs appendString:@"#import <EOControl/EOControl.h>\n\n"];
+  
+  return cs;
+}
+
+- (NSMutableString*) superclassPrologueForEntity:(EOEntity*) entity
+{
+  NSMutableString * cs = [NSMutableString string];
+  NSString        * copy = [self copyright];
+  NSString        * className = [entity className];
+  
+  [cs appendFormat:@"// _%@.m\n", className];
+  
+  if ((copy != nil) && ([copy length])) {
+    [cs appendString:copy];
+  }
+  
+  [cs appendString:@"//\n"];
+  [cs appendString:@"// Created by DBModeler.\n"];
+  [cs appendFormat:@"// DO NOT EDIT. Make changes to %@.m instead.\n\n", className];
+  [cs appendFormat:@"#import \"_%@.h\"\n", className];
+  
+  return cs;
+}
+
+- (NSString*) superInterfaceEpilogueForEntity:(EOEntity*) entity
+{
+  NSMutableString * cs = [NSMutableString string];
+  NSString        * className = [entity className];
+  
+//  [cs appendString:@"// \n"];
+  [cs appendFormat:@"#endif //___%@_h_\n", className];
+  
+  return cs;
+}
+
+- (NSString*) superclassEpilogueForEntity:(EOEntity*) entity
+{
+  return @"@end\n";
+}
+
+
+- (BOOL) updateNeededForFileAtPath:(NSString*) aPath content:(NSString*)aString canOverwrite:(BOOL) overwrite
+{
+  NSFileManager * fileManager = [NSFileManager defaultManager]; 
+  
+  if ([fileManager fileExistsAtPath:aPath]) {
+    NSString * myStr = [NSString stringWithContentsOfFile:aPath
+                                                 encoding:NSUTF8StringEncoding
+                                                    error:NULL];
+    
+    if ([myStr isEqual:aString]) {
+      return NO;
+    }
+    
+    if (overwrite) {
+      return YES;
+    }
+  }
+    
+  return YES;
+}
+
+void addToUsedClasses(NSMutableArray * mutArray,NSSet * knownNames, NSArray * otherArray)
+{
+  NSEnumerator   * enumer = [otherArray objectEnumerator];
+  NSString       * className = nil;
+  id               currentObj = nil;
+
+  while ((currentObj = [enumer nextObject])) {
+    
+    if ([currentObj isKindOfClass:[NSString class]]) {
+      className = currentObj;
+    } else if ([currentObj isKindOfClass:[EORelationship class]]) {
+      className = [[(EORelationship*) currentObj destinationEntity] className];
+    } else if ([currentObj isKindOfClass:[EOAttribute class]]) {
+      className = [(EOAttribute*) currentObj valueClassName];
+    }
+    
+    if ((className) && ((([mutArray containsObject:className] == NO)) && ((!knownNames) || (([knownNames containsObject:className] == NO))))) {
+      [mutArray addObject:className];
+    } 
+  }
+  
+}
+
+- (NSString*) classDummysForEntity:(EOEntity*) entity
+{
+  NSSet           * knownNames = [self knownBaseClassNames];
+  NSMutableString * ms = [NSMutableString string];
+  NSEnumerator    * enumer = nil;
+  NSString        * className = nil;
+
+  NSArray * classNonScalarAttributes = [[entity classNonScalarAttributes] 
+                                                sortedArrayUsingSelector:@selector(eoCompareOnName:)];
+  
+  NSArray * classToOneRelationships = [[entity classToOneRelationships] 
+                                               sortedArrayUsingSelector:@selector(eoCompareOnName:)];
+  
+  NSArray * classToManyRelationships = [[entity classToManyRelationships] 
+                                                sortedArrayUsingSelector:@selector(eoCompareOnName:)];
+  
+  NSMutableArray * mutArray = [NSMutableArray array];
+  
+  addToUsedClasses(mutArray, knownNames, classNonScalarAttributes);
+  addToUsedClasses(mutArray, knownNames, classToOneRelationships);
+  addToUsedClasses(mutArray, knownNames, classToManyRelationships);
+  
+  enumer = [mutArray objectEnumerator];
+
+  while ((className = [enumer nextObject])) {
+    [ms appendFormat:@"@class %@;\n", className];
+  }
+
+  [ms appendFormat:@"\n"];
+
+  return ms;
+}
+
+- (NSString*) superIncludesForEntity:(EOEntity*) entity
+{
+  NSSet           * knownNames = [self knownBaseClassNames];
+  NSMutableString * ms = [NSMutableString string];
+  NSEnumerator    * enumer = nil;
+  NSString        * className = nil;
+  
+  NSArray * classNonScalarAttributes = [[entity classNonScalarAttributes] 
+                                        sortedArrayUsingSelector:@selector(eoCompareOnName:)];
+  
+  NSArray * classToOneRelationships = [[entity classToOneRelationships] 
+                                       sortedArrayUsingSelector:@selector(eoCompareOnName:)];
+  
+  NSArray * classToManyRelationships = [[entity classToManyRelationships] 
+                                        sortedArrayUsingSelector:@selector(eoCompareOnName:)];
+  
+  NSMutableArray * mutArray = [NSMutableArray array];
+  
+  addToUsedClasses(mutArray, knownNames, classNonScalarAttributes);
+  addToUsedClasses(mutArray, knownNames, classToOneRelationships);
+  addToUsedClasses(mutArray, knownNames, classToManyRelationships);
+  
+  enumer = [mutArray objectEnumerator];
+  
+  while ((className = [enumer nextObject])) {
+    [ms appendFormat:@"#import \"%@.h\"\n", className];
+  }
+  
+  [ms appendFormat:@"\n"];
+  
+  return ms;
+}
+
+
+- (NSString*) superInterfaceForEntity:(EOEntity*) entity
+{
+  
+  NSMutableString * cs = [NSMutableString string];
+  NSArray         * classScalarAttributes = [[entity classScalarAttributes] 
+                                             sortedArrayUsingSelector:@selector(eoCompareOnName:)];
+  
+  NSArray         * classNonScalarAttributes = [[entity classNonScalarAttributes] 
+                                                sortedArrayUsingSelector:@selector(eoCompareOnName:)];
+  
+  NSArray         * classToOneRelationships = [[entity classToOneRelationships] 
+                                               sortedArrayUsingSelector:@selector(eoCompareOnName:)];
+  
+  NSArray         * classToManyRelationships = [[entity classToManyRelationships] 
+                                                sortedArrayUsingSelector:@selector(eoCompareOnName:)];
+  
+  EOAttribute     * eoAttr = nil;
+  EORelationship  * eoRel = nil;
+  NSEnumerator    * enumer = [classScalarAttributes objectEnumerator];
+  NSString        * className = [entity className];
+
+  
+  [cs appendString:[self classDummysForEntity:entity]];
+  
+  [cs appendFormat:@"@interface _%@ : EOCustomObject <NSCoding>\n{\n", className];
+  
+  while ((eoAttr = [enumer nextObject])) {
+    [cs appendFormat:@"  %@ _%@;\n", [eoAttr cScalarTypeString], [eoAttr name]];
+  }
+  
+  enumer = [classNonScalarAttributes objectEnumerator];
+  
+  while ((eoAttr = [enumer nextObject])) {
+    [cs appendFormat:@"  %@ *_%@;\n", [eoAttr valueClassName], [eoAttr name]];
+  }
+  
+  enumer = [classToOneRelationships objectEnumerator];
+  
+  while ((eoRel = [enumer nextObject])) {
+    [cs appendFormat:@"  %@ *_%@;\n", [[eoRel destinationEntity] className], [eoRel name]];
+  }
+  
+  enumer = [classToManyRelationships objectEnumerator];
+  
+  while ((eoRel = [enumer nextObject])) {
+    [cs appendFormat:@"  %@ *_%@s;\n", [[eoRel destinationEntity] className], [eoRel name]];
+  }
+  
+  [cs appendFormat:@"}\n\n"];
+  
+    
+  enumer = [classScalarAttributes objectEnumerator];
+  
+  
+  while ((eoAttr = [enumer nextObject])) {
+    [cs appendFormat:@"- (void) set%@:(%@) aValue;\n", [[eoAttr name] initialCapitalString],
+     [eoAttr cScalarTypeString]];
+    [cs appendFormat:@"- (%@) %@;\n\n", [eoAttr cScalarTypeString], [eoAttr name]];
+  }
+  
+  enumer = [classNonScalarAttributes objectEnumerator];
+  
+  while ((eoAttr = [enumer nextObject])) {
+    [cs appendFormat:@"- (void) set%@:(%@ *) aValue;\n", [[eoAttr name] initialCapitalString],
+     [eoAttr valueClassName]];
+    [cs appendFormat:@"- (%@ *) %@;\n\n", [eoAttr valueClassName], [eoAttr name]];
+  }
+  
+  enumer = [classToOneRelationships objectEnumerator];
+  
+  while ((eoRel = [enumer nextObject])) {
+    [cs appendFormat:@"- (void) set%@:(%@ *) aValue;\n", [[eoRel name] initialCapitalString],
+     [[eoRel destinationEntity] className]];
+    [cs appendFormat:@"- (%@ *) %@;\n\n", [[eoRel destinationEntity] className], [eoRel name]];
+  }
+  
+  enumer = [classToManyRelationships objectEnumerator];
+  
+  while ((eoRel = [enumer nextObject])) {
+    [cs appendFormat:@"- (NSArray *) %@;\n\n", [eoRel name]];
+    [cs appendFormat:@"- (void) addTo%@:(%@ *) aValue;\n", [[eoRel name] initialCapitalString],
+     [[eoRel destinationEntity] className]];
+    [cs appendFormat:@"- (void) removeFrom%@:(%@ *) aValue;\n", [[eoRel name] initialCapitalString],
+     [[eoRel destinationEntity] className]];
+  }
+  
+  [cs appendFormat:@"@end\n\n"];
+
+  return cs;
+}
+
+- (NSArray*) retainableAttributesInEntity:(EOEntity*) entity
+{
+  NSArray         * classNonScalarAttributes = [[entity classNonScalarAttributes] 
+                                                sortedArrayUsingSelector:@selector(eoCompareOnName:)];
+  
+  NSArray         * classToOneRelationships = [[entity classToOneRelationships] 
+                                               sortedArrayUsingSelector:@selector(eoCompareOnName:)];
+  
+  NSArray         * classToManyRelationships = [[entity classToManyRelationships] 
+                                                sortedArrayUsingSelector:@selector(eoCompareOnName:)];
+  
+  NSMutableArray * mutArray = [NSMutableArray array];
+  NSEnumerator    * enumer;
+  EORelationship  * eoRel;
+  EOAttribute     * eoAttr;
+  
+  enumer = [classNonScalarAttributes objectEnumerator];
+  
+  while ((eoAttr = [enumer nextObject])) {
+    [mutArray addObject:[[eoAttr name] initialLowercaseString]];
+  }
+  
+  enumer = [classToOneRelationships objectEnumerator];
+  
+  while ((eoRel = [enumer nextObject])) {
+    [mutArray addObject:[[eoRel name] initialLowercaseString]];
+  }
+  
+  enumer = [classToManyRelationships objectEnumerator];
+  
+  while ((eoRel = [enumer nextObject])) {
+    [mutArray addObject:[[eoRel name] initialLowercaseString]];
+  }
+  
+  
+  return mutArray;
+}
+
+- (NSString*) deallocForAttributes:(NSArray*) attrs
+{
+  NSMutableString * cs = [NSMutableString string];
+  NSEnumerator    * enumer = [attrs objectEnumerator];
+  NSString        * anIvar = nil;
+
+  [cs appendFormat:@"\n- (void) dealloc\n{\n"];
+
+  while ((anIvar = [enumer nextObject])) {
+    [cs appendFormat:@"  [_%@ release];\n", anIvar];
+  }
+
+  [cs appendFormat:@"\n  [super dealloc];\n}\n\n"];
+  
+  return cs;
+}
+
+- (NSString*) superclassGettersAndSettersForEntity:(EOEntity*) entity
+{
+  
+  NSMutableString * cs = [NSMutableString string];
+  NSArray         * classScalarAttributes = [[entity classScalarAttributes] 
+                                             sortedArrayUsingSelector:@selector(eoCompareOnName:)];
+  
+  NSArray         * classNonScalarAttributes = [[entity classNonScalarAttributes] 
+                                                sortedArrayUsingSelector:@selector(eoCompareOnName:)];
+  
+  NSArray         * classToOneRelationships = [[entity classToOneRelationships] 
+                                               sortedArrayUsingSelector:@selector(eoCompareOnName:)];
+  
+  NSArray         * classToManyRelationships = [[entity classToManyRelationships] 
+                                                sortedArrayUsingSelector:@selector(eoCompareOnName:)];
+  
+  EOAttribute     * eoAttr = nil;
+  EORelationship  * eoRel = nil;
+  NSEnumerator    * enumer = [classScalarAttributes objectEnumerator];
+  
+  enumer = [classScalarAttributes objectEnumerator];
+  
+  
+  while ((eoAttr = [enumer nextObject])) {
+    NSString * lowStr = [[eoAttr name] initialLowercaseString];
+    
+    [cs appendFormat:@"- (void) set%@:(%@) aValue\n{\n  if ((_%@ == aValue)) {\n    return;\n  }\n\n", 
+     [[eoAttr name] initialCapitalString],
+     [eoAttr cScalarTypeString], lowStr];
+
+    [cs appendFormat:@"  [self willChange];\n  _%@ = aValue;\n}\n\n",
+     lowStr];
+    
+    [cs appendFormat:@"- (%@) %@\n{\n  return _%@;\n}\n\n", [eoAttr cScalarTypeString], [eoAttr name], lowStr];
+  }
+  
+  enumer = [classNonScalarAttributes objectEnumerator];
+  
+  while ((eoAttr = [enumer nextObject])) {
+    NSString * lowStr = [[eoAttr name] initialLowercaseString];
+
+    [cs appendFormat:@"- (void) set%@:(%@ *) aValue\n{\n  if ((_%@ == aValue)) {\n    return;\n  }\n\n", 
+     [[eoAttr name] initialCapitalString],
+     [eoAttr valueClassName], lowStr];
+
+    [cs appendFormat:@"  [self willChange];\n  [_%@ release];\n  _%@ = [aValue retain];\n}\n\n", 
+     lowStr, lowStr];
+    [cs appendFormat:@"- (%@ *) %@\n{\n  return _%@;\n}\n\n", [eoAttr valueClassName], [eoAttr name], lowStr];
+  }
+  
+  
+  if ([classToOneRelationships count]) {
+    [cs appendString:@"// to-one relationships\n\n"];
+  }
+  
+  enumer = [classToOneRelationships objectEnumerator];
+  
+  while ((eoRel = [enumer nextObject])) {
+    NSString * lowStr = [[eoRel name] initialLowercaseString];
+
+    [cs appendFormat:@"- (void) set%@:(%@ *) aValue\n{\n  if ((_%@ == aValue)) {\n    return;\n  }\n\n", 
+     [[eoRel name] initialCapitalString],
+     [[eoRel destinationEntity] className], lowStr];
+    
+    [cs appendFormat:@"  [self willChange];\n  [_%@ release];\n  _%@ = [aValue retain];\n}\n\n", 
+     lowStr, lowStr];
+    [cs appendFormat:@"- (%@ *)%@\n{\n  return _%@;\n}\n\n", [[eoRel destinationEntity] className], [eoRel name], lowStr];
+  }
+  
+  enumer = [classToManyRelationships objectEnumerator];
+  
+  while ((eoRel = [enumer nextObject])) {
+    NSString * lowStr = [[eoRel name] initialLowercaseString];
+    
+    [cs appendFormat:@"- (NSArray *) %@\n{\n",
+     [eoRel name]];
+    [cs appendFormat:@"  return  _%@;\n}\n\n", 
+     lowStr];
+
+    [cs appendFormat:@"- (void) addTo%@:(%@ *) aValue\n{\n", [[eoRel name] initialCapitalString],
+     [[eoRel destinationEntity] className]];
+    
+    [cs appendFormat:@"  [self willChange];\n  [_%@ addObject:aValue];\n}\n\n", 
+     lowStr];
+    
+    [cs appendFormat:@"- (void) removeFrom%@:(%@ *) aValue\n{\n", [[eoRel name] initialCapitalString],
+     [[eoRel destinationEntity] className]];
+    [cs appendFormat:@"  [self willChange];\n  [_%@ removeObject:aValue];\n}\n\n", 
+     lowStr];
+  }
+  
+  
+  return cs;
+}
+
+- (NSString*) superclassForEntity:(EOEntity*) entity
+{
+  NSMutableString * cs = [NSMutableString string];
+  NSString        * className = [entity className];
+  
+  NSArray         * retainableAttrs = [self retainableAttributesInEntity:entity];
+    
+  [cs appendFormat:@"@implementation _%@\n", className];
+  
+  [cs appendString:[self deallocForAttributes:retainableAttrs]];
+  
+  [cs appendString:[self superclassGettersAndSettersForEntity:entity]];
+
+  
+  return cs;
+}
+
+
+- (void) generateSuperInterfaceFileForEntity:(EOEntity*) entity
+{
+  NSMutableString * codeString = [self interfacePrologueForEntity:entity];
+  NSString        * path = _generatedClassPath;
+
+  NSString * className = [entity className];
+  NSString * currentPath = [path stringByAppendingPathComponent:[NSString stringWithFormat:@"_%@.h", 
+                                                                 className]];
+
+  [codeString appendString:[self superInterfaceForEntity:entity]];
+  
+  [codeString appendString:[self superInterfaceEpilogueForEntity:entity]];
+    
+  if ([self updateNeededForFileAtPath:currentPath 
+                              content:codeString 
+                         canOverwrite:YES]) {
+    
+    [codeString writeToFile:currentPath 
+                 atomically:NO 
+                   encoding:NSUTF8StringEncoding
+                      error:NULL];
+    
+  }
+}
+
+- (void) generateSubInterfaceFileForEntity:(EOEntity*) entity
+{
+  NSMutableString * codeString = [NSMutableString string];
+  NSString        * path = _subclassPath;  
+  NSString        * className = [entity className];
+  NSString        * currentPath = [path stringByAppendingPathComponent:[NSString stringWithFormat:@"%@.h",
+                                                                        className]];
+  
+  [codeString appendFormat:@"// %@.h\n\n", className];
+  [codeString appendFormat:@"#ifndef __%@_h_\n#define __%@_h_\n\n", className, className];
+  [codeString appendFormat:@"#import \"_%@.h\"\n\n", className];
+  
+  [codeString appendFormat:@"@interface %@: _%@\n", className, className];
+  [codeString appendString:@"{\n  // Custom instance variables go here\n}\n\n"];
+  [codeString appendString:@"// Business logic methods go here\n\n@end\n"];
+  [codeString appendFormat:@"\n#endif //__%@_h_\n", className];
+
+  if ([self updateNeededForFileAtPath:currentPath 
+                              content:codeString 
+                         canOverwrite:NO]) {
+    
+    [codeString writeToFile:currentPath 
+                 atomically:NO 
+                   encoding:NSUTF8StringEncoding
+                      error:NULL];
+    
+  }
+}
+
+- (void) generateSuperclassFileForEntity:(EOEntity*) entity
+{
+  NSMutableString * codeString = [self superclassPrologueForEntity:entity];
+  NSString        * path = _generatedClassPath;
+  
+  
+  NSString * className = [entity className];
+  NSString * currentPath = [path stringByAppendingPathComponent:[NSString stringWithFormat:@"_%@.m",
+                                                                 className]];
+  
+  [codeString appendString:[self superIncludesForEntity:entity]];
+  [codeString appendString:[self superclassForEntity:entity]];
+  
+  [codeString appendString:[self superclassEpilogueForEntity:entity]];
+    
+  if ([self updateNeededForFileAtPath:currentPath 
+                              content:codeString 
+                         canOverwrite:YES]) {
+    
+    [codeString writeToFile:currentPath 
+                 atomically:NO 
+                   encoding:NSUTF8StringEncoding
+                      error:NULL];
+    
+  }
+}
+
+- (void) generateSubclassFileForEntity:(EOEntity*) entity
+{
+  NSMutableString * codeString = [NSMutableString string];
+  NSString        * path = _subclassPath;  
+  NSString * className = [entity className];
+  NSString * currentPath = [path stringByAppendingPathComponent:[NSString stringWithFormat:@"%@.m",
+                                                                 className]];
+  
+  [codeString appendFormat:@"// %@.m\n\n#import \"%@.h\"\n\n", className, className];
+  [codeString appendFormat:@"@implementation %@\n\n", className];
+  [codeString appendString:@"- (void)dealloc\n{\n  [super dealloc];\n}\n\n"];
+  [codeString appendString:@"// Business logic methods go here\n\n@end\n"];
+  
+  if ([self updateNeededForFileAtPath:currentPath 
+                              content:codeString 
+                         canOverwrite:NO]) {
+    
+    [codeString writeToFile:currentPath 
+                 atomically:NO 
+                   encoding:NSUTF8StringEncoding
+                      error:NULL];
+    
+  }
+}
+
+- (BOOL) getPaths
+{
+  NSOpenPanel *panel = [NSOpenPanel openPanel];
+  
+  BOOL ok = NO;
+  
+  [panel setTitle:@"Select path for super classes"];
+  [panel setCanCreateDirectories:YES];
+  [panel setCanChooseFiles:NO];
+  [panel setCanChooseDirectories:YES];
+  
+  if ([panel runModal] == NSOKButton)
+  {
+    NSURL * url = [panel directoryURL];
+    
+    [_generatedClassPath release];
+    _generatedClassPath = [[url path] retain];
+    
+    [panel setTitle:@"Select path for sub classes"];
+    if ([panel runModal] == NSOKButton)
+    {
+      NSURL * suburl = [panel directoryURL];
+      
+      [_subclassPath release];
+      _subclassPath = [[suburl path] retain];
+      
+      ok = YES;
+    }
+  }
+  
+  return ok;
+}
+
+- (void) generate
+{
+  NSEnumerator  * entityEnumer = nil;
+  EOEntity      * currentEntity = nil;
+  
+  _model        = [[EOMApp activeDocument] model];
+  
+  if (!_model) {
+    return;
+  }
+  
+  if ([self getPaths]) {
+    
+    entityEnumer = [[_model entities] objectEnumerator];
+    
+    while ((currentEntity = [entityEnumer nextObject])) {
+      [self generateSuperInterfaceFileForEntity:currentEntity];
+      [self generateSuperclassFileForEntity:currentEntity];
+      [self generateSubInterfaceFileForEntity:currentEntity];
+      [self generateSubclassFileForEntity:currentEntity];
+    }
+  }
+}
+
+- (void) dealloc
+{
+  [_generatedClassPath release];
+  [_subclassPath release];
+  //[_superclassName release];
+  //[_model release];
+  
+  [super dealloc];
+}
+
+@end

DBModeler/GNUmakefile

@@ -82,6 +82,7 @@ $(APP_NAME)_OBJC_FILES =		\
 	AttributeCell.m			\
 	NSView+Additions.m		\
 	EntityView.m			\
-	DiagramEditor.m
+	DiagramEditor.m \
+  CodeGenerator.m
 
 include $(GNUSTEP_MAKEFILES)/application.make

DBModeler/Modeler.m

@@ -31,6 +31,7 @@
 #include "ModelerEntityEditor.h"
 #include "SQLGenerator.h"
 #include "Preferences.h"
+#include "CodeGenerator.h"
 
 #include <EOModeler/EOModelerApp.h>
 #include <EOModeler/EOModelerEditor.h>
@@ -234,6 +235,13 @@
 
 - (BOOL) validateMenuItem:(NSMenuItem *)menuItem
 {
+  
+  if (([menuItem action] == @selector(createTemplate:))) {
+    NSLog(@"validateMenuItem: OK");
+    return YES;
+  }
+    
+  
   if ([[menuItem title] isEqualToString:@"Set Adaptor Info"])
     {
       return ([EOMApp activeDocument] != nil);
@@ -341,5 +349,13 @@
   [[DBModelerPrefs sharedPreferences] showPreferences:self]; 
 }
 
+- (void)createTemplate:(id)sender
+{
+  CodeGenerator * codeGen = [[CodeGenerator new] autorelease];
+  
+  [codeGen generate];
+  
+}
+
 @end
 

DBModeler/Resources/Menu-Cocoa.gsmarkup

@@ -65,6 +65,8 @@
 				<menuItem title="Add Relationship" keyEquivalent="R"
 					action="addRelationship:" />
 				<menuItem title="Delete" action="delete:" />
+				<menuItem title="Generate ObjC Files.." 
+					action="createTemplate:" autoenablesItems="no" />
 			</menu>
 
 			<menu title="Tools">

DBModeler/Resources/Menu-GNUstep.gsmarkup

@@ -54,6 +54,8 @@
 				<menuItem title="Add Relationship" keyEquivalent="R"
 					action="addRelationship:" />
 				<menuItem title="Delete" action="delete:" />
+                <menuItem title="Generate ObjC Files.." 
+					action="createTemplate:" />
 			</menu>
 
 			<menu title="Tools">

EOControl/EOMutableKnownKeyDictionary.m

@@ -199,7 +199,7 @@ RCS_ID("$Id$")
   //OK?
   id key;
 
-  NSAssert3(index < _count, @"%s: bad index %d (count=%u)", __PRETTY_FUNCTION__, index, _count);
+  NSAssert2(index < _count, @"bad index %d (count=%u)", index, _count);
 
   key = _keys[index];
 
@@ -212,7 +212,7 @@ RCS_ID("$Id$")
 {
   id key;
 
-  NSAssert3(index < _count, @"%s: bad index %d (count=%u)", __PRETTY_FUNCTION__, index, _count);
+  NSAssert2(index < _count, @"bad index %d (count=%u)", index, _count);
 
   key = _keys[index];
 
@@ -224,7 +224,6 @@ RCS_ID("$Id$")
   void *index = NSMapGet(_keyToIndex, (const void *)key);
   
   if (!index) {
-    NSLog(@"%s:'%@' not found", __PRETTY_FUNCTION__, key);
     return NSNotFound;
   }
   

EOModeler/EOModelExtensions.m

@@ -245,6 +245,40 @@
 
 - (NSString *)cScalarTypeString
 {
+  NSString * vType = [self valueType];
+  unichar  myChar;
+  
+  myChar = [vType characterAtIndex:0];
+  
+  switch (myChar) {
+    case 'c': return @"char";
+      break;
+    case 'C': return @"unsigned char";
+      break;
+    case 's': return @"short";
+      break;
+    case 'S': return @"unsigned short";
+      break;
+    case 'i': return @"int";
+      break;
+    case 'I': return @"unsigned int";
+      break;
+    case 'l': return @"long";
+      break;
+    case 'L': return @"unsigned long";
+      break;
+    case 'u': return @"long long";
+      break;
+    case 'U': return @"unsigned long long";
+      break;
+    case 'f': return @"float";
+      break;
+    case 'd': return @"double";
+      break;
+    default:
+      break;
+  }
+  
   return nil;
 }