--- a/JavaEmbeddedFrameView.st Fri Feb 06 17:58:26 2004 +0000
+++ b/JavaEmbeddedFrameView.st Sat Mar 20 19:27:50 2004 +0000
@@ -372,9 +372,9 @@
ex proceed.
] do:[
[
- "/ Transcript showCR:(AbsoluteTime now printString , ' start embeddedAppletFrame').
+ "/ Transcript showCR:(Timestamp now printString , ' start embeddedAppletFrame').
embeddedAppletFrame perform:#'run()V'.
- ] valueNowOrOnUnwindDo:[
+ ] ensure:[
appletThread notNil ifTrue:[
appletThread terminateAllSubprocesses.
].
@@ -653,5 +653,5 @@
!JavaEmbeddedFrameView class methodsFor:'documentation'!
version
- ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaEmbeddedFrameView.st,v 1.24 2002/11/22 20:14:01 cg Exp $'
+ ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaEmbeddedFrameView.st,v 1.25 2004/03/20 19:26:20 stefan Exp $'
! !
--- a/JavaVM.st Fri Feb 06 17:58:26 2004 +0000
+++ b/JavaVM.st Sat Mar 20 19:27:50 2004 +0000
@@ -5711,10 +5711,10 @@
_System_currentTimeMillis:nativeContext
"return the milliseconds since 1.jan.1970"
- |seconds delta|
+ |delta|
"/ workaround win32 bug (use 01:01:01 as base)
- delta := AbsoluteTime now millisecondDeltaFrom:(AbsoluteTime day:1 month:1 year:1970 hour:1 minutes:1 seconds:1).
+ delta := Timestamp now millisecondDeltaFrom:(AbsoluteTime day:1 month:1 year:1970 hour:1 minutes:1 seconds:1).
delta := delta - 3600 - 60 - 1.
"/ "/ make certain, it fits 64 signed bits
"/ delta := delta bitAnd:16r7FFFFFFFFFFFFFFF.
@@ -5941,7 +5941,7 @@
_Thread_start:nativeContext
"start the thread"
- |jThread jName name stProcess screenUpdaterClass|
+ |jThread jName name stProcess|
jThread := nativeContext receiver.
(jThread instVarNamed:'priority') < 1 ifTrue:[
@@ -6001,7 +6001,7 @@
].
ex reject.
] do:[
-"/ Transcript showCR:(AbsoluteTime now printString , 'start thread: ', stProcess name).
+"/ Transcript showCR:(Timestamp now printString , 'start thread: ', stProcess name).
jThread perform:#'run()V'.
ThreadTrace == true ifTrue:[
('JAVA: thread ' , stProcess name , ' terminated') infoPrintCR.
@@ -6012,7 +6012,7 @@
]
]
]
- ] valueNowOrOnUnwindDo:[
+ ] ensure:[
|monitors|
monitors := EnteredMonitorsPerProcess at:stProcess ifAbsent:nil.
@@ -12847,7 +12847,7 @@
!JavaVM class methodsFor:'documentation'!
version
- ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaVM.st,v 1.181 2002/11/22 20:12:48 cg Exp $'
+ ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaVM.st,v 1.182 2004/03/20 19:27:50 stefan Exp $'
! !
JavaVM initialize!