[Bibdesk-commit] SF.net SVN: bibdesk: [7480] trunk/bibdesk/BDSKFile.m

[<ama...@us...>]

Revision: 7480
Author:   amaxwell
Date:     2006-08-18 14:42:36 -0700 (Fri, 18 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/bibdesk/?rev=7480&view=rev

Log Message:
-----------
only get fileURL when necessary in isEqual:

Modified Paths:
--------------
    trunk/bibdesk/BDSKFile.m
Modified: trunk/bibdesk/BDSKFile.m
===================================================================
--- trunk/bibdesk/BDSKFile.m	2006-08-18 21:22:47 UTC (rev 7479)
+++ trunk/bibdesk/BDSKFile.m	2006-08-18 21:42:36 UTC (rev 7480)
@@ -157,7 +157,6 @@
         
         // use accessors for encapsulation...
         const FSRef *fileRef = [self fsRef];
-        NSURL *fileURL = [self fileURL];
         
         if(fileRef && otherRef){
             
@@ -178,7 +177,7 @@
             
             // I didn't have an FSRef when created, but let's see if we can create one now...
             FSRef myRef;
-            if(CFURLGetFSRef((CFURLRef)fileURL, &myRef)){
+            if(CFURLGetFSRef((CFURLRef)[self fileURL], &myRef)){
                 const FSRef *myRefPtr = &myRef;
                 isEqual = (noErr == FSCompareFSRefs(otherRef, myRefPtr));
             }
@@ -186,7 +185,7 @@
         } else { 
             
             // neither object has an FSRef; compare the file URLs as paths
-            isEqual = [[other fileURL] isEqualToFileURL:fileURL];
+            isEqual = [[other fileURL] isEqualToFileURL:[self fileURL]];
         }
     }
     return isEqual;


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