Changeset 3264 for trunk/macosx/MessageWindowController.m

Timestamp:

Oct 1, 2007, 9:52:31 PM (15 years ago)

Author:

livings124

Message:

"switch-ify" some code

File:

• trunk/macosx/MessageWindowController.m (modified) (4 diffs)

trunk/macosx/MessageWindowController.m

@@ -90 +90 @@
     //select proper level in popup button
     int level = tr_getMessageLevel();
-    if (level == TR_MSG_ERR)
-        [fLevelButton selectItemAtIndex: LEVEL_ERROR];
-    else if (level == TR_MSG_INF)
-        [fLevelButton selectItemAtIndex: LEVEL_INFO];
-    else
-        [fLevelButton selectItemAtIndex: LEVEL_DEBUG];
+    switch (level)
+        {
+            case TR_MSG_ERR:
+                [fLevelButton selectItemAtIndex: LEVEL_ERROR];
+                break;
+            case TR_MSG_INF:
+                [fLevelButton selectItemAtIndex: LEVEL_INFO];
+                break;
+            case TR_MSG_DBG:
+                [fLevelButton selectItemAtIndex: LEVEL_DEBUG];
+        }
     
     [self setDebugWarningHidden: level != TR_MSG_DBG];
@@ -145 +150 @@
     else if ([ident isEqualToString: @"Level"])
     {
-        int level = [[message objectForKey: @"Level"] intValue];
-        if (level == TR_MSG_ERR)
-            return fErrorImage;
-        else if (level == TR_MSG_INF)
-            return fInfoImage;
-        else
-            return fDebugImage;
+        switch ([[message objectForKey: @"Level"] intValue])
+        {
+            case TR_MSG_ERR:
+                return fErrorImage;
+            case TR_MSG_INF:
+                return fInfoImage;
+            case TR_MSG_DBG:
+                return fDebugImage;
+            default:
+                return nil;
+        }
     }
     else
@@ -198 +207 @@
     [self updateLog: nil];
     
-    int selection = [fLevelButton indexOfSelectedItem], level;
-    if (selection == LEVEL_INFO)
-        level = TR_MSG_INF;
-    else if (selection == LEVEL_DEBUG)
-        level = TR_MSG_DBG;
-    else
-        level = TR_MSG_ERR;
+    int level;
+    switch ([fLevelButton indexOfSelectedItem])
+    {
+        case LEVEL_ERROR:
+            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];
@@ -273 +288 @@
 - (NSString *) stringForMessage: (NSDictionary *) message
 {
-    int level = [[message objectForKey: @"Level"] intValue];
-    NSString * levelString;
-    if (level == TR_MSG_ERR)
-        levelString = @"Error";
-    else if (level == TR_MSG_INF)
-        levelString = @"Info";
-    else
-        levelString = @"Debug";
-    
-    return [NSString stringWithFormat: @"%@ [%@] %@", [message objectForKey: @"Date"], levelString, [message objectForKey: @"Message"]];
+    NSString * level;
+    switch ([[message objectForKey: @"Level"] intValue])
+    {
+        case TR_MSG_ERR:
+            level = @"Error";
+            break;
+        case TR_MSG_INF:
+            level = @"Info";
+            break;
+        case TR_MSG_DBG:
+            level = @"Debug";
+            break;
+        default:
+            level = @"";
+    }
+    
+    return [NSString stringWithFormat: @"%@ [%@] %@", [message objectForKey: @"Date"], level, [message objectForKey: @"Message"]];
 }