--- a/JavaClass.st Sat Aug 31 14:06:43 2002 +0200
+++ b/JavaClass.st Fri Nov 22 21:09:21 2002 +0100
@@ -22,7 +22,7 @@
A_ABSTRACT A_INITIALIZED A_SMALLTALK A_ABSTRACT_OR_INTERFACE
A_STATIC A_NATIVE ArgumentConversionErrorSignal OrderOfClassInits'
poolDictionaries:''
- category:'Java-Classes'
+ category:'Languages-Java-Classes'
!
!JavaClass class methodsFor:'documentation'!
@@ -1856,6 +1856,7 @@
!JavaClass class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libjava/JavaClass.st,v 1.123 2002-08-31 12:06:43 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libjava/JavaClass.st,v 1.124 2002-11-22 20:09:17 cg Exp $'
! !
+
JavaClass initialize!
--- a/JavaMethod.st Sat Aug 31 14:06:43 2002 +0200
+++ b/JavaMethod.st Fri Nov 22 21:09:21 2002 +0100
@@ -21,7 +21,7 @@
A_PROTECTED A_STATIC A_FINAL A_SYNCHRONIZED A_ABSTRACT A_NATIVE
A_BREAKPOINT R_VOID R_LONG R_DOUBLE A_HASHANDLER'
poolDictionaries:''
- category:'Java-Classes'
+ category:'Languages-Java-Classes'
!
!JavaMethod class methodsFor:'documentation'!
@@ -1909,6 +1909,7 @@
!JavaMethod class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libjava/JavaMethod.st,v 1.102 2000-12-18 16:43:32 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libjava/JavaMethod.st,v 1.103 2002-11-22 20:09:04 cg Exp $'
! !
+
JavaMethod initialize!
--- a/JavaMethodWithBreakpoint.st Sat Aug 31 14:06:43 2002 +0200
+++ b/JavaMethodWithBreakpoint.st Fri Nov 22 21:09:21 2002 +0100
@@ -4,7 +4,7 @@
instanceVariableNames:''
classVariableNames:''
poolDictionaries:''
- category:'Java-Classes'
+ category:'Languages-Java-Classes'
!
@@ -25,6 +25,7 @@
!JavaMethodWithBreakpoint class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libjava/Attic/JavaMethodWithBreakpoint.st,v 1.4 2000-09-01 15:22:19 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libjava/Attic/JavaMethodWithBreakpoint.st,v 1.5 2002-11-22 20:09:08 cg Exp $'
! !
+
JavaMethodWithBreakpoint initialize!
--- a/JavaMethodWithException.st Sat Aug 31 14:06:43 2002 +0200
+++ b/JavaMethodWithException.st Fri Nov 22 21:09:21 2002 +0100
@@ -17,7 +17,7 @@
instanceVariableNames:'exceptionTable'
classVariableNames:''
poolDictionaries:''
- category:'Java-Classes'
+ category:'Languages-Java-Classes'
!
!JavaMethodWithException class methodsFor:'documentation'!
@@ -61,6 +61,7 @@
!JavaMethodWithException class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libjava/JavaMethodWithException.st,v 1.5 2000-09-01 15:22:24 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libjava/JavaMethodWithException.st,v 1.6 2002-11-22 20:09:15 cg Exp $'
! !
+
JavaMethodWithException initialize!
--- a/JavaMethodWithHandler.st Sat Aug 31 14:06:43 2002 +0200
+++ b/JavaMethodWithHandler.st Fri Nov 22 21:09:21 2002 +0100
@@ -17,7 +17,7 @@
instanceVariableNames:'exceptionHandlerTable'
classVariableNames:''
poolDictionaries:''
- category:'Java-Classes'
+ category:'Languages-Java-Classes'
!
!JavaMethodWithHandler class methodsFor:'documentation'!
@@ -61,6 +61,7 @@
!JavaMethodWithHandler class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libjava/JavaMethodWithHandler.st,v 1.7 2000-09-01 15:22:34 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libjava/JavaMethodWithHandler.st,v 1.8 2002-11-22 20:09:06 cg Exp $'
! !
+
JavaMethodWithHandler initialize!
--- a/JavaNativeMethod.st Sat Aug 31 14:06:43 2002 +0200
+++ b/JavaNativeMethod.st Fri Nov 22 21:09:21 2002 +0100
@@ -4,7 +4,7 @@
instanceVariableNames:'nativeImplementation'
classVariableNames:''
poolDictionaries:''
- category:'Java-Classes'
+ category:'Languages-Java-Classes'
!
@@ -88,6 +88,7 @@
!JavaNativeMethod class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libjava/JavaNativeMethod.st,v 1.7 2000-12-18 19:31:00 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libjava/JavaNativeMethod.st,v 1.8 2002-11-22 20:09:13 cg Exp $'
! !
+
JavaNativeMethod initialize!
--- a/JavaObject.st Sat Aug 31 14:06:43 2002 +0200
+++ b/JavaObject.st Fri Nov 22 21:09:21 2002 +0100
@@ -1,10 +1,6 @@
"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+ All Rights Reserved
This software is furnished under a license and may be used
only in accordance with the terms of that license and with the
@@ -12,33 +8,9 @@
be provided or otherwise made available to, or used by, any
other person. No title to or ownership of the software is
hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
- of one of the above copright owners.
-"
"{ Package: 'stx:libjava' }"
Object subclass:#JavaObject
@@ -52,12 +24,8 @@
copyright
"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+ All Rights Reserved
This software is furnished under a license and may be used
only in accordance with the terms of that license and with the
@@ -65,34 +33,8 @@
be provided or otherwise made available to, or used by, any
other person. No title to or ownership of the software is
hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
- of one of the above copright owners.
-
-"
! !
!JavaObject class methodsFor:'misc'!
@@ -225,24 +167,24 @@
myClass == Java java_lang_String ifTrue:[
^ '''' , (Java as_ST_String:self) , ''''
].
+
myClass == (Java at:'java.lang.Class') ifTrue:[
- ^ super displayString , '('
- , (JavaVM reflection classForJavaClassObject:self) displayString , ')'
+ ^ super displayString , '(' , (JavaVM classForJavaClassObject:self) displayString , ')'
].
+
myClass == (Java at:'java.lang.reflect.Method') ifTrue:[
- ^ super displayString , '('
- , (JavaVM methodForJavaMethodObject:self) displayString , ')'
+ ^ super displayString , '(' , (JavaVM methodForJavaMethodObject:self) displayString , ')'
].
- Object errorSignal
- handle:[:ex | javaString := ''.]
- do:[
- javaString := Java
- as_ST_String:(self perform:#'toString()Ljava/lang/String;').
- ].
+
+ Object errorSignal handle:[:ex |
+ javaString := ''.
+ ] do:[
+ javaString := Java as_ST_String:(self perform:#'toString()Ljava/lang/String;').
+ ].
+
^ super displayString , ' (' , javaString , ')'.
- "Modified: / 04-11-1998 / 18:35:00 / cg"
- "Modified: / 28-01-2011 / 15:10:05 / Marcel Hlopko <hlopik@gmail.com>"
+ "Modified: / 4.11.1998 / 18:35:00 / cg"
!
javaDisplayString
@@ -256,34 +198,6 @@
"Created: / 7.4.1997 / 17:38:13 / cg"
"Modified: / 4.11.1998 / 21:07:19 / cg"
-!
-
-printString
- |myClass javaString|
-
- myClass := self class.
- myClass == Java java_lang_String ifTrue:[
- ^ '''' , (Java as_ST_String:self) , ''''
- ].
- myClass == (Java at:'java.lang.Class') ifTrue:[
- ^ super printString , '('
- , (JavaVM reflection classForJavaClassObject:self) displayString , ')'
- ].
- myClass == (Java at:'java.lang.reflect.Method') ifTrue:[
- ^ super printString , '('
- , (JavaVM methodForJavaMethodObject:self) displayString , ')'
- ].
- Object errorSignal
- handle:[:ex | javaString := ''.]
- do:[
- javaString := Java
- as_ST_String:(self perform:#'toString()Ljava/lang/String;').
- ].
- ^ super printString , ' (' , javaString , ')'.
-
- "Modified: / 04-11-1998 / 18:35:00 / cg"
- "Created: / 20-12-2010 / 23:10:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 28-01-2011 / 15:10:17 / Marcel Hlopko <hlopik@gmail.com>"
! !
!JavaObject methodsFor:'queries'!
@@ -366,9 +280,5 @@
!JavaObject class methodsFor:'documentation'!
version
- ^ '$Id: JavaObject.st,v 1.54 2011/08/18 18:42:48 vrany Exp $'
-!
-
-version_SVN
- ^ '$Id: JavaObject.st,v 1.54 2011/08/18 18:42:48 vrany Exp $'
-! !
\ No newline at end of file
+ ^ '$Header: /cvs/stx/stx/libjava/JavaObject.st,v 1.53 2002-11-22 20:09:11 cg Exp $'
+! !
--- a/JavaProcess.st Sat Aug 31 14:06:43 2002 +0200
+++ b/JavaProcess.st Fri Nov 22 21:09:21 2002 +0100
@@ -1,10 +1,6 @@
"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+ All Rights Reserved
This software is furnished under a license and may be used
only in accordance with the terms of that license and with the
@@ -12,33 +8,9 @@
be provided or otherwise made available to, or used by, any
other person. No title to or ownership of the software is
hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
- of one of the above copright owners.
-"
"{ Package: 'stx:libjava' }"
Process subclass:#JavaProcess
@@ -48,23 +20,12 @@
category:'Languages-Java-Classes'
!
-Object subclass:#Helper
- instanceVariableNames:'javaThreadObject javaProcess'
- classVariableNames:''
- poolDictionaries:''
- privateIn:JavaProcess
-!
-
!JavaProcess class methodsFor:'documentation'!
copyright
"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+ All Rights Reserved
This software is furnished under a license and may be used
only in accordance with the terms of that license and with the
@@ -72,43 +33,8 @@
be provided or otherwise made available to, or used by, any
other person. No title to or ownership of the software is
hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
+"
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
- of one of the above copright owners.
-
-"
-! !
-
-!JavaProcess class methodsFor:'instance creation'!
-
-newHelper
-
- ^Helper new
-
- "Created: / 15-12-2010 / 11:11:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!JavaProcess methodsFor:'accessing'!
@@ -158,147 +84,8 @@
"Created: / 10.4.1998 / 15:21:15 / cg"
! !
-!JavaProcess methodsFor:'suspend & resume'!
-
-terminateNoSignal
-
- | jThread |
- jThread := Java threads keyAtValue: self.
- JavaVM wakeup: jThread.
-
- super terminateNoSignal
-
- "Created: / 15-12-2010 / 00:18:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 15-12-2010 / 11:19:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaProcess::Helper methodsFor:'initialization'!
-
-javaProcess:something
- javaProcess := something.
-!
-
-javaThreadObject:something
- javaThreadObject := something.
-! !
-
-!JavaProcess::Helper methodsFor:'support'!
-
-value
- |procName|
-
- Object abortSignal
- handle:[:ex |
- procName := javaProcess name.
- (procName startsWith:'JAVA-AWT-EventQueue') ifTrue:[
- ('JAVA [info]: thread ' , procName , ' aborted - restarting process.')
- infoPrintCR.
- ex restart.
- ] ifFalse:[
- (javaProcess == (Smalltalk at:#'JavaVM:JavaScreenUpdaterThread')
- or:[javaProcess == (Smalltalk at:#'JavaVM:JavaEventQueueThread')])
- ifTrue:[
- ('JAVA [info]: thread ' , procName , ' aborted - restarting process.')
- infoPrintCR.
- ex restart
- ]
- ifFalse:[('JAVA [info]: thread ' , procName , ' aborted.') infoPrintCR.]
- ].
- ]
- do:[
- [
- JavaVM javaExceptionSignal
- handle:[:ex |
- |exClass|
-
- procName := javaProcess name.
- exClass := ex parameter class.
- exClass == (Java at:'java.lang.ThreadDeath') ifTrue:[
- ('JAVA: thread ' , procName , ' terminated') infoPrintCR.
- ] ifFalse:[
- Transcript
- showCR:('JAVA: thread ''' , procName , ''' terminated with exception: '
- , exClass name).
- ].
- ex return.
- ]
- do:[
- Object messageNotUnderstoodSignal
- handle:[:ex |
- |
- "/ remap doesNotUnderstand with nil-receiver to
- "/ a nullPointerException ...
- con m|
-
- con := ex suspendedContext.
- con receiver isNil ifTrue:[
- ((m := con sender method) notNil and:[m isJavaMethod]) ifTrue:[
- JavaVM throwNullPointerException.
- AbortSignal raise.
-
- "/ ex proceed.
- ]
- ].
- ex reject.
- ]
- do:[
- "/ Transcript showCR:(Timestamp now printString , 'start thread: ', stProcess name).
- javaThreadObject perform:#'run()V'.
- (Smalltalk at:#'JavaVM:ThreadTrace') == true ifTrue:[
- ('JAVA: thread ' , javaProcess name , ' terminated') infoPrintCR.
- ].
- javaThreadObject perform:#'exit()V'.
- (Smalltalk at:#'JavaVM:ThreadTrace') == true ifTrue:[
- ('JAVA: after exit of thread ' , javaProcess name) infoPrintCR.
- ]
- ]
- ]
- ] ensure:[
- |monitors|
-
- monitors := (Smalltalk at:#'JavaVM:EnteredMonitorsPerProcess')
- at:javaProcess
- ifAbsent:nil.
- monitors notNil ifTrue:[
- monitors do:[:obj |
- |mon|
-
- mon := JavaVM monitorFor:obj.
- mon notNil ifTrue:[
- mon owningProcess == javaProcess ifTrue:[
- ('JAVA: release monitor owned by dying thread: ' , javaProcess name)
- infoPrintCR.
- self breakPoint: #jv.
- mon exit
- ].
- ].
- ].
- (Smalltalk at:#'JavaVM:EnteredMonitorsPerProcess') removeKey:javaProcess.
- javaProcess == (Smalltalk at:#'JavaVM:JavaScreenUpdaterThread') ifTrue:[
- Smalltalk at:#'JavaVM:JavaScreenUpdaterThread' put:nil.
- ].
- javaProcess == (Smalltalk at:#'JavaVM:JavaEventQueueThread') ifTrue:[
- Smalltalk at:#'JavaVM:JavaEventQueueThread' put:nil.
- ].
-
-"/ screenUpdaterClass := Java at:'sun.awt.ScreenUpdater'.
-"/ screenUpdaterClass notNil ifTrue:[
-"/ screenUpdaterClass instVarNamed:'updater' put:nil.
-"/ ].
- ].
- Java threads removeKey:javaThreadObject ifAbsent:[].
- ]
- ]
-
- "Created: / 15-12-2010 / 11:06:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
!JavaProcess class methodsFor:'documentation'!
version
- ^ '$Id: JavaProcess.st,v 1.15 2011/08/18 18:42:48 vrany Exp $'
-!
-
-version_SVN
- ^ '$Id: JavaProcess.st,v 1.15 2011/08/18 18:42:48 vrany Exp $'
-! !
\ No newline at end of file
+ ^ '$Header: /cvs/stx/stx/libjava/JavaProcess.st,v 1.14 2002-11-22 20:09:21 cg Exp $'
+! !