From 161fba55f7b114a4662726a92321a7154b321f65 Mon Sep 17 00:00:00 2001
From: Rob Rix <rob.rix@me.com>
Date: Fri, 6 Jan 2012 22:56:41 -0500
Subject: [PATCH] The default template uses the new attr methods.

Also defaulted to using int*_t for scalars at the same time.
---
 mogenerator.m                  |  2 +-
 templates/machine.h.motemplate | 18 +++++++++---------
 templates/machine.m.motemplate | 14 +++++++-------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/mogenerator.m b/mogenerator.m
index b8c10f69..8ad9ebd5 100644
--- a/mogenerator.m
+++ b/mogenerator.m
@@ -334,7 +334,7 @@ - (NSString*)objectAttributeType {
 - (NSString*)attributeTypeName {
 	return
 		[[self userInfo] objectForKey:@"attributeValueTypeName"]
-	?:	[self scalarAttributeType]
+	?:	[self scalarAttributeTypeName]
 	?:	[[self objectAttributeType] stringByAppendingString:@"*"];
 }
 
diff --git a/templates/machine.h.motemplate b/templates/machine.h.motemplate
index 7c0b8e79..fe093369 100644
--- a/templates/machine.h.motemplate
+++ b/templates/machine.h.motemplate
@@ -32,14 +32,14 @@ extern const struct <$managedObjectClassName$>FetchedProperties {<$foreach Fetch
 <$foreach Attribute noninheritedAttributes do$>
 <$if Attribute.hasDefinedAttributeType$>
 <$if TemplateVar.arc$>
-@property (nonatomic, strong) <$Attribute.objectAttributeType$> *<$Attribute.name$>;
+@property (nonatomic, strong) <$Attribute.attributeTypeName$> <$Attribute.name$>;
 <$else$>
-@property (nonatomic, retain) <$Attribute.objectAttributeType$> *<$Attribute.name$>;
+@property (nonatomic, retain) <$Attribute.attributeTypeName$> <$Attribute.name$>;
 <$endif$>
 <$if Attribute.hasScalarAttributeType$>
-@property <$Attribute.scalarAttributeType$> <$Attribute.name$>Value;
-- (<$Attribute.scalarAttributeType$>)<$Attribute.name$>Value;
-- (void)set<$Attribute.name.initialCapitalString$>Value:(<$Attribute.scalarAttributeType$>)value_;
+@property <$Attribute.attributeTypeName$> <$Attribute.name$>Value;
+- (<$Attribute.attributeTypeName$>)<$Attribute.name$>Value;
+- (void)set<$Attribute.name.initialCapitalString$>Value:(<$Attribute.attributeTypeName$>)value_;
 <$endif$>
 //- (BOOL)validate<$Attribute.name.initialCapitalString$>:(id*)value_ error:(NSError**)error_;
 <$endif$>
@@ -87,11 +87,11 @@ extern const struct <$managedObjectClassName$>FetchedProperties {<$foreach Fetch
 @interface _<$managedObjectClassName$> (CoreDataGeneratedPrimitiveAccessors)
 <$foreach Attribute noninheritedAttributes do$>
 <$if Attribute.hasDefinedAttributeType$>
-- (<$Attribute.objectAttributeType$>*)primitive<$Attribute.name.initialCapitalString$>;
-- (void)setPrimitive<$Attribute.name.initialCapitalString$>:(<$Attribute.objectAttributeType$>*)value;
+- (<$Attribute.attributeTypeName$>)primitive<$Attribute.name.initialCapitalString$>;
+- (void)setPrimitive<$Attribute.name.initialCapitalString$>:(<$Attribute.attributeTypeName$>)value;
 <$if Attribute.hasScalarAttributeType$>
-- (<$Attribute.scalarAttributeType$>)primitive<$Attribute.name.initialCapitalString$>Value;
-- (void)setPrimitive<$Attribute.name.initialCapitalString$>Value:(<$Attribute.scalarAttributeType$>)value_;
+- (<$Attribute.attributeTypeName$>)primitive<$Attribute.name.initialCapitalString$>Value;
+- (void)setPrimitive<$Attribute.name.initialCapitalString$>Value:(<$Attribute.attributeTypeName$>)value_;
 <$endif$>
 <$endif$>
 <$endforeach do$>
diff --git a/templates/machine.m.motemplate b/templates/machine.m.motemplate
index edc9a676..19e932e5 100644
--- a/templates/machine.m.motemplate
+++ b/templates/machine.m.motemplate
@@ -56,22 +56,22 @@ const struct <$managedObjectClassName$>FetchedProperties <$managedObjectClassNam
 
 <$if Attribute.hasScalarAttributeType$>
 
-- (<$Attribute.scalarAttributeType$>)<$Attribute.name$>Value {
+- (<$Attribute.attributeTypeName$>)<$Attribute.name$>Value {
 	NSNumber *result = [self <$Attribute.name$>];
-	return [result <$Attribute.scalarAttributeType.camelCaseString$>Value];
+	return [result <$Attribute.scalarAttributeAccessorMethod$>];
 }
 
-- (void)set<$Attribute.name.initialCapitalString$>Value:(<$Attribute.scalarAttributeType$>)value_ {
-	[self set<$Attribute.name.initialCapitalString$>:[NSNumber numberWith<$Attribute.scalarAttributeType.camelCaseString.initialCapitalString$>:value_]];
+- (void)set<$Attribute.name.initialCapitalString$>Value:(<$Attribute.attributeTypeName$>)value_ {
+	[self set<$Attribute.name.initialCapitalString$>:[NSNumber <$Attribute.scalarAttributeFactoryMethod$>value_]];
 }
 
-- (<$Attribute.scalarAttributeType$>)primitive<$Attribute.name.initialCapitalString$>Value {
+- (<$Attribute.attributeTypeName$>)primitive<$Attribute.name.initialCapitalString$>Value {
 	NSNumber *result = [self primitive<$Attribute.name.initialCapitalString$>];
-	return [result <$Attribute.scalarAttributeType.camelCaseString$>Value];
+	return [result <$Attribute.scalarAttributeAccessorMethod$>];
 }
 
 - (void)setPrimitive<$Attribute.name.initialCapitalString$>Value:(<$Attribute.scalarAttributeType$>)value_ {
-	[self setPrimitive<$Attribute.name.initialCapitalString$>:[NSNumber numberWith<$Attribute.scalarAttributeType.camelCaseString.initialCapitalString$>:value_]];
+	[self setPrimitive<$Attribute.name.initialCapitalString$>:[NSNumber <$Attribute.scalarAttributeFactoryMethod$>value_]];
 }
 <$endif$>
 <$endif$>