[Skim-app-commit] SF.net SVN: skim-app:[5048] trunk/SKTemplateParser.m

[<ho...@us...>]

Revision: 5048
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5048&view=rev
Author:   hofman
Date:     2008-12-11 16:06:25 +0000 (Thu, 11 Dec 2008)

Log Message:
-----------
templateStringValue never returns nil unless the receiver is nil

Modified Paths:
--------------
    trunk/SKTemplateParser.m

Modified: trunk/SKTemplateParser.m
===================================================================
--- trunk/SKTemplateParser.m	2008-12-11 16:02:57 UTC (rev 5047)
+++ trunk/SKTemplateParser.m	2008-12-11 16:06:25 UTC (rev 5048)
@@ -445,7 +445,7 @@
             if (type == SKValueTemplateTagType) {
                 
                 if (keyValue)
-                    [result appendString:[keyValue templateStringValue] ?: @""];
+                    [result appendString:[keyValue templateStringValue]];
                 
             } else if (type == SKCollectionTemplateTagType) {
                 
@@ -810,7 +810,7 @@
 }
 
 - (NSAttributedString *)templateAttributedStringValueWithAttributes:(NSDictionary *)attributes {
-    return [[[NSAttributedString alloc] initWithString:[self templateStringValue] ?: @"" attributes:attributes] autorelease];
+    return [[[NSAttributedString alloc] initWithString:[self templateStringValue] attributes:attributes] autorelease];
 }
 
 @end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.