--- a/Image.st	Wed Sep 05 17:38:53 2001 +0200
+++ b/Image.st	Wed Sep 05 17:40:22 2001 +0200
@@ -5201,20 +5201,8 @@
      a device, this will be the receiver. Otherwise, a new image
      is returned."
 
-    ((aDevice == device) and:[deviceForm notNil]) ifTrue:[^ self].
-
-    (device notNil and:[aDevice ~~ device]) ifTrue:[
-	"oops, I am already accociated to another device
-	 - need a copy ...
-	"
-	^ self copy onDevice:aDevice
-    ].
-    deviceForm := self asFormOn:aDevice.
-    maskedPixelsAre0 := nil.
-    device := aDevice.
-    Lobby register:self
-
-    "Modified: / 22.8.1998 / 13:34:24 / cg"
+"/    self obsoleteMethodWarning:'use onDevice:'.
+    ^ self onDevice:aDevice
 !
 
 onDevice:aDevice
@@ -5224,9 +5212,20 @@
      is returned."
 
     aDevice isNil ifTrue:[^ self].
-    ^ self on:aDevice
-
-    "Created: 28.3.1997 / 16:05:53 / cg"
+    ((aDevice == device) and:[deviceForm notNil]) ifTrue:[^ self].
+
+    (device notNil and:[aDevice ~~ device]) ifTrue:[
+        "oops, I am already accociated to another device
+         - need a copy ...
+        "
+        ^ self copy onDevice:aDevice
+    ].
+    deviceForm := self asFormOn:aDevice.
+    maskedPixelsAre0 := nil.
+    device := aDevice.
+    Lobby register:self
+
+    "Modified: / 22.8.1998 / 13:34:24 / cg"
 ! !
 
 !Image methodsFor:'converting greyscale images'!
@@ -12296,6 +12295,6 @@
 !Image class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Image.st,v 1.309 2001-09-05 15:38:53 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Image.st,v 1.310 2001-09-05 15:40:22 cg Exp $'
 ! !
 Image initialize!