--- a/ExceptionHandlerSet.st	Tue Jan 18 10:18:31 2005 +0100
+++ b/ExceptionHandlerSet.st	Thu Jan 20 13:26:20 2005 +0100
@@ -137,16 +137,25 @@
 
 !ExceptionHandlerSet methodsFor:'queries'!
 
-accepts:aSignal
+accepts:anExceptionHandler
     "return true, if the receiver accepts the argument, aSignal.
      (i.e. if any of the receivers elements is aSignal or a parent of it)."
 
-    self keysDo:[:sig | (sig==aSignal or:[sig accepts:aSignal]) ifTrue:[^ true]].
+    self keysDo:[:eachExceptionHandler | 
+        (eachExceptionHandler==anExceptionHandler 
+         or:[eachExceptionHandler accepts:anExceptionHandler]) ifTrue:[^ true].
+    ].
     ^ false
 
     "Created: / 26.7.1999 / 09:53:09 / stefan"
 !
 
+exceptionHandlerFor:anException in:aContext
+    "answer the exceptionHandler for anException from aContext."
+
+    ^ self
+!
+
 handlerForSignal:signal
     "answer the handler block for signal"
 
@@ -199,10 +208,14 @@
 
 !
 
-handlingExceptionInContext:theContext
-    "answer the handling exceptionHandlerSet from aContext."
+handles:anException
+    "return true, if the receiver handles the argument, anException.
+     (i.e. if any of the receivers elements handles anException)."
 
-    ^ self
+    self keysDo:[:eachExceptionHandler| 
+        (eachExceptionHandler handles:anException) ifTrue:[^ true]
+    ].
+    ^ false
 !
 
 isExceptionHandler
@@ -313,5 +326,5 @@
 !ExceptionHandlerSet class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ExceptionHandlerSet.st,v 1.14 2004-09-23 12:58:57 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ExceptionHandlerSet.st,v 1.15 2005-01-20 12:26:10 stefan Exp $'
 ! !