diff -r 6884221caecf -r 518ee2523071 AbstractTime.st --- a/AbstractTime.st Tue Jan 26 17:49:08 2010 +0100 +++ b/AbstractTime.st Wed Jan 27 15:07:56 2010 +0100 @@ -409,6 +409,7 @@ " ! ! + !AbstractTime methodsFor:'abstract'! hours @@ -921,7 +922,7 @@ " - |hours minutes seconds millis usHours ampm s zone tzDelta| + |hours minutes seconds millis usHours ampm s zone tzDelta t| hours := self hours. minutes := self minutes. @@ -933,24 +934,40 @@ ampm := self meridianAbbreviation. usHours := self hour12. - 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:$H put:(t := s := hours printString). + aDictionary at:#H put:t. + aDictionary at:$h put:(t := s leftPaddedTo:2 with:$0). + aDictionary at:#h put:t. + aDictionary at:$U put:(t := s := usHours printString). + aDictionary at:#U put:t. + aDictionary at:$u put:(t := s leftPaddedTo:2 with:$0). + aDictionary at:#u put:t. + aDictionary at:$M put:(t := s := minutes printString). + aDictionary at:#M put:t. + aDictionary at:$m put:(t := s leftPaddedTo:2 with:$0). + aDictionary at:#m put:t. + aDictionary at:$S put:(t := s := seconds printString). + aDictionary at:#S put:t. + aDictionary at:$s put:(t := s leftPaddedTo:2 with:$0). + aDictionary at:#s put:t. + aDictionary at:$I put:(t := s := millis printString). + aDictionary at:#I put:t. + aDictionary at:$i put:(t := s leftPaddedTo:3 with:$0). + aDictionary at:#i 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. - aDictionary at:$Z put:zone asUppercase. + aDictionary at:$t put:(t := seconds * minutes) printString. + aDictionary at:#t put:t. + aDictionary at:$T put:(t := seconds * minutes * hours) printString. + aDictionary at:#T put:t. + aDictionary at:$a put:t := ampm. + aDictionary at:#a put:t. + aDictionary at:$A put:t := ampm asUppercase. + aDictionary at:#A put:t. + aDictionary at:$z put:t := zone. + aDictionary at:#z put:t. + aDictionary at:$Z put:t := zone asUppercase. + aDictionary at:#Z put:t. tzDelta == 0 ifTrue:[ s := 'Z'. @@ -1139,5 +1156,9 @@ !AbstractTime class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libbasic/AbstractTime.st,v 1.65 2009-09-22 13:17:23 cg Exp $' + ^ '$Header: /cvs/stx/stx/libbasic/AbstractTime.st,v 1.66 2010-01-27 14:07:56 sr Exp $' +! + +version_CVS + ^ '$Header: /cvs/stx/stx/libbasic/AbstractTime.st,v 1.66 2010-01-27 14:07:56 sr Exp $' ! !