Revision: 6797
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6797&view=rev
Author:   hofman
Date:     2010-09-11 11:20:57 +0000 (Sat, 11 Sep 2010)

Log Message:
-----------
rename snapshot controller delegate methods

Modified Paths:
--------------
    trunk/SKMainWindowController.m
    trunk/SKSnapshotWindowController.h
    trunk/SKSnapshotWindowController.m

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2010-09-11 11:10:23 UTC (rev 6796)
+++ trunk/SKMainWindowController.m      2010-09-11 11:20:57 UTC (rev 6797)
@@ -2053,11 +2053,11 @@
     [[self mutableArrayValueForKey:SNAPSHOTS_KEY] addObject:controller];
 }
 
-- (void)snapshotControllerWindowWillClose:(SKSnapshotWindowController 
*)controller {
+- (void)snapshotControllerRemove:(SKSnapshotWindowController *)controller {
     [[self mutableArrayValueForKey:SNAPSHOTS_KEY] removeObject:controller];
 }
 
-- (void)snapshotControllerViewDidChange:(SKSnapshotWindowController 
*)controller {
+- (void)snapshotControllerChanged:(SKSnapshotWindowController *)controller {
     [self snapshotNeedsUpdate:controller];
 }
 

Modified: trunk/SKSnapshotWindowController.h
===================================================================
--- trunk/SKSnapshotWindowController.h  2010-09-11 11:10:23 UTC (rev 6796)
+++ trunk/SKSnapshotWindowController.h  2010-09-11 11:20:57 UTC (rev 6797)
@@ -99,8 +99,8 @@
 @optional
 
 - (void)snapshotControllerDidFinishSetup:(SKSnapshotWindowController 
*)controller;
-- (void)snapshotControllerWindowWillClose:(SKSnapshotWindowController 
*)controller;
-- (void)snapshotControllerViewDidChange:(SKSnapshotWindowController 
*)controller;
+- (void)snapshotControllerRemove:(SKSnapshotWindowController *)controller;
+- (void)snapshotControllerChanged:(SKSnapshotWindowController *)controller;
 - 
(NSRect)snapshotControllerTargetRectForMiniaturize:(SKSnapshotWindowController 
*)controller;
 - 
(NSRect)snapshotControllerSourceRectForDeminiaturize:(SKSnapshotWindowController
 *)controller;
 

Modified: trunk/SKSnapshotWindowController.m
===================================================================
--- trunk/SKSnapshotWindowController.m  2010-09-11 11:10:23 UTC (rev 6796)
+++ trunk/SKSnapshotWindowController.m  2010-09-11 11:20:57 UTC (rev 6797)
@@ -107,11 +107,11 @@
     [self setHasWindow:YES];
 }
 
-- (void)willRemove {
+- (void)doRemove {
     @try { [[NSUserDefaultsController sharedUserDefaultsController] 
removeObserver:self forKeys:[NSArray arrayWithObjects:SKSnapshotsOnTopKey, 
SKShouldAntiAliasKey, SKGreekingThresholdKey, SKPageBackgroundColorKey, nil]]; }
     @catch (id e) {}
-    if ([[self delegate] 
respondsToSelector:@selector(snapshotControllerWindowWillClose:)])
-        [[self delegate] snapshotControllerWindowWillClose:self];
+    if ([[self delegate] 
respondsToSelector:@selector(snapshotControllerRemove:)])
+        [[self delegate] snapshotControllerRemove:self];
     delegate = nil;
     // this is necessary to break a retain loop between the popup and its 
parent
        [NSAccessibilityUnignoredDescendant([pdfView scalePopUpButton]) 
accessibilitySetOverrideValue:nil forAttribute:NSAccessibilityParentAttribute];
@@ -151,15 +151,15 @@
 }
 
 - (void)handlePDFViewFrameChangedNotification:(NSNotification *)notification {
-    if ([[self delegate] 
respondsToSelector:@selector(snapshotControllerViewDidChange:)]) {
+    if ([[self delegate] 
respondsToSelector:@selector(snapshotControllerChanged:)]) {
         NSNotification *note = [NSNotification 
notificationWithName:SKSnapshotViewChangedNotification object:self];
         [[NSNotificationQueue defaultQueue] enqueueNotification:note 
postingStyle:NSPostWhenIdle coalesceMask:NSNotificationCoalescingOnName 
forModes:nil];
     }
 }
 
 - (void)handleViewChangedNotification:(NSNotification *)notification {
-    if ([[self delegate] 
respondsToSelector:@selector(snapshotControllerViewDidChange:)])
-        [[self delegate] snapshotControllerViewDidChange:self];
+    if ([[self delegate] 
respondsToSelector:@selector(snapshotControllerChanged:)])
+        [[self delegate] snapshotControllerChanged:self];
 }
 
 - (void)handleDidAddRemoveAnnotationNotification:(NSNotification 
*)notification {
@@ -183,7 +183,7 @@
 
 - (void)windowWillClose:(NSNotification *)notification {
     if (miniaturizing == NO)
-        [self willRemove];
+        [self doRemove];
     if ([[self window] isKeyWindow])
         [[[[self document] mainWindowController] window] makeKeyWindow];
     else if ([[self window] isMainWindow])
@@ -284,7 +284,7 @@
     if ([[self window] isVisible])
         [[self window] orderOut:nil];
     else
-        [self willRemove];
+        [self doRemove];
 }
 
 #pragma mark Acessors


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

------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to