Revision: 3629
http://skim-app.svn.sourceforge.net/skim-app/?rev=3629&view=rev
Author: hofman
Date: 2008-04-04 17:20:56 -0700 (Fri, 04 Apr 2008)
Log Message:
-----------
Check conformance to UTI rather than equality.
Modified Paths:
--------------
trunk/SKDocumentController.m
Modified: trunk/SKDocumentController.m
===================================================================
--- trunk/SKDocumentController.m 2008-04-04 22:32:01 UTC (rev 3628)
+++ trunk/SKDocumentController.m 2008-04-05 00:20:56 UTC (rev 3629)
@@ -69,38 +69,42 @@
static NSString *SKPostScriptDocumentUTI = @"com.adobe.postscript";
static NSString *SKDVIDocumentUTI = @"net.sourceforge.skim-app.dvi"; // I
don't know the UTI for dvi, is there one?
+static BOOL SKIsEqualToDocumentType(NSString *docType, NSString *docTypeName,
NSString *docUTI) {
+ return ([[NSWorkspace sharedWorkspace]
respondsToSelector:@selector(type:conformsToType:)] && [[NSWorkspace
sharedWorkspace] type:docType conformsToType:docUTI]) || [docType
isEqualToString:docTypeName];
+}
+
BOOL SKIsPDFDocumentType(NSString *docType) {
- return [docType isEqualToString:SKPDFDocumentTypeName] || [docType
isEqualToString:SKPDFDocumentUTI];
+ return SKIsEqualToDocumentType(docType, SKPDFDocumentTypeName,
SKPDFDocumentUTI);
}
BOOL SKIsPDFBundleDocumentType(NSString *docType) {
- return [docType isEqualToString:SKPDFBundleDocumentTypeName] || [docType
isEqualToString:SKPDFBundleDocumentUTI];
+ return SKIsEqualToDocumentType(docType, SKPDFBundleDocumentTypeName,
SKPDFBundleDocumentUTI);
}
BOOL SKIsEmbeddedPDFDocumentType(NSString *docType) {
- return [docType isEqualToString:SKEmbeddedPDFDocumentTypeName] || [docType
isEqualToString:SKEmbeddedPDFDocumentUTI];
+ return SKIsEqualToDocumentType(docType, SKEmbeddedPDFDocumentTypeName,
SKEmbeddedPDFDocumentUTI);
}
BOOL SKIsBarePDFDocumentType(NSString *docType) {
- return [docType isEqualToString:SKBarePDFDocumentTypeName] || [docType
isEqualToString:SKBarePDFDocumentUTI];
+ return SKIsEqualToDocumentType(docType, SKBarePDFDocumentTypeName,
SKBarePDFDocumentUTI);
}
BOOL SKIsNotesDocumentType(NSString *docType) {
- return [docType isEqualToString:SKNotesDocumentTypeName] || [docType
isEqualToString:SKNotesDocumentUTI];
+ return SKIsEqualToDocumentType(docType, SKNotesDocumentTypeName,
SKNotesDocumentUTI);
}
BOOL SKIsNotesTextDocumentType(NSString *docType) {
- return [docType isEqualToString:SKNotesTextDocumentTypeName] || [docType
isEqualToString:SKTextDocumentUTI];
+ return SKIsEqualToDocumentType(docType, SKNotesTextDocumentTypeName,
SKTextDocumentUTI);
}
BOOL SKIsNotesRTFDocumentType(NSString *docType) {
- return [docType isEqualToString:SKNotesRTFDocumentTypeName] || [docType
isEqualToString:SKRTFDocumentUTI];
+ return SKIsEqualToDocumentType(docType, SKNotesRTFDocumentTypeName,
SKRTFDocumentUTI);
}
BOOL SKIsNotesRTFDDocumentType(NSString *docType) {
- return [docType isEqualToString:SKNotesRTFDDocumentTypeName] || [docType
isEqualToString:SKRTFDDocumentUTI];
+ return SKIsEqualToDocumentType(docType, SKNotesRTFDDocumentTypeName,
SKRTFDDocumentUTI);
}
BOOL SKIsNotesFDFDocumentType(NSString *docType) {
- return [docType isEqualToString:SKNotesFDFDocumentTypeName] || [docType
isEqualToString:SKFDFDocumentUTI];
+ return SKIsEqualToDocumentType(docType, SKNotesFDFDocumentTypeName,
SKFDFDocumentUTI);
}
BOOL SKIsPostScriptDocumentType(NSString *docType) {
- return [docType isEqualToString:SKPostScriptDocumentTypeName] || [docType
isEqualToString:SKPostScriptDocumentUTI];
+ return SKIsEqualToDocumentType(docType, SKPostScriptDocumentTypeName,
SKPostScriptDocumentUTI);
}
BOOL SKIsDVIDocumentType(NSString *docType) {
- return [docType isEqualToString:SKDVIDocumentTypeName] || [docType
isEqualToString:SKDVIDocumentUTI];
+ return SKIsEqualToDocumentType(docType, SKDVIDocumentTypeName,
SKDVIDocumentUTI);
}
NSString *SKGetPDFDocumentType(void) {
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 2008 JavaOne(SM) Conference
Register now and save $200. Hurry, offer ends at 11:59 p.m.,
Monday, April 7! Use priority code J8TLD2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
