From 443265db50db4b7bc29d1af375d49b4f232a2ecb Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 7 Jul 2008 15:50:50 +0000
Subject: [PATCH] Monotone-Parent: 45f8f00965e4667aab6443560550ea1d92c6d11d
 Monotone-Revision: 10716bba581bb0dd4ad881e814040b2adb37ba10

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-07-07T15:50:50
Monotone-Branch: ca.inverse.sogo
---
 SOPE/NGCards/CardElement.m | 37 ++++++++++++++++++++++++-------------
 SOPE/NGCards/ChangeLog     | 10 ++++++++++
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/SOPE/NGCards/CardElement.m b/SOPE/NGCards/CardElement.m
index 5cc2e8c55..a6b1b5869 100644
--- a/SOPE/NGCards/CardElement.m
+++ b/SOPE/NGCards/CardElement.m
@@ -124,20 +124,12 @@
 
 - (void) setTag: (NSString *) aTag
 {
-  if (tag)
-    [tag release];
-  tag = aTag;
-  if (tag)
-    [tag retain];
+  ASSIGN (tag, aTag);
 }
 
 - (void) setGroup: (NSString *) aGroup
 {
-  if (group)
-    [group release];
-  group = aGroup;
-  if (group)
-    [group retain];
+  ASSIGN (group, aGroup);
 }
 
 - (NSString *) group
@@ -147,6 +139,8 @@
 
 - (void) addValue: (NSString *) aValue
 {
+  if (!aValue)
+    aValue = @"";
   [values addObject: aValue];
 }
 
@@ -156,10 +150,13 @@
 }
 
 - (void) addAttribute: (NSString *) anAttribute
-                value: (NSString *) aType
+                value: (NSString *) aValue
 {
   NSMutableArray *attrValues;
 
+  if (!aValue)
+    aValue = @"";
+
   attrValues = [attributes objectForCaseInsensitiveKey: anAttribute];
   if (!attrValues)
     {
@@ -168,7 +165,7 @@
       [attributes setObject: attrValues forKey: anAttribute];
     }
 
-  [attrValues addObject: aType];
+  [attrValues addObject: aValue];
 }
 
 - (void) removeValue: (NSString *) aValue
@@ -177,6 +174,9 @@
   NSMutableArray *attrValues;
   NSString *currentValue;
 
+  if (!aValue)
+    aValue = @"";
+
   attrValues = [attributes objectForCaseInsensitiveKey: anAttribute];
   if (attrValues)
     {
@@ -243,8 +243,14 @@
 - (void) setValue: (unsigned int) anInt
                to: (NSString *) aValue
 {
-  while ([values count] <= anInt)
+  unsigned int count, max;
+
+  if (!aValue)
+    aValue = @"";
+  max = [values count];
+  for (count = max; count <= anInt; count++)
     [self addValue: @""];
+
   [values replaceObjectAtIndex: anInt withObject: aValue];
 }
 
@@ -307,6 +313,8 @@
   NSString *newValue;
   unsigned int index;
 
+  if (!aValue)
+    aValue = @"";
   newValue = [NSString stringWithFormat: @"%@=%@",
                        [aValueName uppercaseString],
                        aValue];
@@ -348,6 +356,9 @@
 {
   NSMutableArray *attrValues;
 
+  if (!aValue)
+    aValue = @"";
+
   attrValues = [attributes objectForCaseInsensitiveKey: anAttribute];
   if (!attrValues)
     {
diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog
index d5eb29030..d9e4b8afd 100644
--- a/SOPE/NGCards/ChangeLog
+++ b/SOPE/NGCards/ChangeLog
@@ -1,3 +1,13 @@
+2008-07-07  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* CardElement.m ([CardElement -addValue:aValue])
+	([CardElement -addAttribute:anAttributevalue:aValue])
+	([CardElement -removeValue:aValuefromAttribute:anAttribute])
+	([CardElement -setValue:anIntto:aValue])
+	([CardElement -setNamedValue:aValueNameto:aValue])
+	([CardElement -setValue:anIntofAttribute:anAttributeto:aValue]):
+	if aValue is nil, set it to an empty string.
+
 2008-07-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* CardGroup.m ([CardGroup +parseFromSource:source]): directly