Revision: 5017
http://skim-app.svn.sourceforge.net/skim-app/?rev=5017&view=rev
Author: hofman
Date: 2008-12-02 10:33:58 +0000 (Tue, 02 Dec 2008)
Log Message:
-----------
Override template values for NSNull, so it's considered empty
Modified Paths:
--------------
trunk/SKTemplateParser.m
Modified: trunk/SKTemplateParser.m
===================================================================
--- trunk/SKTemplateParser.m 2008-12-01 18:12:15 UTC (rev 5016)
+++ trunk/SKTemplateParser.m 2008-12-02 10:33:58 UTC (rev 5017)
@@ -864,7 +864,7 @@
NSString *description = nil;
if ([self respondsToSelector:@selector(stringValue)])
description = [self performSelector:@selector(stringValue)];
- if ([self respondsToSelector:@selector(string)])
+ else if ([self respondsToSelector:@selector(string)])
description = [self performSelector:@selector(string)];
return description ?: [self description];
}
@@ -906,9 +906,6 @@
#pragma mark -
[EMAIL PROTECTED] NSAttributedString (SKTemplateParser)
[EMAIL PROTECTED]
-
@implementation NSAttributedString (SKTemplateParser)
- (NSAttributedString
*)templateAttributedStringValueWithAttributes:(NSDictionary *)attributes {
@@ -932,9 +929,6 @@
#pragma mark -
[EMAIL PROTECTED] NSData (SKTemplateParser)
[EMAIL PROTECTED]
-
@implementation NSData (SKTemplateParser)
- (NSString *)templateStringValue {
return [[[NSString alloc] initWithData:self encoding:NSUTF8StringEncoding]
autorelease] ?: [self description];
@@ -1015,9 +1009,13 @@
#pragma mark -
[EMAIL PROTECTED] NSNumber (SKTemplateParser)
[EMAIL PROTECTED]
-
@implementation NSNumber (SKTemplateParser)
- (BOOL)isNotEmpty { return [self isEqualToNumber:[NSNumber
numberWithBool:NO]] == NO && [self isEqualToNumber:[NSNumber numberWithInt:0]]
== NO; }
@end
+
+#pragma mark -
+
[EMAIL PROTECTED] NSNull (SKTemplateParser)
+- (NSString *)templateStringValue{ return @""; }
+- (BOOL)isNotEmpty { return NO; }
[EMAIL PROTECTED]
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
