hg/stx-libbasic: comparison AbstractTime.st

equal deleted inserted replaced

-:967b6c76169a
+:67eeb7ae5eb8
 (Time hours:12 minutes:0 seconds:0) meridianAbbreviation
 (Time hours:12 minutes:0 seconds:1) meridianAbbreviation
 "
 ! !
 !AbstractTime methodsFor:'abstract'!
 hours
 "return the hour of time (0..23)"
 !
 - aTimeOrNumberOfSeconds
 "return the delta in seconds between 2 times or subtract a number of seconds."
-"/    aTimeOrNumberOfSeconds isNumber ifTrue:[
-"/        ^ self species basicNew
-"/            setMilliseconds:(self getMilliseconds - (aTimeOrNumberOfSeconds * 1000) asInteger)
-"/    ].
-"/    ^ self getSeconds - aTimeOrNumberOfSeconds getSeconds
 ^ aTimeOrNumberOfSeconds differenceFromTimestamp:self.
 "
 Timestamp now - 3600.
 Time now - 3600.
 (TimeDuration fromString:'1.5hr') - (TimeDuration fromString:'1hr')
 |t1 t2|
 t1 := Timestamp now.
-(Delay forSeconds:5) wait.
+Delay waitFor:10 seconds.
 t2 := Timestamp now.
 Transcript showCR:('seconds passed: ' , (t2 - t1) printString).
 "
 !
 differenceFromTimestamp:aTimestamp
 "/ the correct thing to do (and I will, in the future) is to
 "/ return a TimeDuration:
 "/
-^ TimeDuration fromMilliseconds:(self getMilliseconds - (aTimestamp getMilliseconds))
+^ TimeDuration fromMilliseconds:(aTimestamp getMilliseconds -self getMilliseconds).
 "/ which is the same as: deltaFrom:aTimestamp
 "/
 "/ however, there might be old code around, which is not be prepared for
 "/ getting a non-number (the seconds). Therefore, for the meantime,
 "/ we return:
 "/ ^ aTimestamp getSeconds - self getSeconds
 ! !
 !AbstractTime methodsFor:'printing & storing'!
 addPrintBindingsTo:aDictionary
 "private print support: add bindings for printing to aDictionary."
 ! !
 !AbstractTime class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/AbstractTime.st,v 1.78 2014-04-16 22:34:52 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/AbstractTime.st,v 1.79 2014-05-07 14:33:06 stefan Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libbasic/AbstractTime.st,v 1.78 2014-04-16 22:34:52 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/AbstractTime.st,v 1.79 2014-05-07 14:33:06 stefan Exp $'
 ! !

changeset 16407	67eeb7ae5eb8
parent 16365	7255d544da96
child 16475	dd2e012601bf