#REFACTORING by cg
class: JavaView
changed:
#buttonMotion:x:y: (send #buttonMotionEvent instead of #buttonEvent)
#buttonPress:x:y:
#buttonRelease:x:y:
--- a/JavaView.st Fri Feb 08 22:34:21 2019 +0100
+++ b/JavaView.st Wed Feb 13 12:57:36 2019 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"
COPYRIGHT (c) 1996-2015 by Claus Gittinger
@@ -20,6 +22,8 @@
"
"{ Package: 'stx:libjava' }"
+"{ NameSpace: Smalltalk }"
+
View subclass:#JavaView
instanceVariableNames:'eventReceiver updateRegions javaPeer'
classVariableNames:''
@@ -102,10 +106,11 @@
sensor := self sensor.
eventReceiver notNil ifTrue:[
- ev := WindowEvent buttonEvent
+ ev := WindowEvent buttonMotionEvent
for:self
type:#buttonMotion:x:y:
arguments:(Array with:state with:x with:y).
+
ev hasShift:sensor shiftDown
ctrl:sensor ctrlDown
alt:sensor altDown
@@ -116,61 +121,69 @@
eventReceiver processEvent:ev.
].
- "Modified: / 12.11.1998 / 16:30:50 / cg"
- "Created: / 10.12.1998 / 19:35:40 / cg"
+ "Modified: / 12-11-1998 / 16:30:50 / cg"
+ "Created: / 10-12-1998 / 19:35:40 / cg"
+ "Modified: / 13-02-2019 / 12:55:37 / Claus Gittinger"
!
buttonPress:button x:x y:y
"/ req'd if running as embeddedApplet ...
- |ev|
+ |ev sensor|
"/ 'JavaView buttonPress' printCR.
eventReceiver notNil ifTrue:[
- ev := WindowEvent buttonEvent
+ ev := WindowEvent buttonPressEvent
for:self
type:#buttonPress:x:y:
arguments:(Array with:button with:x with:y).
- ev hasShift:self sensor shiftDown
- ctrl:self sensor ctrlDown
- alt:self sensor altDown
- meta:self sensor metaDown
- button1:self sensor leftButtonPressed
- button2:self sensor middleButtonPressed
- button3:self sensor rightButtonPressed.
+
+ sensor := self sensor.
+ ev hasShift:sensor shiftDown
+ ctrl:sensor ctrlDown
+ alt:sensor altDown
+ meta:sensor metaDown
+ button1:sensor leftButtonPressed
+ button2:sensor middleButtonPressed
+ button3:sensor rightButtonPressed.
+
eventReceiver processEvent:ev.
].
- "Modified: / 6.2.1998 / 00:56:56 / cg"
- "Created: / 10.12.1998 / 19:35:58 / cg"
+ "Modified: / 06-02-1998 / 00:56:56 / cg"
+ "Created: / 10-12-1998 / 19:35:58 / cg"
+ "Modified (format): / 13-02-2019 / 12:55:44 / Claus Gittinger"
!
buttonRelease:button x:x y:y
"/ req'd if running as embeddedApplet ...
- |ev|
+ |ev sensor|
"/ 'JavaView buttonRelease' printCR.
eventReceiver notNil ifTrue:[
- ev := WindowEvent buttonEvent
+ ev := WindowEvent buttonReleaseEvent
for:self
type:#buttonRelease:x:y:
arguments:(Array with:button with:x with:y).
- ev hasShift:self sensor shiftDown
- ctrl:self sensor ctrlDown
- alt:self sensor altDown
- meta:self sensor metaDown
- button1:self sensor leftButtonPressed
- button2:self sensor middleButtonPressed
- button3:self sensor rightButtonPressed.
+ sensor := self sensor.
+ ev hasShift:sensor shiftDown
+ ctrl:sensor ctrlDown
+ alt:sensor altDown
+ meta:sensor metaDown
+ button1:sensor leftButtonPressed
+ button2:sensor middleButtonPressed
+ button3:sensor rightButtonPressed.
+
eventReceiver processEvent:ev.
].
- "Modified: / 6.2.1998 / 00:57:00 / cg"
- "Created: / 10.12.1998 / 19:36:11 / cg"
+ "Modified: / 06-02-1998 / 00:57:00 / cg"
+ "Created: / 10-12-1998 / 19:36:11 / cg"
+ "Modified: / 13-02-2019 / 12:54:49 / Claus Gittinger"
!
exposeX:x y:y width:w height:h
@@ -260,11 +273,11 @@
!JavaView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libjava/JavaView.st,v 1.30 2015-03-20 12:08:00 vrany Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libjava/JavaView.st,v 1.30 2015-03-20 12:08:00 vrany Exp $'
+ ^ '$Header$'
!
version_HG
@@ -273,6 +286,6 @@
!
version_SVN
- ^ 'Id'
+ ^ '$Id$'
! !