Renamed enum type ObjectionInstantiationRuleEverytime to ObjectionIns…

…tantiationRuleNormal
atomicobject · May 6, 2011 · 741be8d · 741be8d
1 parent a59e159
commit 741be8d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Source/Objection.h b/Source/Objection.h
@@ -14,7 +14,7 @@
 #define objection_register(value)			\
   + (void)initialize { \
     if (self == [value class]) { \
-      [Objection registerClass:[value class] lifeCycle: ObjectionInstantiationRuleEverytime]; \
+      [Objection registerClass:[value class] lifeCycle: ObjectionInstantiationRuleNormal]; \
     } \
   }
 

diff --git a/Source/Objection.m b/Source/Objection.m
@@ -44,7 +44,7 @@ + (void)initialize
 + (void) registerClass:(Class)theClass lifeCycle:(ObjectionInstantiationRule)lifeCycle 
 {
   pthread_mutex_lock(&gObjectionMutex);
-  if (lifeCycle != ObjectionInstantiationRuleSingleton && lifeCycle != ObjectionInstantiationRuleEverytime) {
+  if (lifeCycle != ObjectionInstantiationRuleSingleton && lifeCycle != ObjectionInstantiationRuleNormal) {
     @throw [NSException exceptionWithName:@"ObjectionInjectorException" reason:@"Invalid Instantiation Rule" userInfo:nil];
   }
 

diff --git a/Source/ObjectionEntry.h b/Source/ObjectionEntry.h
@@ -2,7 +2,7 @@
 
 typedef enum {
   ObjectionInstantiationRuleNone = -1,
-  ObjectionInstantiationRuleEverytime,
+  ObjectionInstantiationRuleNormal,
   ObjectionInstantiationRuleSingleton  
 } ObjectionInstantiationRule;
 

diff --git a/Source/ObjectionInjectorEntry.m b/Source/ObjectionInjectorEntry.m
@@ -28,7 +28,7 @@ - (id)initWithClass:(Class)theClass lifeCycle:(ObjectionInstantiationRule)theLif
 
 - (id)extractObject 
 {
-  if (self.lifeCycle == ObjectionInstantiationRuleEverytime) {
+  if (self.lifeCycle == ObjectionInstantiationRuleNormal) {
   	return [self buildObject];  
   } else if (!_storageCache) {
     _storageCache = [[self buildObject] retain];
@@ -75,7 +75,7 @@ - (id)buildObject
       id theObject = [self.injector getObject:desiredClassOrProtocol];
 
       if(theObject == nil && propertyInfo.type == ObjectionTypeClass) {
-        [Objection registerClass:desiredClassOrProtocol lifeCycle: ObjectionInstantiationRuleEverytime];
+        [Objection registerClass:desiredClassOrProtocol lifeCycle: ObjectionInstantiationRuleNormal];
         theObject = [_injector getObject:desiredClassOrProtocol];
       } else if (!theObject) {
         @throw [NSException exceptionWithName:@"ObjectionException"