aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPConnectionHandler.m
diff options
context:
space:
mode:
authorstuconnolly <stuart02@gmail.com>2013-01-22 17:14:03 +0000
committerstuconnolly <stuart02@gmail.com>2013-01-22 17:14:03 +0000
commit9ab31cc5b60bf0e4519c989a3e9d213da50f888d (patch)
tree5e2967e092096dd830351a222cfe65d008d41fbd /Source/SPConnectionHandler.m
parente2cc9e1953a142f182714fb02d7eca028398e368 (diff)
downloadsequelpro-9ab31cc5b60bf0e4519c989a3e9d213da50f888d.tar.gz
sequelpro-9ab31cc5b60bf0e4519c989a3e9d213da50f888d.tar.bz2
sequelpro-9ab31cc5b60bf0e4519c989a3e9d213da50f888d.zip
Remove useless init and dealloc method comments and perform general tidy up.
Diffstat (limited to 'Source/SPConnectionHandler.m')
-rw-r--r--Source/SPConnectionHandler.m18
1 files changed, 11 insertions, 7 deletions
diff --git a/Source/SPConnectionHandler.m b/Source/SPConnectionHandler.m
index 12b59b01..0bbd4409 100644
--- a/Source/SPConnectionHandler.m
+++ b/Source/SPConnectionHandler.m
@@ -52,7 +52,7 @@ static NSString *SPLocalhostAddress = @"127.0.0.1";
@implementation SPConnectionController (SPConnectionHandler)
-/*
+/**
* Set up the MySQL connection, either through a successful tunnel or directly in the background.
*/
- (void)initiateMySQLConnection
@@ -61,14 +61,18 @@ static NSString *SPLocalhostAddress = @"127.0.0.1";
if (isTestingConnection) {
if (sshTunnel) {
[progressIndicatorText setStringValue:NSLocalizedString(@"Testing MySQL...", @"MySQL connection test very short status message")];
- } else {
+ }
+ else {
[progressIndicatorText setStringValue:NSLocalizedString(@"Testing connection...", @"Connection test very short status message")];
}
- } else if (sshTunnel) {
+ }
+ else if (sshTunnel) {
[progressIndicatorText setStringValue:NSLocalizedString(@"MySQL connecting...", @"MySQL connecting very short status message")];
- } else {
+ }
+ else {
[progressIndicatorText setStringValue:NSLocalizedString(@"Connecting...", @"Generic connecting very short status message")];
}
+
[progressIndicatorText display];
[connectButton setTitle:NSLocalizedString(@"Cancel", @"cancel button")];
@@ -238,7 +242,7 @@ static NSString *SPLocalhostAddress = @"127.0.0.1";
[pool release];
}
-/*
+/**
* Initiate the SSH connection process.
* This should only be called as part of initiateConnection:, and will indirectly
* call initiateMySQLConnection if it's successful.
@@ -347,7 +351,7 @@ static NSString *SPLocalhostAddress = @"127.0.0.1";
[self addConnectionToDocument];
}
-/*
+/**
* A callback function for the SSH Tunnel setup process - will be called on a connection
* state change, allowing connection to fail or proceed as appropriate. If successful,
* will call initiateMySQLConnection.
@@ -418,7 +422,7 @@ static NSString *SPLocalhostAddress = @"127.0.0.1";
[dbDocument setConnection:mySQLConnection];
}
-/*
+/**
* Ends a connection attempt by stopping the connection animation and
* displaying a specified error message.
*/