Revision: 5388
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5388&view=rev
Author:   hofman
Date:     2009-05-24 10:16:45 +0000 (Sun, 24 May 2009)

Log Message:
-----------
rename method and move protocol declaration to server header, don't declare 
protocol conformance

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

Modified: trunk/SKPDFDocument.m
===================================================================
--- trunk/SKPDFDocument.m       2009-05-20 16:47:16 UTC (rev 5387)
+++ trunk/SKPDFDocument.m       2009-05-24 10:16:45 UTC (rev 5388)
@@ -122,7 +122,7 @@
 - (void)dealloc {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
     [mainWindowController release];
-    [synchronizer stopDOServer];
+    [synchronizer terminate];
     [synchronizer release];
     [presentationNotesDocument release];
     [watchedFile release];

Modified: trunk/SKPDFSynchronizer.h
===================================================================
--- trunk/SKPDFSynchronizer.h   2009-05-20 16:47:16 UTC (rev 5387)
+++ trunk/SKPDFSynchronizer.h   2009-05-24 10:16:45 UTC (rev 5388)
@@ -39,14 +39,7 @@
 #import <Cocoa/Cocoa.h>
 
 
-...@protocol SKPDFSynchronizerClient
-- (void)setServerProxy:(byref id)anObject;
-- (oneway void)foundLine:(NSInteger)line inFile:(bycopy NSString *)file;
-- (oneway void)foundLocation:(NSPoint)point atPageIndex:(NSUInteger)pageIndex 
isFlipped:(BOOL)isFlipped;
-...@end
-
-
-...@interface SKPDFSynchronizer : NSObject <SKPDFSynchronizerClient> {
+...@interface SKPDFSynchronizer : NSObject {
     id delegate;
     
     id server;
@@ -63,7 +56,8 @@
 - (void)findFileAndLineForLocation:(NSPoint)point inRect:(NSRect)rect 
pageBounds:(NSRect)bounds atPageIndex:(NSUInteger)pageIndex;
 - (void)findPageAndLocationForLine:(NSInteger)line inFile:(NSString *)file;
 
-- (void)stopDOServer;
+// this must be called to stop the DO server from running in the server thread
+- (void)terminate;
 
 @end
 

Modified: trunk/SKPDFSynchronizer.m
===================================================================
--- trunk/SKPDFSynchronizer.m   2009-05-20 16:47:16 UTC (rev 5387)
+++ trunk/SKPDFSynchronizer.m   2009-05-24 10:16:45 UTC (rev 5388)
@@ -70,7 +70,7 @@
 
 #pragma mark | API
 
-- (void)stopDOServer {
+- (void)terminate {
     // tell the server thread to stop running, this is also necessary to 
tickle the server thread so the runloop can finish
     [serverProxy stopRunning];
     // set the stop flag immediately, so any running task may stop in its 
tracks

Modified: trunk/SKPDFSynchronizerServer.h
===================================================================
--- trunk/SKPDFSynchronizerServer.h     2009-05-20 16:47:16 UTC (rev 5387)
+++ trunk/SKPDFSynchronizerServer.h     2009-05-24 10:16:45 UTC (rev 5388)
@@ -39,15 +39,22 @@
 #import <Cocoa/Cocoa.h>
 #import "synctex_parser.h"
 
-
+// these methods can be sent to the proxy for the server and are implemented 
by the server
 @protocol SKPDFSynchronizerServer
 - (oneway void)stopRunning; 
 - (oneway void)findFileAndLineForLocation:(NSPoint)point inRect:(NSRect)rect 
pageBounds:(NSRect)bounds atPageIndex:(NSUInteger)pageIndex;
 - (oneway void)findPageAndLocationForLine:(NSInteger)line inFile:(bycopy 
NSString *)file;
 @end
 
+// these methods can be sent to the proxy for the client and must be 
implemented by the client
+...@protocol SKPDFSynchronizerClient
+- (void)setServerProxy:(byref id)anObject;
+- (oneway void)foundLine:(NSInteger)line inFile:(bycopy NSString *)file;
+- (oneway void)foundLocation:(NSPoint)point atPageIndex:(NSUInteger)pageIndex 
isFlipped:(BOOL)isFlipped;
+...@end
 
-...@interface SKPDFSynchronizerServer : NSObject <SKPDFSynchronizerServer> {
+
+...@interface SKPDFSynchronizerServer : NSObject {
     NSString *fileName;
     NSString *syncFileName;
     NSDate *lastModDate;


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

------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, & 
iPhoneDevCamp asthey present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://www.creativitycat.com 
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to