--- a/AbstractTime.st Sun Nov 04 16:06:59 2012 +0100
+++ b/AbstractTime.st Mon Nov 05 13:56:40 2012 +0100
@@ -878,6 +878,7 @@
^ aTimestamp getSeconds - self getSeconds
! !
+
!AbstractTime methodsFor:'printing & storing'!
addPrintBindingsTo:aDictionary
@@ -918,6 +919,7 @@
%(milli1) milliseconds, truncated to 1/10th of a second 0..9
%(milli2) milliseconds, truncated to 1/100th of a second 00..99 0-padded to length 2
+ %(milli3) milliseconds, same as %i for convenience
Timestamp only:
%(Day) - day - unpadded
@@ -979,7 +981,7 @@
"
- |hours minutes seconds millis usHours ampm s zone tzDelta|
+ |hours minutes seconds millis usHours ampm s t zone tzDelta|
hours := self hours.
minutes := self minutes.
@@ -993,18 +995,26 @@
aDictionary at:$H put:(s := hours printString).
aDictionary at:$h put:(s leftPaddedTo:2 with:$0).
+
aDictionary at:$U put:(s := usHours printString).
aDictionary at:$u put:(s leftPaddedTo:2 with:$0).
+
aDictionary at:$M put:(s := minutes printString).
aDictionary at:$m put:(s leftPaddedTo:2 with:$0).
+
aDictionary at:$S put:(s := seconds printString).
aDictionary at:$s put:(s leftPaddedTo:2 with:$0).
+
aDictionary at:$I put:(s := millis printString).
- aDictionary at:$i put:(s leftPaddedTo:3 with:$0).
+ aDictionary at:$i put:(t := s leftPaddedTo:3 with:$0).
+ aDictionary at:#milli3 put:t.
+
aDictionary at:#milli1 put:((millis // 100) printString).
aDictionary at:#milli2 put:((millis // 10) printStringLeftPaddedTo:2 with:$0).
+
aDictionary at:$t put:(seconds * minutes) printString.
aDictionary at:$T put:(seconds * minutes * hours) printString.
+
aDictionary at:$a put:ampm.
aDictionary at:$A put:ampm asUppercase.
aDictionary at:$z put:zone.
@@ -1187,9 +1197,9 @@
!AbstractTime class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/AbstractTime.st,v 1.74 2011-09-15 08:42:47 ca Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/AbstractTime.st,v 1.75 2012-11-05 12:56:40 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic/AbstractTime.st,v 1.74 2011-09-15 08:42:47 ca Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/AbstractTime.st,v 1.75 2012-11-05 12:56:40 cg Exp $'
! !