clean up COItemPath

Author: ericwa

COItem.h

@@ -80,6 +80,22 @@ valuesForAttributes: (NSDictionary *)valuesForAttributes;
 
 - (void)removeValueForAttribute: (NSString*)anAttribute;
 
+/**
+ * Creates the container if needed. 
+ */
+- (void)   addObject: (id)aValue
+toUnorderedAttribute: (NSString*)anAttribute
+				type: (COType *)aType;
+
+/**
+ * Creates the container if needed. 
+ */
+- (void)   addObject: (id)aValue
+  toOrderedAttribute: (NSString*)anAttribute
+			 atIndex: (NSUInteger)anIndex
+				type: (COType *)aType;
+
+
 /** @taskunit convenience */
 
 - (void) addObject: (id)aValue

COItem.m

@@ -377,6 +377,60 @@ - (void)removeValueForAttribute: (NSString*)anAttribute
 
 /** @taskunit convenience */
 
+- (void)   addObject: (id)aValue
+toUnorderedAttribute: (NSString*)anAttribute
+				type: (COType *)aType
+{
+	if (![aType isMultivalued] || [aType isOrdered])
+	{
+		[NSException raise: NSInvalidArgumentException
+					format: @"expected unordered type"];
+	}
+	
+	if ([self typeForAttribute: anAttribute] == nil)
+	{
+		[self setValue: [aType isUnique] ? [NSSet set] : [NSCountedSet set]
+		  forAttribute: anAttribute
+				  type: aType];
+	}
+		 
+	NSMutableSet *set = [[self valueForAttribute: anAttribute] mutableCopy];
+	NSAssert([set isKindOfClass: [NSMutableSet class]], @"expected NSMutableSet");
+	[set addObject: aValue];
+	[self setValue: set
+	  forAttribute: anAttribute
+			  type: aType];
+	[set release];
+}
+
+- (void)   addObject: (id)aValue
+  toOrderedAttribute: (NSString*)anAttribute
+			 atIndex: (NSUInteger)anIndex
+				type: (COType *)aType
+{
+	if (![aType isMultivalued] || ![aType isOrdered])
+	{
+		[NSException raise: NSInvalidArgumentException
+					format: @"expected ordered type"];
+	}
+	
+	if ([self typeForAttribute: anAttribute] == nil)
+	{
+		[self setValue: [NSMutableArray array]
+		  forAttribute: anAttribute
+				  type: aType];
+	}
+	
+	NSMutableArray *array = [[self valueForAttribute: anAttribute] mutableCopy];
+	NSAssert([array isKindOfClass: [NSMutableArray class]], @"expected NSMutableArray");
+	[array insertObject: aValue
+				atIndex: anIndex];
+	[self setValue: array
+	  forAttribute: anAttribute
+			  type: aType];
+	[array release];
+}
+
 - (void) addObject: (id)aValue
 	  forAttribute: (NSString*)anAttribute
 {

Scraps/COItemPath.m

@@ -131,35 +131,12 @@ - (id) initWithItemUUID: (ETUUID *)aUUID
 }
 
 - (void) insertValue: (id)aValue
-			  ofType: (COType *)aType
 		 inStoreItem: (COMutableItem *)aStoreItem
 {
-	if (![aType isPrimitive])
-	{
-		[NSException raise: NSInvalidArgumentException
-					format: @"expected primitive type"];
-	}
-	
-	if (nil == [aStoreItem typeForAttribute: attribute])
-	{
-		[aStoreItem setType: [COType arrayWithPrimitiveType: aType]
-			   forAttribute: attribute];		
-	}
-	else
-	{
-		if (![[aStoreItem typeForAttribute: attribute] isMultivalued] ||
-			![[aStoreItem typeForAttribute: attribute] isOrdered] ||
-			![[[aStoreItem typeForAttribute: attribute] primitiveType] isEqual: aType])
-		{
-			[NSException raise: NSInvalidArgumentException
-						format: @"type mismatch"];
-		}
-	}
-	
-	NSMutableArray *array = [[NSMutableArray alloc] initWithArray: [aStoreItem valueForAttribute: attribute]];
-	[array insertObject: aValue atIndex: index];
-	[aStoreItem setValue: array forAttribute: attribute];
-	[array release];
+	[aStoreItem addObject: aValue 
+	   toOrderedAttribute: attribute
+				  atIndex: index
+					 type: type];
 }
 
 - (BOOL) isEqual:(id)object
@@ -179,14 +156,9 @@ @implementation COItemPathToUnorderedContainer
 - (void) insertValue: (id)aValue
 		 inStoreItem: (COMutableItem *)aStoreItem
 {
-	assert([[aStoreItem typeForAttribute: attribute] isMultivalued]);
-	assert(![[aStoreItem typeForAttribute: attribute] isOrdered]);
-	
-	NSMutableSet *set = [[aStoreItem valueForAttribute: attribute] mutableCopy]; // may be NSMutableSet subclass NSCountedSet
-	assert([set isKindOfClass: [NSMutableSet class]]);
-	[set addObject: aValue];
-	[aStoreItem setValue: set forAttribute: attribute];
-	[set release];
+	[aStoreItem addObject: aValue
+	 toUnorderedAttribute: attribute
+					 type: type];
 }
 
 @end
@@ -197,7 +169,9 @@ @implementation COItemPathToValue
 - (void) insertValue: (id)aValue
 		 inStoreItem: (COMutableItem *)aStoreItem
 {
-	// FIXME:
+	[aStoreItem setValue: aValue
+			forAttribute: attribute
+					type: type];
 }
 
 @end