Revision: 3689
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3689&view=rev
Author:   hofman
Date:     2008-04-09 09:55:10 -0700 (Wed, 09 Apr 2008)

Log Message:
-----------
Use pointer equality for annotations.

Modified Paths:
--------------
    trunk/SKCFCallBacks.h
    trunk/SKCFCallBacks.m
    trunk/SKMainWindowController.m
    trunk/Skim.xcodeproj/project.pbxproj

Modified: trunk/SKCFCallBacks.h
===================================================================
--- trunk/SKCFCallBacks.h       2008-04-09 16:27:51 UTC (rev 3688)
+++ trunk/SKCFCallBacks.h       2008-04-09 16:55:10 UTC (rev 3689)
@@ -71,3 +71,6 @@
 
 
 extern const CFArrayCallBacks SKNSRectArrayCallbacks;
+
+
+extern const CFSetCallBacks SKPointerEqualObjectSetCallbacks;

Modified: trunk/SKCFCallBacks.m
===================================================================
--- trunk/SKCFCallBacks.m       2008-04-09 16:27:51 UTC (rev 3688)
+++ trunk/SKCFCallBacks.m       2008-04-09 16:55:10 UTC (rev 3689)
@@ -119,3 +119,12 @@
     SKNSRectCopyDescription,
     SKNSRectEqual
 };
+
+const CFSetCallBacks SKPointerEqualObjectSetCallbacks = {
+    0,   // version
+    SKNSObjectRetain,
+    SKNSObjectRelease,
+    SKNSObjectCopyDescription,
+    NULL, // equal
+    NULL // hash
+};

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2008-04-09 16:27:51 UTC (rev 3688)
+++ trunk/SKMainWindowController.m      2008-04-09 16:55:10 UTC (rev 3689)
@@ -1139,11 +1139,16 @@
 }
 
 - (void)setNotes:(NSArray *)newNotes {
-    NSSet *old = [[NSSet alloc] initWithArray:notes];
-    NSSet *new = [[NSSet alloc] initWithArray:newNotes];
-    NSMutableSet *removed = [old mutableCopy];
-    NSMutableSet *added = [new mutableCopy];
+    NSMutableSet *old = (NSMutableSet *)CFSetCreateMutable(NULL, 0, 
&SKPointerEqualObjectSetCallbacks);
+    NSMutableSet *new = (NSMutableSet *)CFSetCreateMutable(NULL, 0, 
&SKPointerEqualObjectSetCallbacks);
+    NSMutableSet *removed = (NSMutableSet *)CFSetCreateMutableCopy(NULL, 0, 
(CFSetRef)old);
+    NSMutableSet *added = (NSMutableSet *)CFSetCreateMutableCopy(NULL, 0, 
(CFSetRef)new);
+    
+    [old addObjectsFromArray:notes];
+    [new addObjectsFromArray:newNotes];
+    removed = (NSMutableSet *)CFSetCreateMutableCopy(NULL, 0, (CFSetRef)old);
     [removed minusSet:new];
+    added = (NSMutableSet *)CFSetCreateMutableCopy(NULL, 0, (CFSetRef)new);
     [added minusSet:old];
     [old release];
     [new release];
@@ -1272,8 +1277,11 @@
 }
 
 - (void)setSnapshots:(NSArray *)newSnapshots {
-    NSMutableSet *removed = [[NSMutableSet alloc] initWithArray:snapshots];
-    NSSet *new = [[NSSet alloc] initWithArray:newSnapshots];
+    NSMutableSet *removed = (NSMutableSet *)CFSetCreateMutable(NULL, 0, 
&SKPointerEqualObjectSetCallbacks);
+    NSMutableSet *new = (NSMutableSet *)CFSetCreateMutable(NULL, 0, 
&SKPointerEqualObjectSetCallbacks);
+    
+    [new addObjectsFromArray:newSnapshots];
+    [removed addObjectsFromArray:snapshots];
     [removed minusSet:new];
     [new release];
     

Modified: trunk/Skim.xcodeproj/project.pbxproj
===================================================================
--- trunk/Skim.xcodeproj/project.pbxproj        2008-04-09 16:27:51 UTC (rev 
3688)
+++ trunk/Skim.xcodeproj/project.pbxproj        2008-04-09 16:55:10 UTC (rev 
3689)
@@ -987,6 +987,7 @@
                                CE2DE4CF0B85D89B00D0DA12 /* Controllers */,
                                CE2DE4D00B85D8C400D0DA12 /* Windows */,
                                CE2DE4D10B85D92F00D0DA12 /* Views */,
+                               CE32DC1D0DAD282E0099414B /* Parsers */,
                                CE070EC10B89063400733CC8 /* Categories */,
                                CE2DE4D40B85DA1C00D0DA12 /* Miscellaneous */,
                        );
@@ -1324,20 +1325,27 @@
                                45A3BD070B4F0770002B297F /* SKStringConstants.m 
*/,
                                CE0464A00B84E3E400C11E4A /* OBUtilities.h */,
                                CE0464A10B84E3E400C11E4A /* OBUtilities.m */,
-                               CE1E2B260BDAB6180011D9DD /* SKPDFSynchronizer.h 
*/,
-                               CE1E2B270BDAB6180011D9DD /* SKPDFSynchronizer.m 
*/,
-                               CE48BAD50C089EA300A166C6 /* SKTemplateParser.h 
*/,
-                               CE48BAD60C089EA300A166C6 /* SKTemplateParser.m 
*/,
                                CE5BD6710C7ADF1500EBDCF7 /* 
SKTypeSelectHelper.h */,
                                CE5BD6720C7ADF1500EBDCF7 /* 
SKTypeSelectHelper.m */,
-                               CE5FA1650C909886008BE480 /* SKFDFParser.h */,
-                               CE5FA1660C909886008BE480 /* SKFDFParser.m */,
                                CEE54F8E0DA3FE9A0037169F /* 
SKUnarchiveFromDataArrayTransformer.h */,
                                CEE54F8F0DA3FE9A0037169F /* 
SKUnarchiveFromDataArrayTransformer.m */,
                        );
                        name = Miscellaneous;
                        sourceTree = "<group>";
                };
+               CE32DC1D0DAD282E0099414B /* Parsers */ = {
+                       isa = PBXGroup;
+                       children = (
+                               CE5FA1650C909886008BE480 /* SKFDFParser.h */,
+                               CE5FA1660C909886008BE480 /* SKFDFParser.m */,
+                               CE1E2B260BDAB6180011D9DD /* SKPDFSynchronizer.h 
*/,
+                               CE1E2B270BDAB6180011D9DD /* SKPDFSynchronizer.m 
*/,
+                               CE48BAD50C089EA300A166C6 /* SKTemplateParser.h 
*/,
+                               CE48BAD60C089EA300A166C6 /* SKTemplateParser.m 
*/,
+                       );
+                       name = Parsers;
+                       sourceTree = "<group>";
+               };
                CE4DA8CF0B9E157E0039E89C /* Help Sources */ = {
                        isa = PBXGroup;
                        children = (


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 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to