Move SPConnectionController's delegate methods to their own protocol.

4 files changed, 59 insertions, 14 deletions

diff --git a/Source/SPConnectionController.h b/Source/SPConnectionController.h
index 28f6f1bd..3dd0563e 100644
--- a/Source/SPConnectionController.h
+++ b/Source/SPConnectionController.h
@@ -25,11 +25,9 @@
 
 #import <MCPKit/MCPKit.h>
 
-#import "SPDatabaseDocument.h"
-#import "SPKeychain.h"
-#import "SPSSHTunnel.h"
+#import "SPConnectionControllerDelegate.h"
 
-@class BWAnchoredButtonBar;
+@class SPDatabaseDocument, SPKeychain, SPSSHTunnel, BWAnchoredButtonBar;
 
 @interface NSObject (BWAnchoredButtonBar)
 
@@ -37,13 +35,6 @@
 
 @end
 
-@interface NSObject (SPConnectionControllerDelegate)
-
-- (void)connectionControllerInitiatingConnection:(id)controller;
-- (void)connectionControllerConnectAttemptFailed:(id)controller;
-
-@end
-
 @interface SPFlippedView : NSView
 
 - (BOOL)isFlipped;
@@ -52,7 +43,7 @@
 
 @interface SPConnectionController : NSObject 
 {
-	id delegate;
+	id <SPConnectionControllerDelegate> delegate;
 	
 	SPDatabaseDocument *tableDocument;
 	NSView *databaseConnectionSuperview;
@@ -144,7 +135,7 @@
     SPFavoritesSortItem previousSortItem, currentSortItem;
 }
 
-@property (readwrite, assign) id delegate;
+@property (readwrite, assign) id <SPConnectionControllerDelegate> delegate;
 @property (readwrite, assign) NSInteger type;
 @property (readwrite, retain) NSString *name;
 @property (readwrite, retain) NSString *host;
diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m
index 7891ff1e..241a6e1d 100644
--- a/Source/SPConnectionController.m
+++ b/Source/SPConnectionController.m
@@ -24,11 +24,14 @@
 //  More info at <http://code.google.com/p/sequel-pro/>
 
 #import "SPConnectionController.h"
+#import "SPDatabaseDocument.h"
 #import "SPAppController.h"
 #import "SPPreferenceController.h"
 #import "ImageAndTextCell.h"
 #import "RegexKitLite.h"
 #import "SPAlertSheets.h"
+#import "SPKeychain.h"
+#import "SPSSHTunnel.h"
 
 @interface SPConnectionController (PrivateAPI)
 
diff --git a/Source/SPConnectionControllerDelegate.h b/Source/SPConnectionControllerDelegate.h
new file mode 100644
index 00000000..892a52ae
--- /dev/null
+++ b/Source/SPConnectionControllerDelegate.h
@@ -0,0 +1,49 @@
+//
+//  $Id$
+//
+//  SPConnectionControllerDelegate.h
+//  sequel-pro
+//
+//  Created by Stuart Connolly (stuconnolly.com) on April 15, 2010
+//  Copyright (c) 2010 Stuart Connolly. All rights reserved.
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 2 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+//  More info at <http://code.google.com/p/sequel-pro/>
+
+/**
+ * @protocol SPConnectionControllerDelegate SPConnectionControllerDelegate.h
+ *
+ * @author Stuart Connolly http://stuconnolly.com/ 
+ *
+ * Connection controller delegate protocol.
+ */
+@protocol SPConnectionControllerDelegate
+
+/**
+ * Called when the connection controller starts initiating the connection process.
+ *
+ * @param controller The calling connection controller
+ */
+- (void)connectionControllerInitiatingConnection:(id)controller;
+
+/**
+ * Called when the connection controller's connection attempt failed.
+ *
+ * @param controller The calling connection controller
+ */
+- (void)connectionControllerConnectAttemptFailed:(id)controller;
+
+@end
diff --git a/Source/SPDatabaseDocument.h b/Source/SPDatabaseDocument.h
index 5d48aa99..f01abe63 100644
--- a/Source/SPDatabaseDocument.h
+++ b/Source/SPDatabaseDocument.h
@@ -35,10 +35,12 @@
 	   SPWindowController,
 	   SPServerSupport;
 
+@protocol SPConnectionControllerDelegate;
+
 /**
  * The SPDatabaseDocument class controls the primary database view window.
  */
-@interface SPDatabaseDocument : NSObject <NSUserInterfaceValidations>
+@interface SPDatabaseDocument : NSObject <NSUserInterfaceValidations, SPConnectionControllerDelegate>
 {
 	// IBOutlets
 	IBOutlet id tablesListInstance;