Changeset 5704

Timestamp:

Apr 25, 2008, 10:29:51 PM (14 years ago)

Author:

livings124

Message:

now that a blank url cannot be entered in the url sheet, no need to check that

File:

• trunk/macosx/Controller.m (modified) (2 diffs)

trunk/macosx/Controller.m

@@ -955 +955 @@
 - (void) controlTextDidChange: (NSNotification *) notification
 {
-    [fURLSheetOpenButton setEnabled: ![[fURLSheetTextField stringValue] isEqual: @""]];
+    [fURLSheetOpenButton setEnabled: ![[fURLSheetTextField stringValue] isEqualToString: @""]];
 }
 
@@ -965 +965 @@
     
     NSString * urlString = [fURLSheetTextField stringValue];
-    if (![urlString isEqualToString: @""])
-    {
-        if ([urlString rangeOfString: @"://"].location == NSNotFound)
-        {
-            if ([urlString rangeOfString: @"."].location == NSNotFound)
-            {
-                int beforeCom;
-                if ((beforeCom = [urlString rangeOfString: @"/"].location) != NSNotFound)
-                    urlString = [NSString stringWithFormat: @"http://www.%@.com/%@",
-                                    [urlString substringToIndex: beforeCom],
-                                    [urlString substringFromIndex: beforeCom + 1]];
-                else
-                    urlString = [NSString stringWithFormat: @"http://www.%@.com/", urlString];
-            }
+    if ([urlString rangeOfString: @"://"].location == NSNotFound)
+    {
+        if ([urlString rangeOfString: @"."].location == NSNotFound)
+        {
+            int beforeCom;
+            if ((beforeCom = [urlString rangeOfString: @"/"].location) != NSNotFound)
+                urlString = [NSString stringWithFormat: @"http://www.%@.com/%@",
+                                [urlString substringToIndex: beforeCom],
+                                [urlString substringFromIndex: beforeCom + 1]];
             else
-                urlString = [@"http://" stringByAppendingString: urlString];
-        }
-        
-        NSURL * url = [NSURL URLWithString: urlString];
-        [self performSelectorOnMainThread: @selector(openURL:) withObject: url waitUntilDone: NO];
-    }
+                urlString = [NSString stringWithFormat: @"http://www.%@.com/", urlString];
+        }
+        else
+            urlString = [@"http://" stringByAppendingString: urlString];
+    }
+    
+    NSURL * url = [NSURL URLWithString: urlString];
+    [self performSelectorOnMainThread: @selector(openURL:) withObject: url waitUntilDone: NO];
 }