--- a/JavaEmbeddedFrameView.st Sat Feb 02 01:23:18 2013 +0100
+++ b/JavaEmbeddedFrameView.st Sat Feb 16 19:08:45 2013 +0100
@@ -1,12 +1,22 @@
"
COPYRIGHT (c) 1996-2011 by Claus Gittinger
+ New code and modifications done at SWING Research Group [1]:
+
+ COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
+ SWING Research Group, Czech Technical University in Prague
+
This software is furnished under a license and may be used
only in accordance with the terms of that license and with the
inclusion of the above copyright notice. This software may not
be provided or otherwise made available to, or used by, any
other person. No title to or ownership of the software is
hereby transferred.
+
+ [1] Code written at SWING Research Group contains a signature
+ of one of the above copright owners. For exact set of such code,
+ see the differences between this version and version stx:libjava
+ as of 1.9.2010
"
"{ Package: 'stx:libjava' }"
@@ -26,39 +36,39 @@
"
COPYRIGHT (c) 1996-2011 by Claus Gittinger
+ New code and modifications done at SWING Research Group [1]:
+
+ COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
+ SWING Research Group, Czech Technical University in Prague
+
This software is furnished under a license and may be used
only in accordance with the terms of that license and with the
inclusion of the above copyright notice. This software may not
be provided or otherwise made available to, or used by, any
other person. No title to or ownership of the software is
hereby transferred.
-"
-!
-documentation
-"
- a wrapper view, which allows for Java Applets to be embedded
- in a smalltalk view.
- This requires a netscape to be installed on the system.
+ [1] Code written at SWING Research Group contains a signature
+ of one of the above copright owners. For exact set of such code,
+ see the differences between this version and version stx:libjava
+ as of 1.9.2010
- [Author:]
- Claus Gittinger
"
! !
!JavaEmbeddedFrameView class methodsFor:'support'!
newAppletContext
- |jMozillaAppletContextClass|
+ | jMozillaAppletContextClass |
"/ this makes it a modzilla applet context ...
- jMozillaAppletContextClass := Java classForName:'netscape.applet.MozillaAppletContext'.
- jMozillaAppletContextClass isNil ifTrue:[
- self warn:'no netscape.applet.MozillaAppletContext class'.
+ jMozillaAppletContextClass := JavaVM
+ classForName: 'netscape.applet.MozillaAppletContext'.
+ jMozillaAppletContextClass isNil ifTrue: [
+ self warn: 'no netscape.applet.MozillaAppletContext class'.
^ nil
].
- jMozillaAppletContextClass instVarNamed:'debug' put:1.
-
+ jMozillaAppletContextClass instVarNamed: 'debug' put: 1.
^ jMozillaAppletContextClass new.
"Created: / 20.10.1998 / 15:40:08 / cg"
@@ -169,120 +179,108 @@
!JavaEmbeddedFrameView methodsFor:'applet control'!
appletDESTROY
- |ev|
+ | ev |
- isNS40 ifTrue:[
+ isNS40 ifTrue: [
"/ ev = netscape.applet.AppletEvent(APPLET_DESTROY);
- ev := (Java classForName:'netscape.applet.AppletEvent')
- newWith_int:(embeddedAppletFrame class instVarNamed:'APPLET_DESTROY').
- embeddedAppletFrame
- perform:#'sendEvent(Lnetscape/applet/NEvent;)V'
- with:ev.
+ ev := (JavaVM classForName: 'netscape.applet.AppletEvent')
+ newWith_int: (embeddedAppletFrame class instVarNamed: 'APPLET_DESTROY').
+ embeddedAppletFrame perform: #'sendEvent(Lnetscape/applet/NEvent;)V'
+ with: ev.
^ self
].
- embeddedAppletFrame
- perform:#'sendEvent(I)V'
- with:(embeddedAppletFrame class instVarNamed:'APPLET_DESTROY').
+ embeddedAppletFrame perform: #'sendEvent(I)V'
+ with: (embeddedAppletFrame class instVarNamed: 'APPLET_DESTROY').
"Created: / 28.1.1998 / 21:41:45 / cg"
"Modified: / 13.11.1998 / 14:19:49 / cg"
!
appletDISPOSE
- |ev|
+ | ev |
- isNS40 ifTrue:[
+ isNS40 ifTrue: [
"/ ev = netscape.applet.AppletEvent(APPLET_DISPOSE);
- ev := (Java classForName:'netscape.applet.AppletEvent')
- newWith_int:(embeddedAppletFrame class instVarNamed:'APPLET_DISPOSE').
- embeddedAppletFrame
- perform:#'sendEvent(Lnetscape/applet/NEvent;)V'
- with:ev.
+ ev := (JavaVM classForName: 'netscape.applet.AppletEvent')
+ newWith_int: (embeddedAppletFrame class instVarNamed: 'APPLET_DISPOSE').
+ embeddedAppletFrame perform: #'sendEvent(Lnetscape/applet/NEvent;)V'
+ with: ev.
^ self
].
- embeddedAppletFrame
- perform:#'sendEvent(I)V'
- with:(embeddedAppletFrame class instVarNamed:'APPLET_DISPOSE').
+ embeddedAppletFrame perform: #'sendEvent(I)V'
+ with: (embeddedAppletFrame class instVarNamed: 'APPLET_DISPOSE').
"Created: / 28.1.1998 / 21:41:57 / cg"
"Modified: / 13.11.1998 / 14:19:43 / cg"
!
appletINIT
- |ev|
+ | ev |
- isNS40 ifTrue:[
+ isNS40 ifTrue: [
"/ ev = netscape.applet.AppletEvent(APPLET_INIT);
- ev := (Java classForName:'netscape.applet.AppletEvent')
- newWith_int:(embeddedAppletFrame class instVarNamed:'APPLET_INIT').
- embeddedAppletFrame
- perform:#'sendEvent(Lnetscape/applet/NEvent;)V'
- with:ev.
+ ev := (JavaVM classForName: 'netscape.applet.AppletEvent')
+ newWith_int: (embeddedAppletFrame class instVarNamed: 'APPLET_INIT').
+ embeddedAppletFrame perform: #'sendEvent(Lnetscape/applet/NEvent;)V'
+ with: ev.
^ self
].
- embeddedAppletFrame
- perform:#'sendEvent(I)V'
- with:(embeddedAppletFrame class instVarNamed:'APPLET_INIT').
+ embeddedAppletFrame perform: #'sendEvent(I)V'
+ with: (embeddedAppletFrame class instVarNamed: 'APPLET_INIT').
"Created: / 28.1.1998 / 21:17:51 / cg"
"Modified: / 13.11.1998 / 14:19:35 / cg"
!
appletLOAD
- |ev|
+ | ev |
- isNS40 ifTrue:[
+ isNS40 ifTrue: [
"/ ev = netscape.applet.AppletEvent(APPLET_LOAD);
- ev := (Java classForName:'netscape.applet.AppletEvent')
- newWith_int:(embeddedAppletFrame class instVarNamed:'APPLET_LOAD').
- embeddedAppletFrame
- perform:#'sendEvent(Lnetscape/applet/NEvent;)V'
- with:ev.
+ ev := (JavaVM classForName: 'netscape.applet.AppletEvent')
+ newWith_int: (embeddedAppletFrame class instVarNamed: 'APPLET_LOAD').
+ embeddedAppletFrame perform: #'sendEvent(Lnetscape/applet/NEvent;)V'
+ with: ev.
^ self
].
- embeddedAppletFrame
- perform:#'sendEvent(I)V'
- with:(embeddedAppletFrame class instVarNamed:'APPLET_LOAD').
+ embeddedAppletFrame perform: #'sendEvent(I)V'
+ with: (embeddedAppletFrame class instVarNamed: 'APPLET_LOAD').
"Created: / 28.1.1998 / 21:17:37 / cg"
"Modified: / 13.11.1998 / 14:19:31 / cg"
!
appletSTART
- |ev|
+ | ev |
- isNS40 ifTrue:[
+ isNS40 ifTrue: [
"/ ev = netscape.applet.AppletEvent(APPLET_START);
- ev := (Java classForName:'netscape.applet.AppletEvent')
- newWith_int:(embeddedAppletFrame class instVarNamed:'APPLET_START').
- embeddedAppletFrame
- perform:#'sendEvent(Lnetscape/applet/NEvent;)V'
- with:ev.
+ ev := (JavaVM classForName: 'netscape.applet.AppletEvent')
+ newWith_int: (embeddedAppletFrame class instVarNamed: 'APPLET_START').
+ embeddedAppletFrame perform: #'sendEvent(Lnetscape/applet/NEvent;)V'
+ with: ev.
^ self
].
- embeddedAppletFrame
- perform:#'sendEvent(I)V'
- with:(embeddedAppletFrame class instVarNamed:'APPLET_START').
+ embeddedAppletFrame perform: #'sendEvent(I)V'
+ with: (embeddedAppletFrame class instVarNamed: 'APPLET_START').
"Created: / 28.1.1998 / 21:18:01 / cg"
"Modified: / 13.11.1998 / 14:19:21 / cg"
!
appletSTOP
- |ev|
+ | ev |
- isNS40 ifTrue:[
+ isNS40 ifTrue: [
"/ ev = netscape.applet.AppletEvent(APPLET_STOP);
- ev := (Java classForName:'netscape.applet.AppletEvent')
- newWith_int:(embeddedAppletFrame class instVarNamed:'APPLET_STOP').
- embeddedAppletFrame
- perform:#'sendEvent(Lnetscape/applet/NEvent;)V'
- with:ev.
+ ev := (JavaVM classForName: 'netscape.applet.AppletEvent')
+ newWith_int: (embeddedAppletFrame class instVarNamed: 'APPLET_STOP').
+ embeddedAppletFrame perform: #'sendEvent(Lnetscape/applet/NEvent;)V'
+ with: ev.
^ self
].
- embeddedAppletFrame
- perform:#'sendEvent(I)V'
- with:(embeddedAppletFrame class instVarNamed:'APPLET_STOP').
+ embeddedAppletFrame perform: #'sendEvent(I)V'
+ with: (embeddedAppletFrame class instVarNamed: 'APPLET_STOP').
"Created: / 28.1.1998 / 21:41:33 / cg"
"Modified: / 13.11.1998 / 14:19:14 / cg"
@@ -373,7 +371,7 @@
appletThread notNil ifTrue:[
appletThread terminateAllSubprocesses.
].
- Transcript showCR:'JAVA applet startup finished'.
+ Logger log:'JAVA applet startup finished' severity: #info facility: 'JVM'
]
]
]
@@ -386,8 +384,9 @@
appletThread resume.
^ appletThread.
- "Created: / 28.1.1998 / 21:30:32 / cg"
- "Modified: / 24.12.1999 / 02:58:50 / cg"
+ "Created: / 28-01-1998 / 21:30:32 / cg"
+ "Modified: / 24-12-1999 / 02:58:50 / cg"
+ "Modified: / 14-09-2011 / 21:40:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
stopApplet
@@ -418,13 +417,13 @@
].
appletThread isDead ifFalse:[
"/ after 3 seconds, kill it.
- Transcript showCR:'EmbeddedAppletFrame [info]: JAVA thread did not stop - soft terminate ...'.
+ Logger log:'EmbeddedAppletFrame: JAVA thread did not stop - soft terminate ...' severity: #info facility: 'JVM'.
appletThread == JavaVM javaScreenUpdaterThread ifTrue:[self halt].
appletThread == JavaVM javaEventQueueThread ifTrue:[self halt].
appletThread terminate.
n2 := n2 + 1.
n2 > 3 ifTrue:[
- Transcript showCR:'EmbeddedAppletFrame [info]: JAVA thread did not stop - shooting down ...'.
+ Logger log:'EmbeddedAppletFrame: JAVA thread did not stop - shooting down ...' severity: #info facility: 'JVM'.
appletThread terminateNoSignal
]
].
@@ -432,7 +431,8 @@
].
appletThread := nil
- "Modified: / 24.12.1999 / 02:35:25 / cg"
+ "Modified: / 24-12-1999 / 02:35:25 / cg"
+ "Modified: / 14-09-2011 / 21:42:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!JavaEmbeddedFrameView methodsFor:'initialize / release'!
@@ -476,147 +476,124 @@
^ self setupAppletFrameIn:anAppletContextOrNil initializeJava:true.
!
-setupAppletFrameIn:anAppletContextOrNil initializeJava:initializeJava
- |appletContext
- jEmbeddedAppletFrameClass jDerivedAppletFrameClass
- toolkit peer attribs id
- jCodeBaseURL jDocumentURL jArchiveURL u fn|
+setupAppletFrameIn: anAppletContextOrNil initializeJava: initializeJava
+ | appletContext jEmbeddedAppletFrameClass jDerivedAppletFrameClass toolkit peer attribs id jCodeBaseURL jDocumentURL jArchiveURL u fn |
- embeddedAppletFrame notNil ifTrue:[
+ embeddedAppletFrame notNil ifTrue: [
"/ already setup
^ self
].
-
- codeBaseURL isNil ifTrue:[
- ^ self
- ].
-
- initializeJava ifTrue:[
- Java startupJavaSystem.
- ] ifFalse:[
+ codeBaseURL isNil ifTrue: [ ^ self ].
+ initializeJava ifTrue: [ Java startupJavaSystem. ] ifFalse: [
JavaVM initializeVMIfNoEventThreadRunning
].
-
+
"/ if its a relative file-URL, make it relative under
"/ java...
- u := URL fromString:codeBaseURL.
- u method = 'file' ifTrue:[
- fn := Smalltalk getSystemFileName:u file.
- fn isNil ifTrue:[
- fn := Smalltalk getPackageFileName:('stx/libjava/' , u file).
+
+ u := URL fromString: codeBaseURL.
+ u method = 'file' ifTrue: [
+ fn := Smalltalk getSystemFileName: u file.
+ fn isNil ifTrue: [
+ fn := Smalltalk getPackageFileName: ('stx/libjava/' , u file).
]
].
- fn notNil ifTrue:[
- fn := 'file:' , fn asFilename pathName
- ] ifFalse:[
+ fn notNil ifTrue: [ fn := 'file:' , fn asFilename pathName ] ifFalse: [
fn := codeBaseURL
].
- jCodeBaseURL := Java as_URL:fn.
- documentURL notNil ifTrue:[
- jDocumentURL := Java as_URL:documentURL.
- ] ifFalse:[
- jDocumentURL := Java as_URL:fn
+ jCodeBaseURL := Java as_URL: fn.
+ documentURL notNil ifTrue: [ jDocumentURL := Java as_URL: documentURL. ] ifFalse: [
+ jDocumentURL := Java as_URL: fn
].
- archiveURL notNil ifTrue:[
- jArchiveURL := Java as_URL:archiveURL.
- ].
-
+ archiveURL notNil ifTrue: [ jArchiveURL := Java as_URL: archiveURL. ].
id := appletID.
- id isNil ifTrue:[
- NextSequentialAppletID isNil ifTrue:[
- NextSequentialAppletID := 1.
- ].
+ id isNil ifTrue: [
+ NextSequentialAppletID isNil ifTrue: [ NextSequentialAppletID := 1. ].
id := NextSequentialAppletID.
NextSequentialAppletID := NextSequentialAppletID + 1
].
-
attribs := Dictionary new.
- width notNil ifTrue:[attribs at:'width' put:width printString].
- height notNil ifTrue:[attribs at:'height' put:height printString].
-
- codeURL notNil ifTrue:[
- attribs at:'code' put:codeURL
+ width notNil ifTrue: [ attribs at: 'width' put: width printString ].
+ height notNil ifTrue: [ attribs at: 'height' put: height printString ].
+ codeURL notNil ifTrue: [ attribs at: 'code' put: codeURL ].
+ parameterDictionary notNil ifTrue: [
+ attribs declareAllFrom: parameterDictionary
].
- parameterDictionary notNil ifTrue:[
- attribs declareAllFrom:parameterDictionary
- ].
- attributeHashTable := Java as_Hashtable:attribs.
-
- anAppletContextOrNil notNil ifTrue:[
- appletContext := anAppletContextOrNil
- ] ifFalse:[
+ attributeHashTable := Java as_Hashtable: attribs.
+ anAppletContextOrNil notNil ifTrue: [ appletContext := anAppletContextOrNil ] ifFalse: [
appletContext := self class newAppletContext.
- appletContext isNil ifTrue:[
- self warn:'no netscape.applet.MozillaAppletContext class'.
+ appletContext isNil ifTrue: [
+ self warn: 'no netscape.applet.MozillaAppletContext class'.
^ false
].
].
-
- jEmbeddedAppletFrameClass := Java classForName:'netscape.applet.EmbeddedAppletFrame'.
- jEmbeddedAppletFrameClass isNil ifTrue:[
- self warn:'no netscape.applet.EmbeddedAppletFrame class'.
+ jEmbeddedAppletFrameClass := JavaVM
+ classForName: 'netscape.applet.EmbeddedAppletFrame'.
+ jEmbeddedAppletFrameClass isNil ifTrue: [
+ self warn: 'no netscape.applet.EmbeddedAppletFrame class'.
^ false
].
- jDerivedAppletFrameClass := Java classForName:'netscape.applet.DerivedAppletFrame'.
- jDerivedAppletFrameClass notNil ifTrue:[
+ jDerivedAppletFrameClass := Java
+ classForName: 'netscape.applet.DerivedAppletFrame'.
+ jDerivedAppletFrameClass notNil ifTrue: [
"/ ns4.0
embeddedAppletFrame := jDerivedAppletFrameClass new.
isNS40 := true.
- ] ifFalse:[
+ ] ifFalse: [
"/ ns3.x
embeddedAppletFrame := jEmbeddedAppletFrameClass new.
isNS40 := false.
].
- embeddedAppletFrame instVarNamed:'pData' put:self.
-
- toolkit := (Java classForName:'java.awt.Toolkit') perform:#'getDefaultToolkit'.
+ embeddedAppletFrame instVarNamed: 'pData' put: self.
+ toolkit := (Java classForName: 'java.awt.Toolkit')
+ perform: #getDefaultToolkit.
peer := toolkit
- perform:#'createFrame(Ljava/awt/Frame;)Ljava/awt/peer/FramePeer;'
- with:embeddedAppletFrame.
-
- (embeddedAppletFrame respondsTo:#'<init>(Ljava/net/URL;Ljava/net/URL;Ljava/net/URL;Ljava/util/Hashtable;Lnetscape/applet/MozillaAppletContext;Ljava/lang/Integer;Z)V')
- ifTrue:[
- "/ 4.0 netscape
- embeddedAppletFrame
- perform:#'<init>(Ljava/net/URL;Ljava/net/URL;Ljava/net/URL;Ljava/util/Hashtable;Lnetscape/applet/MozillaAppletContext;Ljava/lang/Integer;Z)V'
- withArguments:
- (Array
- with:jDocumentURL
- with:jCodeBaseURL
- with:jArchiveURL
- with:attributeHashTable
- with:appletContext
- with:(Java as_Integer:id)
- with:0 "/ reloadClasses-boolean
- ).
- ] ifFalse:[
- (embeddedAppletFrame respondsTo:#'<init>(Ljava/net/URL;Ljava/net/URL;Ljava/net/URL;Ljava/util/Hashtable;Lnetscape/applet/MozillaAppletContext;Ljava/lang/Integer;)V')
- ifTrue:[
- "/ 3.01 netscape
- embeddedAppletFrame
- perform:#'<init>(Ljava/net/URL;Ljava/net/URL;Ljava/net/URL;Ljava/util/Hashtable;Lnetscape/applet/MozillaAppletContext;Ljava/lang/Integer;)V'
- with:jDocumentURL
- with:jCodeBaseURL
- with:jArchiveURL
- with:attributeHashTable
- with:appletContext
- with:(Java as_Integer:id).
- ] ifFalse:[
- "/ oldStyle netscape
- embeddedAppletFrame
- perform:#'<init>(Ljava/net/URL;Ljava/net/URL;Ljava/util/Hashtable;Lnetscape/applet/MozillaAppletContext;I)V'
- with:jDocumentURL
- with:jCodeBaseURL
- with:attributeHashTable
- with:appletContext
- with:id.
- ].
- ].
-
- embeddedAppletFrame instVarNamed:'peer' put:peer.
-
- self javaPeer:peer.
-
+ perform: #'createFrame(Ljava/awt/Frame;)Ljava/awt/peer/FramePeer;'
+ with: embeddedAppletFrame.
+ (embeddedAppletFrame
+ respondsTo: #'<init>(Ljava/net/URL;Ljava/net/URL;Ljava/net/URL;Ljava/util/Hashtable;Lnetscape/applet/MozillaAppletContext;Ljava/lang/Integer;Z)V')
+ ifTrue: [
+ "/ 4.0 netscape
+ embeddedAppletFrame
+ perform: #'<init>(Ljava/net/URL;Ljava/net/URL;Ljava/net/URL;Ljava/util/Hashtable;Lnetscape/applet/MozillaAppletContext;Ljava/lang/Integer;Z)V'
+ withArguments: (Array
+ with: jDocumentURL
+ with: jCodeBaseURL
+ with: jArchiveURL
+ with: attributeHashTable
+ with: appletContext
+ with: (Java as_Integer: id)
+ with: 0).
+
+ "/ reloadClasses-boolean
+ ]
+ ifFalse: [
+ (embeddedAppletFrame
+ respondsTo: #'<init>(Ljava/net/URL;Ljava/net/URL;Ljava/net/URL;Ljava/util/Hashtable;Lnetscape/applet/MozillaAppletContext;Ljava/lang/Integer;)V')
+ ifTrue: [
+ "/ 3.01 netscape
+ embeddedAppletFrame
+ perform: #'<init>(Ljava/net/URL;Ljava/net/URL;Ljava/net/URL;Ljava/util/Hashtable;Lnetscape/applet/MozillaAppletContext;Ljava/lang/Integer;)V'
+ with: jDocumentURL
+ with: jCodeBaseURL
+ with: jArchiveURL
+ with: attributeHashTable
+ with: appletContext
+ with: (Java as_Integer: id).
+ ]
+ ifFalse: [
+ "/ oldStyle netscape
+ embeddedAppletFrame
+ perform: #'<init>(Ljava/net/URL;Ljava/net/URL;Ljava/util/Hashtable;Lnetscape/applet/MozillaAppletContext;I)V'
+ with: jDocumentURL
+ with: jCodeBaseURL
+ with: attributeHashTable
+ with: appletContext
+ with: id.
+ ].
+ ].
+ embeddedAppletFrame instVarNamed: 'peer' put: peer.
+ self javaPeer: peer.
^ true
"Created: / 20.10.1998 / 15:47:04 / cg"
@@ -648,13 +625,19 @@
!JavaEmbeddedFrameView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libjava/JavaEmbeddedFrameView.st,v 1.28 2011-11-24 11:52:46 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libjava/JavaEmbeddedFrameView.st,v 1.29 2013-02-16 18:08:32 vrany Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libjava/JavaEmbeddedFrameView.st,v 1.28 2011-11-24 11:52:46 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libjava/JavaEmbeddedFrameView.st,v 1.29 2013-02-16 18:08:32 vrany Exp $'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
!
version_SVN
- ^ '§Id: JavaEmbeddedFrameView.st,v 1.26 2011/08/18 18:42:48 vrany Exp §'
+ ^ '§Id§'
! !
+