[Skim-app-commit] SF.net SVN: skim-app: [4178] trunk

[hofman]

Revision: 4178
          http://skim-app.svn.sourceforge.net/skim-app/?rev=4178&view=rev
Author:   hofman
Date:     2008-07-10 05:30:55 -0700 (Thu, 10 Jul 2008)

Log Message:
-----------
Use @synchronized instead of lock.

Modified Paths:
--------------
    trunk/SKPDFSynchronizer.h
    trunk/SKPDFSynchronizer.m

Modified: trunk/SKPDFSynchronizer.h
===================================================================
--- trunk/SKPDFSynchronizer.h   2008-07-10 12:04:44 UTC (rev 4177)
+++ trunk/SKPDFSynchronizer.h   2008-07-10 12:30:55 UTC (rev 4178)
@@ -48,8 +48,6 @@
     
     id delegate;
     
-    NSLock *lock;
-    
     id serverOnMainThread;
     id serverOnServerThread;
     NSConnection *mainThreadConnection;

Modified: trunk/SKPDFSynchronizer.m
===================================================================
--- trunk/SKPDFSynchronizer.m   2008-07-10 12:04:44 UTC (rev 4177)
+++ trunk/SKPDFSynchronizer.m   2008-07-10 12:30:55 UTC (rev 4178)
@@ -106,8 +106,6 @@
         fileName = nil;
         lastModDate = nil;
         
-        lock = [[NSLock alloc] init];
-        
         NSPort *port1 = [NSPort port];
         NSPort *port2 = [NSPort port];
         
@@ -137,7 +135,6 @@
 }
 
 - (void)dealloc {
-    [lock release];
     [pages release];
     [lines release];
     [fileName release];
@@ -156,39 +153,37 @@
 }
 
 - (NSString *)fileName {
-    [lock lock];
-    NSString *file = [[fileName retain] autorelease];
-    [lock unlock];
-    return file;
+    @synchronized(self) {
+        return [[fileName retain] autorelease];
+    }
 }
 
 - (void)setFileName:(NSString *)newFileName {
-    [lock lock];
-    if (fileName != newFileName) {
-        if ([fileName isEqualToString:newFileName] == NO && lastModDate) {
-            [lastModDate release];
-            lastModDate = nil;
+    @synchronized(self) {
+        if (fileName != newFileName) {
+            if ([fileName isEqualToString:newFileName] == NO && lastModDate) {
+                [lastModDate release];
+                lastModDate = nil;
+            }
+            [fileName release];
+            fileName = [newFileName retain];
         }
-        [fileName release];
-        fileName = [newFileName retain];
     }
-    [lock unlock];
 }
 
 - (NSDate *)lastModDate {
-    [lock lock];
-    NSDate *date = [[lastModDate retain] autorelease];
-    [lock unlock];
-    return date;
+    @synchronized(self) {
+        return [[lastModDate retain] autorelease];
+    }
 }
 
 - (void)setLastModDate:(NSDate *)date {
-    [lock lock];
-    if (date != lastModDate) {
-        [lastModDate release];
-        lastModDate = [date retain];
+    @synchronized(self) {
+        if (date != lastModDate) {
+            [lastModDate release];
+            lastModDate = [date retain];
+        }
     }
-    [lock unlock];
 }
 
 #pragma mark API


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

-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit