Changeset 2270

Timestamp:

Jul 1, 2007, 5:32:55 PM (15 years ago)

Author:

livings124

Message:

• do an initialization only when needed
• get rid of an unnecessary variable and need for release

Location:

trunk/macosx

Files:

• Controller.h (modified) (1 diff)
• Controller.m (modified) (6 diffs)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• Torrent.m (modified) (1 diff)

trunk/macosx/Controller.h

@@ -57 +57 @@
     IBOutlet NSScrollView           * fScrollView;
     IBOutlet TorrentTableView       * fTableView;
-    NSToolbar                       * fToolbar;
     
     IBOutlet NSMenuItem             * fOpenIgnoreDownloadFolder;

trunk/macosx/Controller.m

@@ -164 +164 @@
         fTorrents = [[NSMutableArray alloc] init];
         fDisplayedTorrents = [[NSMutableArray alloc] init];
-        fPendingTorrentDownloads = [[NSMutableDictionary alloc] init];
         
         fDefaults = [NSUserDefaults standardUserDefaults];
@@ -191 +190 @@
     [fMessageController release];
     [fPrefsController release];
-    
-    [fToolbar release];
     
     [fTorrents release];
@@ -203 +200 @@
     
     [fAutoImportedNames release];
-    [fPendingTorrentDownloads release];
+    if (fPendingTorrentDownloads)
+        [fPendingTorrentDownloads release];
     
     tr_close(fLib);
@@ -215 +213 @@
     [fFilterBar setBackgroundImage: [NSImage imageNamed: @"FilterBarBackground.png"]];
     
-    [fWindow setAcceptsMouseMovedEvents: YES]; //ensure filter buttons display correctly
-    
-    fToolbar = [[NSToolbar alloc] initWithIdentifier: @"Transmission Toolbar"];
-    [fToolbar setDelegate: self];
-    [fToolbar setAllowsUserCustomization: YES];
-    [fToolbar setAutosavesConfiguration: YES];
-    [fWindow setToolbar: fToolbar];
-    [fWindow setDelegate: self];
+    NSToolbar * toolbar = [[NSToolbar alloc] initWithIdentifier: @"Transmission Toolbar"];
+    [toolbar setDelegate: self];
+    [toolbar setAllowsUserCustomization: YES];
+    [toolbar setAutosavesConfiguration: YES];
+    [fWindow setToolbar: toolbar];
+    [toolbar release];
     
     [fWindow makeFirstResponder: fTableView];
     [fWindow setExcludedFromWindowsMenu: YES];
+    [fWindow setAcceptsMouseMovedEvents: YES]; //ensure filter buttons display correctly
     
     //set table size
@@ -525 +522 @@
 {
     //remove all torrent downloads
-    NSEnumerator * enumerator = [[fPendingTorrentDownloads allValues] objectEnumerator];
-    NSDictionary * downloadDict;
-    NSURLDownload * download;
-    while ((downloadDict = [enumerator nextObject]))
-    {
-        download = [downloadDict objectForKey: @"Download"];
-        [download cancel];
-        [download release];
-    }
-    [fPendingTorrentDownloads removeAllObjects];
+    NSEnumerator * enumerator;
+    if (fPendingTorrentDownloads)
+    {
+        enumerator = [[fPendingTorrentDownloads allValues] objectEnumerator];
+        NSDictionary * downloadDict;
+        NSURLDownload * download;
+        while ((downloadDict = [enumerator nextObject]))
+        {
+            download = [downloadDict objectForKey: @"Download"];
+            [download cancel];
+            [download release];
+        }
+        [fPendingTorrentDownloads removeAllObjects];
+    }
     
     //stop timers
@@ -618 +619 @@
 -(void) download: (NSURLDownload *) download didCreateDestination: (NSString *) path
 {
+    if (!fPendingTorrentDownloads)
+        fPendingTorrentDownloads = [[NSMutableDictionary alloc] init];
+    
     [fPendingTorrentDownloads setObject: [NSDictionary dictionaryWithObjectsAndKeys:
                     path, @"Path", download, @"Download", nil] forKey: [[download request] URL]];

trunk/macosx/Torrent.m

@@ -195 +195 @@
     [fDownloadFolder release];
     [fIncompleteFolder release];
-        
+    
     [fPublicTorrentLocation release];
-    
     
     [fDateAdded release];
     [fDateCompleted release];
     [fDateActivity release];
-        
+    
     [fAnnounceDate release];
-        
+    
     [fIcon release];
     [fIconFlipped release];
     [fIconSmall release];
-        
+    
     [fProgressString release];
     [fStatusString release];
     [fShortStatusString release];
     [fRemainingTimeString release];
-        
+    
     [fFileList release];
     [fFlatFileList release];
-        
+    
     [fBitmap release];