--- a/JavaNativeMethodImpl_OpenJDK6.st	Wed Apr 24 18:35:29 2013 +0100
+++ b/JavaNativeMethodImpl_OpenJDK6.st	Mon Apr 29 21:08:38 2013 +0100
@@ -3560,7 +3560,7 @@
     stProcess := JavaProcess
                 for: [
                     | procName |
-                    Object abortSignal
+                    AbortOperationRequest
                         handle: [
                             :ex |
                             procName := stProcess name.
@@ -3597,7 +3597,7 @@
                                         ex return.
                                     ]
                                     do: [
-                                        Object messageNotUnderstoodSignal
+                                        MessageNotUnderstood
                                             handle: [
                                                 :ex |
                                                 |
@@ -4198,7 +4198,7 @@
 
     view := self viewForWPeer: nativeContext.
 
-    Object errorSignal catch:[
+    Error catch:[
         view destroy.
     ].
     JavaWindowGroup removeView:view.
@@ -4268,10 +4268,11 @@
 
     view := self viewForWPeer: nativeContext.
 
-    Object errorSignal handle:[:ex |
-    ] do:[
-        view disable
-    ]
+    Error 
+        handle:[:ex |] 
+        do:[
+            view disable
+        ]
 
     "Created: / 6.1.1998 / 18:26:36 / cg"
     "Modified: / 8.1.1998 / 17:32:53 / cg"
@@ -4282,7 +4283,7 @@
 
     view := self viewForWPeer: nativeContext.
 
-    Object errorSignal handle:[:ex |
+    Error handle:[:ex |
     ] do:[
         view enable
     ]
@@ -4366,7 +4367,7 @@
     view := self viewForWPeer: nativeContext.
 "/ view isPopUpView ifTrue:[self halt].
 
-    Object errorSignal handle:[:ex |
+    Error handle:[:ex |
     ] do:[
         view beInvisible
     ]
@@ -13740,7 +13741,6 @@
 
     ^ JavaVM unimplementedNativeMethodSignal raise
 ! !
-
 !JavaNativeMethodImpl_OpenJDK6 class methodsFor:'native - stx.libjava'!
 
 _stx_libjava_ClassLoader_findClassS: this _:a1 
@@ -13831,7 +13831,6 @@
 
     "Modified: / 30-03-2013 / 00:43:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
-
 !JavaNativeMethodImpl_OpenJDK6 class methodsFor:'native - sun.awt'!
 
 _sun_awt_DebugSettings_setCTracingOn: this _: a1 
@@ -20703,12 +20702,16 @@
 
 !JavaNativeMethodImpl_OpenJDK6 class methodsFor:'documentation'!
 
+version
+    ^ '$Header: /cvs/stx/stx/libjava/JavaNativeMethodImpl_OpenJDK6.st,v 1.4 2013-04-27 12:29:56 cg Exp $'
+!
+
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaNativeMethodImpl_OpenJDK6.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libjava/JavaNativeMethodImpl_OpenJDK6.st,v 1.4 2013-04-27 12:29:56 cg Exp $'
 !
 
 version_HG
 
-    ^ '$Changeset: <not expanded> $'
-! !
-
+    ^ 'Changeset: <not expanded> '
+! !
+