--- a/JavaNativeMethodImpl_OpenJDK6.st	Thu Oct 27 13:51:15 2016 +0200
+++ b/JavaNativeMethodImpl_OpenJDK6.st	Thu Oct 27 13:51:39 2016 +0200
@@ -197,13 +197,13 @@
 
     jGraphics := nativeContext receiver.
     O_WGgraphics_pData isNil ifTrue:[
-	O_WGgraphics_pData := (jGraphics class instVarOffsetOf:'pData').
+        O_WGgraphics_pData := (jGraphics class instVarIndexFor:'pData').
     ].
     O_WGgraphics_originX isNil ifTrue:[
-	O_WGgraphics_originX := (jGraphics class instVarOffsetOf:'originX').
+        O_WGgraphics_originX := (jGraphics class instVarIndexFor:'originX').
     ].
     O_WGgraphics_originY isNil ifTrue:[
-	O_WGgraphics_originY := (jGraphics class instVarOffsetOf:'originY').
+        O_WGgraphics_originY := (jGraphics class instVarIndexFor:'originY').
     ].
     gc := jGraphics instVarAt:O_WGgraphics_pData.
 
@@ -216,7 +216,7 @@
     orgX := jGraphics instVarAt:O_WGgraphics_originX.
     orgY := jGraphics instVarAt:O_WGgraphics_originY.
     ((orgX ~~ tX) or:[orgY ~~ tY]) ifTrue:[
-	gc translation:orgX@orgY
+        gc translation:orgX@orgY
     ].
     ^ gc
 
@@ -323,11 +323,11 @@
 
     "/ sigh; pData was renamed to pNativeWidget in jdk1.2 ...
     O_FramePeer_pNativeWidget isNil ifTrue:[
-        O_FramePeer_pNativeWidget := (jPeer class instVarOffsetOf:'pNativeWidget').
+        O_FramePeer_pNativeWidget := (jPeer class instVarIndexFor:'pNativeWidget').
         O_FramePeer_pNativeWidget isNil ifTrue:[
             O_FramePeer_pNativeWidget := 0.
             O_FramePeer_pData isNil ifTrue:[
-                O_FramePeer_pData := (jPeer class instVarOffsetOf:'pData').
+                O_FramePeer_pData := (jPeer class instVarIndexFor:'pData').
             ].
         ]
     ].
@@ -4973,7 +4973,7 @@
 
     jFrame := jFramePeer instVarNamed:'target'.
     (jFrame notNil
-    and:[(pDataIdx := jFrame class instVarOffsetOf:'pData') notNil])
+    and:[(pDataIdx := jFrame class instVarIndexFor:'pData') notNil])
     ifTrue:[
         ((frame := jFrame instVarAt:pDataIdx) notNil
         and:[frame ~~ 0]) ifTrue:[
@@ -4984,10 +4984,10 @@
                       facility:#JVM.
             ].
             "/ sigh; pData was renamed to pNativeWidget in jdk1.2 ...
-            pDataIdx := jFramePeer class instVarOffsetOf:'pNativeWidget'.
+            pDataIdx := jFramePeer class instVarIndexFor:'pNativeWidget'.
             pDataIdx isNil ifTrue:[
                 "/ ok, we are < 1.2
-                pDataIdx := jFramePeer class instVarOffsetOf:'pData'.
+                pDataIdx := jFramePeer class instVarIndexFor:'pData'.
             ].
             jFramePeer instVarAt:pDataIdx put:frame.
         ]