Changeset 436 for trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m

Timestamp:

03/05/08 03:01:09 (16 years ago)

Author:

Nicholas Riley

Message:

Use @try/@catch/@finally rather than macro-based exceptions

File:

• trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m (modified) (4 diffs)

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEE.m

@@ -153 +153 @@
     Handle h = NULL;
     
-    NS_DURING
+    @try {
         h = NewHandle(len);
         if (h == NULL)
@@ -174 +174 @@
         err = ICCF_DoURLAction(ICCF_GetInst(), hint, *h, selStart, selEnd, action);
         ICCF_OSErrCAssert(err, @"ICCF_DoURLAction");
-        
-    NS_HANDLER
+    } @finally {
         DisposeHandle(h);
         [urlString release];
-        [localException raise];
-    NS_ENDHANDLER
-        
-    DisposeHandle(h);
-    [urlString release];
+    }
 
     return (err == noErr);
@@ -213 +208 @@
     NSColor *insertionPointColor = [self insertionPointColor];
 
-    NS_DURING
-
+    @try {
         NSString *s = [[self textStorage] string]; // according to the class documentation, sending 'string' is guaranteed to be O(1)
         unsigned length = [s length];
@@ -260 +254 @@
             }
         }
-
-    NS_HANDLER
-        ICCF_HandleException(localException, triggeringEvent);
-    NS_ENDHANDLER
+    } @catch (NSException *e) {
+        ICCF_HandleException(e, triggeringEvent);
+    }
 
     ICCF_StopIC();