"switch-ify" some code

macosx/InfoWindowController.m

@@ -334,7 +334,7 @@
 
 - (Torrent *) selectedTorrent
 {
-    return fTorrents && [fTorrents count] > 0 ? [fTorrents objectAtIndex: 0] : nil;
+    return fTorrents && [fTorrents count] == 1 ? [fTorrents objectAtIndex: 0] : nil;
 }
 
 - (void) updateInfoStats
@@ -430,10 +430,10 @@
         return;
     Torrent * torrent = [fTorrents objectAtIndex: 0];
     
-    int seeders = [torrent seeders], leechers = [torrent leechers], downloaded = [torrent completedFromTracker];
+    int seeders = [torrent seeders], leechers = [torrent leechers], completed = [torrent completedFromTracker];
-    [fSeedersField setStringValue: seeders < 0 ? @"" : [NSString stringWithFormat: @"%d", seeders]];
+    [fSeedersField setStringValue: seeders > 0 ? [NSString stringWithFormat: @"%d", seeders] : @""];
-    [fLeechersField setStringValue: leechers < 0 ? @"" : [NSString stringWithFormat: @"%d", leechers]];
+    [fLeechersField setStringValue: leechers > 0 ? [NSString stringWithFormat: @"%d", leechers] : @""];
-    [fCompletedFromTrackerField setStringValue: downloaded < 0 ? @"" : [NSString stringWithFormat: @"%d", downloaded]];
+    [fCompletedFromTrackerField setStringValue: completed > 0 ? [NSString stringWithFormat: @"%d", completed] : @""];
     
     BOOL active = [torrent isActive];
     
@@ -460,16 +460,21 @@
                 [components addObject: [NSString stringWithFormat:
                                         NSLocalizedString(@"%d cache", "Inspector -> Peers tab -> peers"), count]];
             
-            connected = [NSString stringWithFormat: @"%@: %@", connected, [components componentsJoinedByString: @", "]];
+            connected = [connected stringByAppendingFormat: @": %@", [components componentsJoinedByString: @", "]];
         }
         
         [fConnectedPeersField setStringValue: connected];
+        
+        [fDownloadingFromField setIntValue: [torrent peersSendingToUs]];
+        [fUploadingToField setIntValue: [torrent peersGettingFromUs]];
     }
     else
+    {
         [fConnectedPeersField setStringValue: NSLocalizedString(@"info not available", "Inspector -> Peers tab -> peers")];
+        [fDownloadingFromField setStringValue: @""];
+        [fUploadingToField setStringValue: @""];
+    }
     
-    [fDownloadingFromField setStringValue: active ? [NSString stringWithFormat: @"%d", [torrent peersSendingToUs]] : @""];
-    [fUploadingToField setStringValue: active ? [NSString stringWithFormat: @"%d", [torrent peersGettingFromUs]] : @""];
     [fKnownField setIntValue: [torrent totalPeersKnown]];
     
     [fPeers release];

macosx/MessageWindowController.m

@@ -89,12 +89,17 @@
     
     //select proper level in popup button
     int level = tr_getMessageLevel();
-    if (level == TR_MSG_ERR)
+    switch (level)
+        {
+            case TR_MSG_ERR:
                 [fLevelButton selectItemAtIndex: LEVEL_ERROR];
-    else if (level == TR_MSG_INF)
+                break;
+            case TR_MSG_INF:
                 [fLevelButton selectItemAtIndex: LEVEL_INFO];
-    else
+                break;
+            case TR_MSG_DBG:
                 [fLevelButton selectItemAtIndex: LEVEL_DEBUG];
+        }
     
     [self setDebugWarningHidden: level != TR_MSG_DBG];
 }
@@ -144,13 +149,17 @@
         return [message objectForKey: @"Date"];
     else if ([ident isEqualToString: @"Level"])
     {
-        int level = [[message objectForKey: @"Level"] intValue];
+        switch ([[message objectForKey: @"Level"] intValue])
-        if (level == TR_MSG_ERR)
+        {
+            case TR_MSG_ERR:
                 return fErrorImage;
-        else if (level == TR_MSG_INF)
+            case TR_MSG_INF:
                 return fInfoImage;
-        else
+            case TR_MSG_DBG:
                 return fDebugImage;
+            default:
+                return nil;
+        }
     }
     else
         return [message objectForKey: @"Message"];
@@ -197,13 +206,19 @@
 {
     [self updateLog: nil];
     
-    int selection = [fLevelButton indexOfSelectedItem], level;
+    int level;
-    if (selection == LEVEL_INFO)
+    switch ([fLevelButton indexOfSelectedItem])
-        level = TR_MSG_INF;
+    {
-    else if (selection == LEVEL_DEBUG)
+        case LEVEL_ERROR:
-        level = TR_MSG_DBG;
-    else
             level = TR_MSG_ERR;
+            break;
+        case LEVEL_INFO:
+            level = TR_MSG_INF;
+            break;
+        case LEVEL_DEBUG:
+            level = TR_MSG_DBG;
+            break;
+    }
     
     [self setDebugWarningHidden: level != TR_MSG_DBG];
     
@@ -272,16 +287,23 @@
 
 - (NSString *) stringForMessage: (NSDictionary *) message
 {
-    int level = [[message objectForKey: @"Level"] intValue];
+    NSString * level;
-    NSString * levelString;
+    switch ([[message objectForKey: @"Level"] intValue])
-    if (level == TR_MSG_ERR)
+    {
-        levelString = @"Error";
+        case TR_MSG_ERR:
-    else if (level == TR_MSG_INF)
+            level = @"Error";
-        levelString = @"Info";
+            break;
-    else
+        case TR_MSG_INF:
-        levelString = @"Debug";
+            level = @"Info";
+            break;
+        case TR_MSG_DBG:
+            level = @"Debug";
+            break;
+        default:
+            level = @"";
+    }
     
-    return [NSString stringWithFormat: @"%@ [%@] %@", [message objectForKey: @"Date"], levelString, [message objectForKey: @"Message"]];
+    return [NSString stringWithFormat: @"%@ [%@] %@", [message objectForKey: @"Date"], level, [message objectForKey: @"Message"]];
 }
 
 - (void) setDebugWarningHidden: (BOOL) hide

macosx/Torrent.m

@@ -1007,13 +1007,11 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
     {
         case TR_STATUS_DOWNLOAD:
             return [self eta] >= 0 ? [self etaString] : NSLocalizedString(@"Unknown", "Torrent -> remaining time");
-            break;
         
         case TR_STATUS_SEED:
         case TR_STATUS_DONE:
             return [NSLocalizedString(@"Ratio: ", "Torrent -> status string") stringByAppendingString:
                                                                             [NSString stringForRatio: [self ratio]]];
-            break;
         
         default:
             return [self shortStatusString];
@@ -1026,29 +1024,23 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
     {
         case TR_STATUS_STOPPED:
             return NSLocalizedString(@"Paused", "Torrent -> status string");
-            break;
         
         case TR_STATUS_STOPPING:
             return [NSLocalizedString(@"Stopping", "Torrent -> status string") stringByAppendingEllipsis];
-            break;
 
         case TR_STATUS_CHECK:
             return [NSString stringWithFormat: NSLocalizedString(@"Checking existing data (%.2f%%)",
                                     "Torrent -> status string"), 100.0 * fStat->recheckProgress];
-            break;
         
         case TR_STATUS_CHECK_WAIT:
             return [NSLocalizedString(@"Waiting to check existing data", "Torrent -> status string") stringByAppendingEllipsis];
-            break;
 
         case TR_STATUS_DOWNLOAD:
             return NSLocalizedString(@"Downloading", "Torrent -> status string");
-            break;
 
         case TR_STATUS_SEED:
         case TR_STATUS_DONE:
             return NSLocalizedString(@"Seeding", "Torrent -> status string");
-            break;
         
         default:
             return NSLocalizedString(@"N/A", "Torrent -> status string");