From 5e97e7930d1fbbb3220d79518eecf6e0b2670fba Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 7 Mar 2007 21:22:45 +0000 Subject: [PATCH] Monotone-Parent: 40dd65cfec9c0e6ba695731ca96f0c4ba24cd875 Monotone-Revision: fa56be5fb804a988ea6d2201e28fb6cff432c939 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-03-07T21:22:45 Monotone-Branch: ca.inverse.sogo --- SOPE/NGCards/ChangeLog | 5 +++++ SOPE/NGCards/NSString+NGCards.m | 13 +++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog index 96ced1be7..2ec2ccb34 100644 --- a/SOPE/NGCards/ChangeLog +++ b/SOPE/NGCards/ChangeLog @@ -1,5 +1,10 @@ 2007-03-07 Wolfgang Sourdeau + * NSString+NGCards.m ([NSString -foldedForVersitCards]): + simplified method by initializing and returning folderString + unconditionnally. If length < 76, the original string is appended + to it. + * CardGroup.m ([CardGroup +groupWithTag:aTag]): simply invoke [self elementWithTag:]. ([CardGroup +groupWithTag:aTagchildren:someChildren]): same as diff --git a/SOPE/NGCards/NSString+NGCards.m b/SOPE/NGCards/NSString+NGCards.m index eb0c4e421..21cee5b57 100644 --- a/SOPE/NGCards/NSString+NGCards.m +++ b/SOPE/NGCards/NSString+NGCards.m @@ -42,19 +42,18 @@ static NSString *commaSeparator = nil; - (NSString *) foldedForVersitCards { - NSString *newString; NSMutableString *foldedString; unsigned int length; NSRange subStringRange; + foldedString = [NSMutableString new]; + [foldedString autorelease]; + length = [self length]; if (length < 76) - newString = self; + [foldedString appendString: self]; else { - foldedString = [NSMutableString new]; - [foldedString autorelease]; - subStringRange = NSMakeRange (0, 75); [foldedString appendFormat: @"%@\r\n", [self substringWithRange: subStringRange]]; @@ -68,11 +67,9 @@ static NSString *commaSeparator = nil; subStringRange.length = length - subStringRange.location; [foldedString appendFormat: @" %@", [self substringWithRange: subStringRange]]; - - newString = foldedString; } - return newString; + return foldedString; } - (NSArray *) asCardAttributeValues