From 9bd55f166b81004fbc463ce2c670e493daaf03a4 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 26 Oct 2010 18:21:55 +0000
Subject: [PATCH] Monotone-Parent: ea84b0da49761a54044bb70c2502171c1b981e86
 Monotone-Revision: 6e9eca21067a5f64a1567bdae3318eaa6f1b85dd

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-10-26T18:21:55
Monotone-Branch: ca.inverse.sogo
---
 SOPE/NGCards/CardElement.h |  2 +-
 SOPE/NGCards/CardElement.m | 21 +++++++++++++--------
 SOPE/NGCards/ChangeLog     |  5 +++++
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/SOPE/NGCards/CardElement.h b/SOPE/NGCards/CardElement.h
index 6b820bc64..b5d047569 100644
--- a/SOPE/NGCards/CardElement.h
+++ b/SOPE/NGCards/CardElement.h
@@ -89,6 +89,7 @@
 - (void) addType: (NSString *) aType;
 
 - (NSString *) tag;
+- (void) setValues: (NSArray *) newValues;
 - (NSArray *) values;
 - (NSDictionary *) attributes;
 - (BOOL) hasAttribute: (NSString *) aType
@@ -102,7 +103,6 @@
 
 - (id) elementWithClass: (Class) elementClass;
 
-- (void) setValuesAsCopy: (NSMutableArray *) someValues;
 - (void) setAttributesAsCopy: (NSMutableDictionary *) someAttributes;
 
 - (NSMutableArray *) deepCopyOfArray: (NSArray *) oldArray
diff --git a/SOPE/NGCards/CardElement.m b/SOPE/NGCards/CardElement.m
index c9d9943d2..344e83bcf 100644
--- a/SOPE/NGCards/CardElement.m
+++ b/SOPE/NGCards/CardElement.m
@@ -219,6 +219,16 @@
   [self addAttribute: @"type" value: aType];
 }
 
+- (void) setValues: (NSArray *) newValues
+{
+  if (![newValues isKindOfClass: [NSMutableArray class]])
+    {
+      newValues = [newValues mutableCopy];
+      [newValues autorelease];
+    }
+  ASSIGN (values, newValues);
+}
+
 - (NSArray *) values
 {
   return values;
@@ -476,7 +486,7 @@
       newElement = [elementClass new];
       [newElement autorelease];
       [newElement setTag: tag];
-      [newElement setValuesAsCopy: values];
+      [newElement setValues: values];
       [newElement setAttributesAsCopy: attributes];
       if (group)
         [newElement setGroup: group];
@@ -491,11 +501,6 @@
   return newElement;
 }
 
-- (void) setValuesAsCopy: (NSMutableArray *) someValues
-{
-  ASSIGN (values, someValues);
-}
-
 - (void) setAttributesAsCopy: (NSMutableDictionary *) someAttributes
 {
   ASSIGN (attributes, someAttributes);
@@ -567,7 +572,7 @@
   newGroup = [group copyWithZone: aZone];
   [new setGroup: newGroup];
   [newGroup release];
-  [new setValuesAsCopy: [self deepCopyOfArray: values withZone: aZone]];
+  [new setValues: [self deepCopyOfArray: values withZone: aZone]];
   [new setAttributesAsCopy: [self deepCopyOfDictionary: attributes
 				  withZone: aZone]];
 
@@ -588,7 +593,7 @@
   newGroup = [group copyWithZone: aZone];
   [new setGroup: newGroup];
   [newGroup release];
-  [new setValuesAsCopy: [self deepCopyOfArray: values withZone: aZone]];
+  [new setValues: [self deepCopyOfArray: values withZone: aZone]];
   [new setAttributesAsCopy: [self deepCopyOfDictionary: attributes
 				  withZone: aZone]];
 
diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog
index 591a9a914..fd30a2f3a 100644
--- a/SOPE/NGCards/ChangeLog
+++ b/SOPE/NGCards/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-26  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* CardElement.m (-setValues:): new method. Actual renamed version
+	of prior setValuesAsCopy:.
+
 2010-10-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* iCalTimeZone.m (-dateForDateTimeString:): adjust dates since