[Bibdesk-commit] SF.net SVN: bibdesk:[17579] trunk/bibdesk/BibDocument.m

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

Revision: 17579
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=17579&view=rev
Author:   hofman
Date:     2010-11-29 12:10:23 +0000 (Mon, 29 Nov 2010)

Log Message:
-----------
avoid repeating code

Modified Paths:
--------------
    trunk/bibdesk/BibDocument.m

Modified: trunk/bibdesk/BibDocument.m
===================================================================
--- trunk/bibdesk/BibDocument.m	2010-11-29 11:19:42 UTC (rev 17578)
+++ trunk/bibdesk/BibDocument.m	2010-11-29 12:10:23 UTC (rev 17579)
@@ -1676,36 +1676,32 @@
     BDSKPRECONDITION(nil != template);
     BDSKTemplateFormat format = [template templateFormat];
     BDSKPRECONDITION(format & (BDSKRTFTemplateFormat | BDSKDocTemplateFormat | BDSKDocxTemplateFormat | BDSKOdtTemplateFormat | BDSKWebArchiveTemplateFormat | BDSKRichHTMLTemplateFormat));
+    
+    NSString *docType = nil;
+    if (format & BDSKRTFTemplateFormat)
+        docType = NSRTFTextDocumentType;
+    else if (format & BDSKRichHTMLTemplateFormat)
+        docType = NSHTMLTextDocumentType;
+    else if (format & BDSKDocTemplateFormat)
+        docType = NSDocFormatTextDocumentType;
+    else if (format & BDSKDocxTemplateFormat)
+        docType = NSOfficeOpenXMLTextDocumentType;
+    else if (format & BDSKOdtTemplateFormat)
+        docType = NSOpenDocumentTextDocumentType;
+    else if (format & BDSKWebArchiveTemplateFormat)
+        docType = NSWebArchiveTextDocumentType;
+    else return nil;
+    
     NSDictionary *docAttributes = nil;
     NSAttributedString *fileTemplate = [BDSKTemplateObjectProxy attributedStringByParsingTemplate:template withObject:self publications:items publicationsContext:itemsContext documentAttributes:&docAttributes];
     NSMutableDictionary *mutableAttributes = [NSMutableDictionary dictionaryWithDictionary:docAttributes];
     
     // create some useful metadata, with an option to disable for the paranoid
-    if([[NSUserDefaults standardUserDefaults] boolForKey:BDSKDisableExportAttributesKey]){
+    if([[NSUserDefaults standardUserDefaults] boolForKey:BDSKDisableExportAttributesKey])
         [mutableAttributes addEntriesFromDictionary:[NSDictionary dictionaryWithObjectsAndKeys:NSFullUserName(), NSAuthorDocumentAttribute, [NSDate date], NSCreationTimeDocumentAttribute, [NSLocalizedString(@"BibDesk export of ", @"Error description") stringByAppendingString:[[[self fileURL] path] lastPathComponent]], NSTitleDocumentAttribute, nil]];
-    }
+    [mutableAttributes setObject:docType forKey:NSDocumentTypeDocumentAttribute];
     
-    if (format & BDSKRTFTemplateFormat) {
-        return [fileTemplate RTFFromRange:NSMakeRange(0,[fileTemplate length]) documentAttributes:mutableAttributes];
-    } else if (format & BDSKRichHTMLTemplateFormat) {
-        [mutableAttributes setObject:NSHTMLTextDocumentType forKey:NSDocumentTypeDocumentAttribute];
-        NSError *error = nil;
-        return [fileTemplate dataFromRange:NSMakeRange(0,[fileTemplate length]) documentAttributes:mutableAttributes error:&error];
-    } else if (format & BDSKDocTemplateFormat) {
-        return [fileTemplate docFormatFromRange:NSMakeRange(0,[fileTemplate length]) documentAttributes:mutableAttributes];
-    } else if (format & BDSKDocxTemplateFormat) {
-        [mutableAttributes setObject:NSOfficeOpenXMLTextDocumentType forKey:NSDocumentTypeDocumentAttribute];
-        NSError *error = nil;
-        return [fileTemplate dataFromRange:NSMakeRange(0,[fileTemplate length]) documentAttributes:mutableAttributes error:&error];
-    } else if (format & BDSKOdtTemplateFormat) {
-        [mutableAttributes setObject:NSOpenDocumentTextDocumentType forKey:NSDocumentTypeDocumentAttribute];
-        NSError *error = nil;
-        return [fileTemplate dataFromRange:NSMakeRange(0,[fileTemplate length]) documentAttributes:mutableAttributes error:&error];
-    } else if (format & BDSKWebArchiveTemplateFormat) {
-        [mutableAttributes setObject:NSWebArchiveTextDocumentType forKey:NSDocumentTypeDocumentAttribute];
-        NSError *error = nil;
-        return [fileTemplate dataFromRange:NSMakeRange(0,[fileTemplate length]) documentAttributes:mutableAttributes error:&error];
-    } else return nil;
+    return [fileTemplate dataFromRange:NSMakeRange(0,[fileTemplate length]) documentAttributes:mutableAttributes error:NULL];
 }
 
 - (NSData *)dataUsingTemplate:(BDSKTemplate *)template{


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