AbstractTime.st
author Claus Gittinger <cg@exept.de>
Thu, 06 Nov 2014 17:54:42 +0100
changeset 16941 78358165ed6b
parent 16934 2a4639715b07
child 16982 c37260d6ff78
permissions -rw-r--r--
class: AbstractTime added: #nowWithMilliseconds
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
240
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
     1
"
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
     2
 COPYRIGHT (c) 1995 by Claus Gittinger
7010
13fcdfdc95b1 add methods for squeak compatibility
penk
parents: 7007
diff changeset
     3
              All Rights Reserved
240
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
     4
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
     5
 This software is furnished under a license and may be used
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
     6
 only in accordance with the terms of that license and with the
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
     8
 be provided or otherwise made available to, or used by, any
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
     9
 other person.  No title to or ownership of the software is
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
    10
 hereby transferred.
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
    11
"
5548
eead51e4752e added #weekInYear query
Claus Gittinger <cg@exept.de>
parents: 5191
diff changeset
    12
"{ Package: 'stx:libbasic' }"
eead51e4752e added #weekInYear query
Claus Gittinger <cg@exept.de>
parents: 5191
diff changeset
    13
240
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
    14
Magnitude subclass:#AbstractTime
7258
9ccdbee7d1ad method category rename
Claus Gittinger <cg@exept.de>
parents: 7010
diff changeset
    15
	instanceVariableNames:''
9ccdbee7d1ad method category rename
Claus Gittinger <cg@exept.de>
parents: 7010
diff changeset
    16
	classVariableNames:''
9ccdbee7d1ad method category rename
Claus Gittinger <cg@exept.de>
parents: 7010
diff changeset
    17
	poolDictionaries:''
7672
46f206594db3 Category change
Stefan Vogel <sv@exept.de>
parents: 7327
diff changeset
    18
	category:'Magnitude-Time'
240
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
    19
!
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
    20
2310
2cb1366e0eb3 Correct name: #secondDay --> #secondInDay.
Stefan Vogel <sv@exept.de>
parents: 1500
diff changeset
    21
!AbstractTime class methodsFor:'documentation'!
240
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
    22
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
    23
copyright
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
    24
"
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
    25
 COPYRIGHT (c) 1995 by Claus Gittinger
7010
13fcdfdc95b1 add methods for squeak compatibility
penk
parents: 7007
diff changeset
    26
              All Rights Reserved
240
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
    27
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
    28
 This software is furnished under a license and may be used
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
    29
 only in accordance with the terms of that license and with the
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
    30
 inclusion of the above copyright notice.   This software may not
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
    31
 be provided or otherwise made available to, or used by, any
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
    32
 other person.  No title to or ownership of the software is
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
    33
 hereby transferred.
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
    34
"
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
    35
!
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
    36
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
    37
documentation
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
    38
"
1500
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
    39
    This is an abstract class providing common protocol for Time (time in day)
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
    40
    and Timestamp (time plus day).
1500
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
    41
    There are no instances of this class in the system.
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
    42
    It is meant as a home for methods common to time handling classes.
1282
3f5eda57c516 commentary
Claus Gittinger <cg@exept.de>
parents: 1227
diff changeset
    43
1295
83f594f05c52 documentation
Claus Gittinger <cg@exept.de>
parents: 1282
diff changeset
    44
    [author:]
83f594f05c52 documentation
Claus Gittinger <cg@exept.de>
parents: 1282
diff changeset
    45
        Claus Gittinger
83f594f05c52 documentation
Claus Gittinger <cg@exept.de>
parents: 1282
diff changeset
    46
1282
3f5eda57c516 commentary
Claus Gittinger <cg@exept.de>
parents: 1227
diff changeset
    47
    [See also:]
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
    48
        Time Date Timestamp
1282
3f5eda57c516 commentary
Claus Gittinger <cg@exept.de>
parents: 1227
diff changeset
    49
        Delay ProcessorScheduler
240
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
    50
"
6172
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    51
!
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    52
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    53
iso8601Format
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    54
"
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    55
  Abstract
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    56
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    57
    This document defines a profile of ISO 8601, the International Standard for the representation of dates and times. ISO
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    58
    8601 describes a large number of date/time formats. To reduce the scope for error and the complexity of software, it is
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    59
    useful to restrict the supported formats to a small number. This profile defines a few date/time formats, likely to satisfy
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    60
    most requirements. 
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    61
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    62
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    63
  Formats
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    64
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    65
    Different standards may need different levels of granularity in the date and time, so this profile defines six levels.
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    66
    Standards that reference this profile should specify one or more of these granularities. If a given standard allows more
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    67
    than one granularity, it should specify the meaning of the dates and times with reduced precision, for example, the result
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    68
    of comparing two dates with different precisions.
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    69
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    70
    The formats are as follows. Exactly the components shown here must be present, with exactly this punctuation. Note
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    71
    that the 'T' appears literally in the string, to indicate the beginning of the time element, as specified in ISO 8601. 
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    72
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    73
       Year:
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    74
          YYYY (eg 1997)
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    75
       Year and month:
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    76
          YYYY-MM (eg 1997-07)
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    77
       Complete date:
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    78
          YYYY-MM-DD (eg 1997-07-16)
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    79
       Complete date plus hours and minutes:
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    80
          YYYY-MM-DDThh:mmTZD (eg 1997-07-16T19:20+01:00)
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    81
       Complete date plus hours, minutes and seconds:
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    82
          YYYY-MM-DDThh:mm:ssTZD (eg 1997-07-16T19:20:30+01:00)
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    83
       Complete date plus hours, minutes, seconds and a decimal fraction of a
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    84
    second
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    85
          YYYY-MM-DDThh:mm:ss.sTZD (eg 1997-07-16T19:20:30.45+01:00)
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    86
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    87
    where:
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    88
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    89
         YYYY = four-digit year
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    90
         MM   = two-digit month (01=January, etc.)
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    91
         DD   = two-digit day of month (01 through 31)
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    92
         hh   = two digits of hour (00 through 23) (am/pm NOT allowed)
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    93
         mm   = two digits of minute (00 through 59)
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    94
         ss   = two digits of second (00 through 59)
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    95
         s    = one or more digits representing a decimal fraction of a second
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    96
         TZD  = time zone designator (Z or +hh:mm or -hh:mm)
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    97
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    98
    This profile does not specify how many digits may be used to represent the decimal fraction of a second. An adopting
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
    99
    standard that permits fractions of a second must specify both the minimum number of digits (a number greater than or
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   100
    equal to one) and the maximum number of digits (the maximum may be stated to be 'unlimited').
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   101
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   102
    This profile defines two ways of handling time zone offsets:
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   103
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   104
       1.Times are expressed in UTC (Coordinated Universal Time), with a special UTC designator ('Z'). 
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   105
       2.Times are expressed in local time, together with a time zone offset in hours and minutes. A time zone offset of
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   106
         '+hh:mm' indicates that the date/time uses a local time zone which is 'hh' hours and 'mm' minutes ahead of
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   107
         UTC. A time zone offset of '-hh:mm' indicates that the date/time uses a local time zone which is 'hh' hours and
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   108
         'mm' minutes behind UTC. 
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   109
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   110
    A standard referencing this profile should permit one or both of these ways of handling time zone offsets.
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   111
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   112
  The ISO8601 printString are generated with:
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   113
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   114
       Year:
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   115
          YYYY (eg 1997)
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   116
                Date today printStringFormat:'%(year)'
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   117
                Timestamp now printStringFormat:'%(year)'  
6172
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   118
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   119
       Year and month:
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   120
          YYYY-MM (eg 1997-07)
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   121
                Date today printStringFormat:'%(year)-%(month)'  
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   122
                Timestamp now printStringFormat:'%(year)-%(month)'  
6172
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   123
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   124
       Complete date:
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   125
          YYYY-MM-DD (eg 1997-07-16)
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   126
                Date today printStringFormat:'%(year)-%(month)-%(day)'    
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   127
                Timestamp now printStringFormat:'%(year)-%(month)-%(day)'  
6172
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   128
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   129
       Complete date plus hours and minutes:
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   130
          YYYY-MM-DDThh:mmTZD (eg 1997-07-16T19:20+01:00)
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   131
                Timestamp now printStringFormat:'%(year)-%(month)-%(day)T%h:%m%(TZD)'  
6172
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   132
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   133
       Complete date plus hours, minutes and seconds:
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   134
          YYYY-MM-DDThh:mm:ssTZD (eg 1997-07-16T19:20:30+01:00)
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   135
                Timestamp now printStringFormat:'%(year)-%(month)-%(day)T%h:%m:%s%(TZD)'  
6172
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   136
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   137
       Complete date plus hours, minutes, seconds and a decimal fraction of a second
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   138
          YYYY-MM-DDThh:mm:ss.sTZD (eg 1997-07-16T19:20:30.45+01:00)
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   139
                Timestamp now printStringFormat:'%(year)-%(month)-%(day)T%h:%m:%s.%(milli2)%(TZD)'  
6172
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   140
"
240
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
   141
! !
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
   142
2310
2cb1366e0eb3 Correct name: #secondDay --> #secondInDay.
Stefan Vogel <sv@exept.de>
parents: 1500
diff changeset
   143
!AbstractTime class methodsFor:'instance creation'!
240
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
   144
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   145
dateAndTimeNow
1227
e89b39909085 commentary & category changes
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
   146
    "return an array filled with the current date and time.
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   147
     See also: Date today / Time now / Timestamp now."
240
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
   148
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   149
    ^ Array with:(Date today) with:(Time now)
240
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
   150
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
   151
    "
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   152
     Time dateAndTimeNow
7007
9af8cc2f82a4 totalSeconds returns the number of seconds since 1.1.1901 now
penk
parents: 6888
diff changeset
   153
     Date dateAndTimeNow
240
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
   154
    "
1227
e89b39909085 commentary & category changes
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
   155
e89b39909085 commentary & category changes
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
   156
    "Modified: 19.4.1996 / 15:23:37 / cg"
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   157
!
240
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
   158
9432
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
   159
epoch
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
   160
    "answer the time when we start counting"
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
   161
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
   162
    ^ self new setSeconds:0
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
   163
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
   164
    "
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
   165
        Timestamp epoch
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
   166
        Time epoch
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
   167
    "
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
   168
!
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
   169
1227
e89b39909085 commentary & category changes
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
   170
now
e89b39909085 commentary & category changes
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
   171
    "return an instance of myself representing this moment."
e89b39909085 commentary & category changes
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
   172
1500
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
   173
    ^ self basicNew fromOSTime:(OperatingSystem getOSTime)
1227
e89b39909085 commentary & category changes
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
   174
e89b39909085 commentary & category changes
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
   175
    "
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   176
     Timestamp now   
1227
e89b39909085 commentary & category changes
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
   177
     Time now   
e89b39909085 commentary & category changes
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
   178
    "
e89b39909085 commentary & category changes
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
   179
1500
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
   180
    "Modified: 1.7.1996 / 15:20:10 / cg"
13233
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   181
!
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   182
16941
78358165ed6b class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 16934
diff changeset
   183
nowWithMilliseconds
78358165ed6b class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 16934
diff changeset
   184
    "return an instance of myself representing this moment."
78358165ed6b class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 16934
diff changeset
   185
78358165ed6b class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 16934
diff changeset
   186
    ^ self basicNew fromOSTimeWithMilliseconds:(OperatingSystem getOSTime)
78358165ed6b class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 16934
diff changeset
   187
78358165ed6b class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 16934
diff changeset
   188
    "
78358165ed6b class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 16934
diff changeset
   189
     Timestamp now   
78358165ed6b class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 16934
diff changeset
   190
     Time now
78358165ed6b class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 16934
diff changeset
   191
     Time nowWithMilliseconds
78358165ed6b class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 16934
diff changeset
   192
    "
78358165ed6b class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 16934
diff changeset
   193
78358165ed6b class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 16934
diff changeset
   194
    "Modified: 1.7.1996 / 15:20:10 / cg"
78358165ed6b class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 16934
diff changeset
   195
!
78358165ed6b class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 16934
diff changeset
   196
13233
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   197
utcNow
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   198
    "return an instance of myself representing this momentin the UTC timezone."
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   199
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   200
    ^ self subclassResponsibility
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   201
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   202
    "
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   203
     Timestamp utcNow   
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   204
     Timestamp utcNow
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   205
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   206
     Time now   
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   207
     Time utcNow   
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   208
    "
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   209
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   210
    "Modified: 1.7.1996 / 15:20:10 / cg"
1227
e89b39909085 commentary & category changes
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
   211
! !
e89b39909085 commentary & category changes
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
   212
7294
c4e6d095a150 category changes
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
   213
!AbstractTime class methodsFor:'Compatibility-Squeak'!
7007
9af8cc2f82a4 totalSeconds returns the number of seconds since 1.1.1901 now
penk
parents: 6888
diff changeset
   214
9432
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
   215
dateAndTimeFromSeconds:secondCount
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
   216
    "set date and time from seconds since 1901-01-01 00:00 UTC"
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
   217
9429
173bcd493d7c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 8586
diff changeset
   218
    |timestamp|
173bcd493d7c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 8586
diff changeset
   219
173bcd493d7c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 8586
diff changeset
   220
"   
173bcd493d7c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 8586
diff changeset
   221
    secondsBetween1901and1970 := 
9432
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
   222
        (Timestamp epoch asDate subtractDate:(Date day:1 month:1 year:1901))
9429
173bcd493d7c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 8586
diff changeset
   223
        *  (24 * 60 * 60)
173bcd493d7c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 8586
diff changeset
   224
"
173bcd493d7c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 8586
diff changeset
   225
9432
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
   226
    "stc cannot make large integers"
9449
6ba774be6aa1 stc can compile large integers!
Stefan Vogel <sv@exept.de>
parents: 9432
diff changeset
   227
    timestamp := Timestamp fromSeconds:secondCount - 2177452800.
7007
9af8cc2f82a4 totalSeconds returns the number of seconds since 1.1.1901 now
penk
parents: 6888
diff changeset
   228
    ^ Array
9429
173bcd493d7c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 8586
diff changeset
   229
        with: (timestamp asDate)
173bcd493d7c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 8586
diff changeset
   230
        with: (timestamp asTime)
1227
e89b39909085 commentary & category changes
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
   231
7007
9af8cc2f82a4 totalSeconds returns the number of seconds since 1.1.1901 now
penk
parents: 6888
diff changeset
   232
    "
9429
173bcd493d7c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 8586
diff changeset
   233
     Timestamp dateAndTimeFromSeconds: (Time primSecondsClock) 
7007
9af8cc2f82a4 totalSeconds returns the number of seconds since 1.1.1901 now
penk
parents: 6888
diff changeset
   234
     Time dateAndTimeFromSeconds: (Time totalSeconds) 
9af8cc2f82a4 totalSeconds returns the number of seconds since 1.1.1901 now
penk
parents: 6888
diff changeset
   235
     Date dateAndTimeFromSeconds: (Time totalSeconds)
9af8cc2f82a4 totalSeconds returns the number of seconds since 1.1.1901 now
penk
parents: 6888
diff changeset
   236
    "
9af8cc2f82a4 totalSeconds returns the number of seconds since 1.1.1901 now
penk
parents: 6888
diff changeset
   237
!
9af8cc2f82a4 totalSeconds returns the number of seconds since 1.1.1901 now
penk
parents: 6888
diff changeset
   238
11528
a617f1faef7f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11518
diff changeset
   239
milliseconds:msTime1 since:msTime2
a617f1faef7f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11518
diff changeset
   240
    "return the number of milliseconds between two
a617f1faef7f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11518
diff changeset
   241
     millisecond time values, compensating for roll-over.
a617f1faef7f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11518
diff changeset
   242
     The same as millisecondsBetween:and: for Squeak compatibility."
a617f1faef7f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11518
diff changeset
   243
a617f1faef7f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11518
diff changeset
   244
    ^ OperatingSystem millisecondTimeDeltaBetween:msTime1 and:msTime2
a617f1faef7f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11518
diff changeset
   245
!
a617f1faef7f *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11518
diff changeset
   246
9926
5bfe280953b9 *** empty log message ***
Michael Beyl <mb@exept.de>
parents: 9449
diff changeset
   247
millisecondsSince: lastTime
5bfe280953b9 *** empty log message ***
Michael Beyl <mb@exept.de>
parents: 9449
diff changeset
   248
        "Answer the elapsed time since last recorded in milliseconds.
5bfe280953b9 *** empty log message ***
Michael Beyl <mb@exept.de>
parents: 9449
diff changeset
   249
        Compensate for rollover."
5bfe280953b9 *** empty log message ***
Michael Beyl <mb@exept.de>
parents: 9449
diff changeset
   250
5bfe280953b9 *** empty log message ***
Michael Beyl <mb@exept.de>
parents: 9449
diff changeset
   251
        ^self milliseconds: self millisecondClockValue since: lastTime
5bfe280953b9 *** empty log message ***
Michael Beyl <mb@exept.de>
parents: 9449
diff changeset
   252
!
5bfe280953b9 *** empty log message ***
Michael Beyl <mb@exept.de>
parents: 9449
diff changeset
   253
7007
9af8cc2f82a4 totalSeconds returns the number of seconds since 1.1.1901 now
penk
parents: 6888
diff changeset
   254
primSecondsClock
9429
173bcd493d7c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 8586
diff changeset
   255
    "returns the number of seconds since 1.1.1901 UTC"
173bcd493d7c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 8586
diff changeset
   256
173bcd493d7c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 8586
diff changeset
   257
    ^ Timestamp now utcSecondsSince1901
1227
e89b39909085 commentary & category changes
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
   258
9429
173bcd493d7c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 8586
diff changeset
   259
    "                                                 
173bcd493d7c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 8586
diff changeset
   260
     Timestamp primSecondsClock 
173bcd493d7c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 8586
diff changeset
   261
    "
1227
e89b39909085 commentary & category changes
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
   262
! !
e89b39909085 commentary & category changes
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
   263
7294
c4e6d095a150 category changes
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
   264
!AbstractTime class methodsFor:'Compatibility-VW'!
7007
9af8cc2f82a4 totalSeconds returns the number of seconds since 1.1.1901 now
penk
parents: 6888
diff changeset
   265
9af8cc2f82a4 totalSeconds returns the number of seconds since 1.1.1901 now
penk
parents: 6888
diff changeset
   266
totalSeconds
9429
173bcd493d7c Fix for utc botch when retrieving seconds since 1901
Stefan Vogel <sv@exept.de>
parents: 8586
diff changeset
   267
    "returns the number of seconds since 1.1.1901 UTC"
7007
9af8cc2f82a4 totalSeconds returns the number of seconds since 1.1.1901 now
penk
parents: 6888
diff changeset
   268
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   269
    ^ Timestamp now utcSecondsSince1901
7007
9af8cc2f82a4 totalSeconds returns the number of seconds since 1.1.1901 now
penk
parents: 6888
diff changeset
   270
! !
9af8cc2f82a4 totalSeconds returns the number of seconds since 1.1.1901 now
penk
parents: 6888
diff changeset
   271
11130
fb6ebdb8c2a1 conversion errors
Claus Gittinger <cg@exept.de>
parents: 10907
diff changeset
   272
!AbstractTime class methodsFor:'error handling'!
fb6ebdb8c2a1 conversion errors
Claus Gittinger <cg@exept.de>
parents: 10907
diff changeset
   273
fb6ebdb8c2a1 conversion errors
Claus Gittinger <cg@exept.de>
parents: 10907
diff changeset
   274
conversionErrorSignal
fb6ebdb8c2a1 conversion errors
Claus Gittinger <cg@exept.de>
parents: 10907
diff changeset
   275
    "return the signal used for conversion error handling"
fb6ebdb8c2a1 conversion errors
Claus Gittinger <cg@exept.de>
parents: 10907
diff changeset
   276
fb6ebdb8c2a1 conversion errors
Claus Gittinger <cg@exept.de>
parents: 10907
diff changeset
   277
    ^ TimeConversionError
fb6ebdb8c2a1 conversion errors
Claus Gittinger <cg@exept.de>
parents: 10907
diff changeset
   278
! !
fb6ebdb8c2a1 conversion errors
Claus Gittinger <cg@exept.de>
parents: 10907
diff changeset
   279
13701
46009307d8e3 added: defaultFormatString
ca
parents: 13233
diff changeset
   280
!AbstractTime class methodsFor:'format strings'!
46009307d8e3 added: defaultFormatString
ca
parents: 13233
diff changeset
   281
46009307d8e3 added: defaultFormatString
ca
parents: 13233
diff changeset
   282
defaultFormatString
46009307d8e3 added: defaultFormatString
ca
parents: 13233
diff changeset
   283
    ^ '%h:%m:%s'
46009307d8e3 added: defaultFormatString
ca
parents: 13233
diff changeset
   284
! !
46009307d8e3 added: defaultFormatString
ca
parents: 13233
diff changeset
   285
7258
9ccdbee7d1ad method category rename
Claus Gittinger <cg@exept.de>
parents: 7010
diff changeset
   286
!AbstractTime class methodsFor:'private-instance creation'!
1227
e89b39909085 commentary & category changes
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
   287
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   288
fromOSTime:osTime
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   289
    "return a time, representing the time given by the operatingSystem time.
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   290
     Not meant for public use."
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   291
1500
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
   292
    ^ self basicNew fromOSTime:osTime.
418
claus
parents: 384
diff changeset
   293
1500
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
   294
    "Modified: 1.7.1996 / 15:09:54 / cg"
240
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
   295
!
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
   296
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   297
fromSeconds:seconds
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   298
    "return an instance that is constructed from seconds.
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   299
     This method is only allowed for second values as returned by
1227
e89b39909085 commentary & category changes
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
   300
     getSeconds, possibly adding/subtracting to that. 
e89b39909085 commentary & category changes
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
   301
     Never depend on any specific interpretation of the seconds,
e89b39909085 commentary & category changes
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
   302
     since it depends on how the OperatingSystem counts time
e89b39909085 commentary & category changes
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
   303
     (some start at 1900, others with 1970 ...)"
240
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
   304
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   305
   ^ self basicNew setSeconds:seconds
240
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
   306
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
   307
    "
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   308
     Time fromSeconds:0             should return midnight
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   309
     Timestamp fromSeconds:0     on UNIX: returns 1st. Jan 1970
1227
e89b39909085 commentary & category changes
Claus Gittinger <cg@exept.de>
parents: 699
diff changeset
   310
                                    on others: dont know
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   311
     (Timestamp day:1 month:1 year:1970 hour:1 minutes:0 seconds:0)
1500
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
   312
        getSeconds                  on UNIX: returns 0
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
   313
                                    on others: dont know
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   314
    "
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   315
1500
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
   316
    "Modified: 1.7.1996 / 13:39:30 / cg"
240
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
   317
! !
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
   318
2310
2cb1366e0eb3 Correct name: #secondDay --> #secondInDay.
Stefan Vogel <sv@exept.de>
parents: 1500
diff changeset
   319
!AbstractTime class methodsFor:'queries'!
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   320
15684
4c4bc53e32c8 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 14494
diff changeset
   321
microsecondClockValue
4c4bc53e32c8 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 14494
diff changeset
   322
    "return microseconds seconds of now"
4c4bc53e32c8 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 14494
diff changeset
   323
4c4bc53e32c8 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 14494
diff changeset
   324
    ^ OperatingSystem getMicrosecondTime
4c4bc53e32c8 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 14494
diff changeset
   325
4c4bc53e32c8 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 14494
diff changeset
   326
    "
4c4bc53e32c8 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 14494
diff changeset
   327
     Time microsecondClockValue
4c4bc53e32c8 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 14494
diff changeset
   328
    "
4c4bc53e32c8 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 14494
diff changeset
   329
4c4bc53e32c8 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 14494
diff changeset
   330
    "
4c4bc53e32c8 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 14494
diff changeset
   331
     |t1 t2 overhead|
4c4bc53e32c8 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 14494
diff changeset
   332
4c4bc53e32c8 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 14494
diff changeset
   333
     t1 := Time microsecondClockValue.
4c4bc53e32c8 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 14494
diff changeset
   334
     t2 := Time microsecondClockValue.
4c4bc53e32c8 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 14494
diff changeset
   335
     overhead := t2 - t1.  
4c4bc53e32c8 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 14494
diff changeset
   336
4c4bc53e32c8 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 14494
diff changeset
   337
     t1 := Time microsecondClockValue.
4c4bc53e32c8 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 14494
diff changeset
   338
     100 factorial.
4c4bc53e32c8 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 14494
diff changeset
   339
     t2 := Time microsecondClockValue.
4c4bc53e32c8 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 14494
diff changeset
   340
     t2 - t1 - overhead        
4c4bc53e32c8 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 14494
diff changeset
   341
    "
4c4bc53e32c8 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 14494
diff changeset
   342
!
4c4bc53e32c8 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 14494
diff changeset
   343
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   344
millisecondClockValue
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   345
    "return the millisecond clock - since this one overruns
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   346
     regularly, use the value only for short timing deltas.
5730
b377ec6357e7 comment
Claus Gittinger <cg@exept.de>
parents: 5573
diff changeset
   347
     Also remember that it wraps when comparing these values."
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   348
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   349
    ^ OperatingSystem getMillisecondTime.
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   350
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   351
    "
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   352
     Time millisecondClockValue 
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   353
    "
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   354
!
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   355
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   356
secondClock
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   357
    "return seconds of now - for GNU-ST compatibility"
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   358
1500
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
   359
    ^ OperatingSystem getOSTime // 1000
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   360
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   361
    "
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   362
     AbstractTime secondClock    
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   363
    "
1500
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
   364
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
   365
    "Modified: 1.7.1996 / 15:20:14 / cg"
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   366
! !
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   367
2310
2cb1366e0eb3 Correct name: #secondDay --> #secondInDay.
Stefan Vogel <sv@exept.de>
parents: 1500
diff changeset
   368
!AbstractTime class methodsFor:'timing evaluations'!
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   369
12831
97be4636cf07 added: #microsecondsToRun:
Stefan Vogel <sv@exept.de>
parents: 12662
diff changeset
   370
microsecondsToRun:aBlock
16673
38e6f4c80e3a fixed buggy copy pasta comment
az
parents: 16505
diff changeset
   371
    "evaluate the argument, aBlock; return the number of microseconds it took"
12831
97be4636cf07 added: #microsecondsToRun:
Stefan Vogel <sv@exept.de>
parents: 12662
diff changeset
   372
97be4636cf07 added: #microsecondsToRun:
Stefan Vogel <sv@exept.de>
parents: 12662
diff changeset
   373
    |startTime endTime|
97be4636cf07 added: #microsecondsToRun:
Stefan Vogel <sv@exept.de>
parents: 12662
diff changeset
   374
97be4636cf07 added: #microsecondsToRun:
Stefan Vogel <sv@exept.de>
parents: 12662
diff changeset
   375
    startTime := OperatingSystem getMicrosecondTime.
97be4636cf07 added: #microsecondsToRun:
Stefan Vogel <sv@exept.de>
parents: 12662
diff changeset
   376
    aBlock value.
97be4636cf07 added: #microsecondsToRun:
Stefan Vogel <sv@exept.de>
parents: 12662
diff changeset
   377
    endTime := OperatingSystem getMicrosecondTime.
97be4636cf07 added: #microsecondsToRun:
Stefan Vogel <sv@exept.de>
parents: 12662
diff changeset
   378
    ^ endTime - startTime
97be4636cf07 added: #microsecondsToRun:
Stefan Vogel <sv@exept.de>
parents: 12662
diff changeset
   379
97be4636cf07 added: #microsecondsToRun:
Stefan Vogel <sv@exept.de>
parents: 12662
diff changeset
   380
    "
97be4636cf07 added: #microsecondsToRun:
Stefan Vogel <sv@exept.de>
parents: 12662
diff changeset
   381
     Time microsecondsToRun:[1000 factorial]  
97be4636cf07 added: #microsecondsToRun:
Stefan Vogel <sv@exept.de>
parents: 12662
diff changeset
   382
    "
16673
38e6f4c80e3a fixed buggy copy pasta comment
az
parents: 16505
diff changeset
   383
38e6f4c80e3a fixed buggy copy pasta comment
az
parents: 16505
diff changeset
   384
    "Modified (comment): / 01-07-2014 / 15:57:13 / az"
12831
97be4636cf07 added: #microsecondsToRun:
Stefan Vogel <sv@exept.de>
parents: 12662
diff changeset
   385
!
97be4636cf07 added: #microsecondsToRun:
Stefan Vogel <sv@exept.de>
parents: 12662
diff changeset
   386
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   387
millisecondsToRun:aBlock
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   388
    "evaluate the argument, aBlock; return the number of milliseconds it took"
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   389
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   390
    |startTime endTime|
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   391
1476
02f69251f5bc checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   392
    startTime := OperatingSystem getMillisecondTime.
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   393
    aBlock value.
1476
02f69251f5bc checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   394
    endTime := OperatingSystem getMillisecondTime.
8586
a38e882affa5 take care of time-wrap in #millisecondsToRun:
Stefan Vogel <sv@exept.de>
parents: 8450
diff changeset
   395
    ^ self milliseconds:endTime since:startTime
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   396
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   397
    "
8586
a38e882affa5 take care of time-wrap in #millisecondsToRun:
Stefan Vogel <sv@exept.de>
parents: 8450
diff changeset
   398
     Time millisecondsToRun:[1000 factorial]  
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   399
    "
1476
02f69251f5bc checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   400
02f69251f5bc checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   401
    "Modified: 17.6.1996 / 16:57:37 / cg"
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   402
!
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   403
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   404
secondsToRun:aBlock
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   405
    "evaluate the argument, aBlock; return the number of seconds it took"
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   406
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   407
    |startTime endTime|
360
claus
parents: 275
diff changeset
   408
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   409
    startTime := self secondClock.
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   410
    aBlock value.
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   411
    endTime := self secondClock.
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   412
    ^ endTime - startTime
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   413
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   414
    "
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   415
     Time secondsToRun:[1000 factorial]  
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   416
    "
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   417
! !
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   418
7261
f35fc9cee675 method category rename
Claus Gittinger <cg@exept.de>
parents: 7258
diff changeset
   419
!AbstractTime methodsFor:'Compatibility-ANSI'!
6419
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   420
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   421
hour12
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   422
    "return the hour (1..12)."
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   423
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   424
    ^ self hours - 1 \\ 12 + 1.
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   425
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   426
    "
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   427
     Time now hour12   
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   428
     Time now hour24   
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   429
     (Time hours:0 minutes:0 seconds:0) hour24   
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   430
     (Time hours:0 minutes:0 seconds:0) hour12   
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   431
     (Time hours:1 minutes:0 seconds:0) hour24   
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   432
     (Time hours:1 minutes:0 seconds:0) hour12   
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   433
     (Time hours:12 minutes:0 seconds:0) hour24 
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   434
     (Time hours:12 minutes:0 seconds:0) hour12   
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   435
     (Time hours:13 minutes:0 seconds:0) hour24 
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   436
     (Time hours:13 minutes:0 seconds:0) hour12   
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   437
     (Time hours:23 minutes:0 seconds:0) hour24 
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   438
     (Time hours:23 minutes:0 seconds:0) hour12   
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   439
     (Time hours:24 minutes:0 seconds:0) hour24 
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   440
     (Time hours:24 minutes:0 seconds:0) hour12   
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   441
    "
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   442
!
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   443
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   444
hour24
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   445
    "return the hour (0..23)."
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   446
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   447
    ^ self hours
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   448
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   449
    "
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   450
     Time now hour12   
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   451
     Time now hour24   
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   452
     (Time hours:0 minutes:0 seconds:0) hour24 
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   453
     (Time hours:0 minutes:0 seconds:0) hour12 
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   454
     (Time hours:1 minutes:0 seconds:0) hour24 
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   455
     (Time hours:1 minutes:0 seconds:0) hour12 
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   456
     (Time hours:12 minutes:0 seconds:0) hour24 
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   457
     (Time hours:12 minutes:0 seconds:0) hour12 
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   458
     (Time hours:13 minutes:0 seconds:0) hour24 
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   459
     (Time hours:13 minutes:0 seconds:0) hour12 
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   460
     (Time hours:23 minutes:0 seconds:0) hour24 
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   461
     (Time hours:23 minutes:0 seconds:0) hour12 
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   462
     (Time hours:24 minutes:0 seconds:0) hour24 
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   463
     (Time hours:24 minutes:0 seconds:0) hour12 
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   464
    "
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   465
!
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   466
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   467
meridianAbbreviation
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   468
    "am/pm"
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   469
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   470
    self hours // 12 == 0 ifTrue:[
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   471
        ^ 'am'.
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   472
    ] ifFalse:[
8200
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
   473
        (self hours == 12 and:[self minutes == 0 and:[self seconds == 0]]) ifTrue:[
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
   474
            ^ 'noon'
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
   475
        ].
6419
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   476
        ^ 'pm'.
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   477
    ].
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   478
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   479
    "
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   480
     Time now meridianAbbreviation   
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   481
     (Time hours:0 minutes:0 seconds:0) meridianAbbreviation  
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   482
     (Time hours:11 minutes:59 seconds:59) meridianAbbreviation  
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   483
     (Time hours:12 minutes:0 seconds:0) meridianAbbreviation    
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   484
     (Time hours:12 minutes:0 seconds:1) meridianAbbreviation  
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   485
    "
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   486
! !
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
   487
6172
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   488
!AbstractTime methodsFor:'abstract'!
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   489
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   490
hours
8200
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
   491
    "return the hour of time (0..23)"
6172
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   492
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   493
    ^ self subclassResponsibility
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   494
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   495
    "
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   496
     Timestamp now hours 
6172
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   497
     Time now hours 
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   498
    "
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   499
!
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   500
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   501
milliseconds
8200
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
   502
    "return the milliseconds since the start of the second (0..999)"
6172
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   503
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   504
    ^ self subclassResponsibility
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   505
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   506
    "
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   507
     Timestamp now milliseconds 
6172
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   508
     Time now milliseconds 
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   509
    "
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   510
!
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   511
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   512
minutes
8200
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
   513
    "return the minutes since the start of the hour (0..59)"
6172
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   514
7672
46f206594db3 Category change
Stefan Vogel <sv@exept.de>
parents: 7327
diff changeset
   515
    ^ self subclassResponsibility.
6172
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   516
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   517
    "
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   518
     Timestamp now minutes 
6172
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   519
     Time now minutes 
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   520
    "
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   521
!
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   522
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   523
seconds
8200
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
   524
    "return the seconds since the start of the minute (0..59)"
6172
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   525
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   526
    ^ self subclassResponsibility
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   527
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   528
    "
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   529
     Timestamp now seconds. 
6172
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   530
     Time now seconds 
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   531
    "
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   532
! !
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   533
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   534
!AbstractTime methodsFor:'accessing'!
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   535
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   536
hourInDay
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   537
    "return the hours (0..23)"
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   538
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   539
    ^ self hours
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   540
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   541
    "
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   542
     Timestamp now hourInDay 
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   543
     Time now hourInDay 
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   544
    "
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   545
!
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   546
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   547
minuteInDay
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   548
    "return the minutes (0..59)"
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   549
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   550
    ^ self minutes.
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   551
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   552
    "
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   553
     Timestamp now minuteInDay 
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   554
     Time now minuteInDay 
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   555
    "
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   556
!
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   557
2310
2cb1366e0eb3 Correct name: #secondDay --> #secondInDay.
Stefan Vogel <sv@exept.de>
parents: 1500
diff changeset
   558
secondInDay
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   559
    "return the seconds (0..59)"
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   560
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   561
    ^ self seconds
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   562
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   563
    "
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   564
     Timestamp now secondInDay 
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   565
     Time now seconds 
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   566
    "
2310
2cb1366e0eb3 Correct name: #secondDay --> #secondInDay.
Stefan Vogel <sv@exept.de>
parents: 1500
diff changeset
   567
2cb1366e0eb3 Correct name: #secondDay --> #secondInDay.
Stefan Vogel <sv@exept.de>
parents: 1500
diff changeset
   568
    "Created: 22.10.1996 / 09:27:47 / stefan"
5548
eead51e4752e added #weekInYear query
Claus Gittinger <cg@exept.de>
parents: 5191
diff changeset
   569
!
eead51e4752e added #weekInYear query
Claus Gittinger <cg@exept.de>
parents: 5191
diff changeset
   570
6172
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   571
timeZoneDeltaInMinutes
9432
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
   572
    "answer the number of minutes between local time and utc time.
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
   573
     Delta is positive if local time is ahead of utc, negative if behind utc."
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
   574
6172
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   575
    ^ 0
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   576
!
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
   577
5968
4832ed93f0b4 preps for timeZone
Claus Gittinger <cg@exept.de>
parents: 5964
diff changeset
   578
timeZoneName
10485
959ce825c3b7 changed #timeZoneName
Stefan Vogel <sv@exept.de>
parents: 9926
diff changeset
   579
    ^ #utc
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   580
! !
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   581
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   582
!AbstractTime methodsFor:'arithmetic'!
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   583
10679
b4dd3412ce74 adding timeDurations to a timeStamp (double dispatch)
sr
parents: 10485
diff changeset
   584
+ aNumberOrTimeDuration
b4dd3412ce74 adding timeDurations to a timeStamp (double dispatch)
sr
parents: 10485
diff changeset
   585
    "Add aNumber numberOfSeconds or, if its a timeDuration, add its value"
8200
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
   586
10679
b4dd3412ce74 adding timeDurations to a timeStamp (double dispatch)
sr
parents: 10485
diff changeset
   587
    ^ aNumberOrTimeDuration sumFromTimestamp:self.
b4dd3412ce74 adding timeDurations to a timeStamp (double dispatch)
sr
parents: 10485
diff changeset
   588
b4dd3412ce74 adding timeDurations to a timeStamp (double dispatch)
sr
parents: 10485
diff changeset
   589
"/    ^ self species basicNew 
b4dd3412ce74 adding timeDurations to a timeStamp (double dispatch)
sr
parents: 10485
diff changeset
   590
"/        setMilliseconds:(self getMilliseconds + (aNumberOrTimeDuration * 1000) asInteger)
8200
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
   591
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
   592
    "
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   593
     Timestamp now to:(Timestamp now + 30) by:2 do:[:time|
8200
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
   594
        Transcript showCR:time.
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
   595
     ].
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
   596
10679
b4dd3412ce74 adding timeDurations to a timeStamp (double dispatch)
sr
parents: 10485
diff changeset
   597
     (Timestamp now + 20)  -  Timestamp now  
b4dd3412ce74 adding timeDurations to a timeStamp (double dispatch)
sr
parents: 10485
diff changeset
   598
     (Timestamp now + 0.5)  -  Timestamp now  
b4dd3412ce74 adding timeDurations to a timeStamp (double dispatch)
sr
parents: 10485
diff changeset
   599
     (Timestamp now + (TimeDuration fromString:'1m 10s'))  -  Timestamp now  
11771
1c6251b7286d comment
Claus Gittinger <cg@exept.de>
parents: 11528
diff changeset
   600
     (Timestamp now + (10 seconds))  -  Timestamp now  
8200
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
   601
    "
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
   602
!
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
   603
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
   604
- aTimeOrNumberOfSeconds
8244
06543e00260e comment
Claus Gittinger <cg@exept.de>
parents: 8200
diff changeset
   605
    "return the delta in seconds between 2 times or subtract a number of seconds."
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   606
11515
d467ba9dc495 double dispatch for subtract (time - time; time - nr)
sr
parents: 11130
diff changeset
   607
    ^ aTimeOrNumberOfSeconds differenceFromTimestamp:self.
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   608
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   609
    "
11518
8b4cafbd318a double dispatch for time-difference
sr
parents: 11515
diff changeset
   610
     Timestamp now - 3600.  
11515
d467ba9dc495 double dispatch for subtract (time - time; time - nr)
sr
parents: 11130
diff changeset
   611
     Time now - 3600.   
11518
8b4cafbd318a double dispatch for time-difference
sr
parents: 11515
diff changeset
   612
     (Time now addSeconds:10) - Time now   
11515
d467ba9dc495 double dispatch for subtract (time - time; time - nr)
sr
parents: 11130
diff changeset
   613
     (TimeDuration fromString:'1.5hr') - 3600.   
d467ba9dc495 double dispatch for subtract (time - time; time - nr)
sr
parents: 11130
diff changeset
   614
     (TimeDuration fromString:'1.5hr') - (TimeDuration fromString:'1hr')   
8200
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
   615
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   616
     |t1 t2|
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   617
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   618
     t1 := Timestamp now.
16407
67eeb7ae5eb8 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16365
diff changeset
   619
     Delay waitFor:10 seconds.
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   620
     t2 := Timestamp now.
3476
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   621
     Transcript showCR:('seconds passed: ' , (t2 - t1) printString).
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   622
    "
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   623
!
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   624
6048
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   625
addDays:numberOfDays
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   626
    "return a new instance of myself, numberOfDays afterwards."
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   627
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   628
    ^ self addSeconds:(numberOfDays * (60 * 60 * 24))
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   629
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   630
    "
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   631
     |t|
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   632
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   633
     t := Timestamp now.
6048
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   634
     Transcript showCR:t.
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   635
     Transcript showCR:(t addDays:7)
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   636
    "
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   637
!
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   638
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   639
addHours:numberOfHours
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   640
    "return a new instance of myself, numberOfHours afterwards."
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   641
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   642
    ^ self addSeconds:(numberOfHours * (60 * 60))
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   643
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   644
    "
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   645
     |t|
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   646
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   647
     t := Timestamp now.
3476
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   648
     Transcript showCR:t.
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   649
     Transcript showCR:(t addHours:12).
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   650
    "
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   651
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   652
    "
3476
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   653
     |t|
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   654
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   655
     t := Time now.
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   656
     Transcript showCR:t.
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   657
     Transcript showCR:(t addHours:12).
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   658
    "
6043
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   659
!
3476
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   660
6043
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   661
addMilliseconds:numberOfMilliSeconds
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   662
    "return a new instance of myself, numberOfMilliSeconds afterwards."
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   663
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   664
    ^ self species basicNew 
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   665
        setMilliseconds:(self getMilliseconds + numberOfMilliSeconds)
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   666
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   667
    "
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   668
     |t|
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   669
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   670
     t := Timestamp now.
6043
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   671
     Transcript showCR:t.
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   672
     Transcript showCR:(t addMilliseconds:100).
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   673
    "
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   674
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   675
    "
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   676
     |t|
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   677
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   678
     t := Time now.
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   679
     Transcript showCR:t.
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   680
     Transcript showCR:(t addMilliseconds:1000).
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   681
    "
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   682
!
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   683
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   684
addMinutes:numberOfMinutes
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   685
    "return a new instance of myself, numberOfMinutes afterwards."
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   686
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   687
    ^ self addSeconds:(numberOfMinutes * 60)
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   688
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   689
    "
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   690
     |t|
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   691
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   692
     t := Timestamp now.
3476
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   693
     Transcript showCR:t.
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   694
     Transcript showCR:(t addMinutes:60).
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   695
    "
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   696
3476
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   697
    "
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   698
     |t|
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   699
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   700
     t := Time now.
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   701
     Transcript showCR:t.
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   702
     Transcript showCR:(t addMinutes:60).
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   703
    "
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   704
!
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   705
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   706
addSeconds:numberOfSeconds
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   707
    "return a new instance of myself, numberOfSeconds afterwards."
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   708
3476
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   709
    ^ self species basicNew 
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   710
        setMilliseconds:(self getMilliseconds + (numberOfSeconds * 1000))
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   711
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   712
    "
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   713
     |t|
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   714
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   715
     t := Timestamp now.
3476
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   716
     Transcript showCR:t.
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   717
     Transcript showCR:(t addSeconds:60).
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   718
    "
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   719
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   720
    "
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   721
     |t|
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   722
3476
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   723
     t := Time now.
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   724
     Transcript showCR:t.
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   725
     Transcript showCR:(t addSeconds:60).
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   726
    "
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   727
!
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   728
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   729
addTime:timeAmount
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   730
    "return a new instance of myself, timeAmount seconds afterwards.
3476
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   731
     Provided for ST-80 compatibility.
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   732
     WARNING:
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   733
        AddTime is a bad name - it does not add a time, but expects
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   734
        a numberOfSeconds as argument. 
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   735
        Use any of addSeconds/addHours etc. to make things clear"
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   736
6888
d75cbe2e8ef7 addTime / subtractTime handle non-Number argument
Claus Gittinger <cg@exept.de>
parents: 6795
diff changeset
   737
    timeAmount isNumber ifFalse:[
d75cbe2e8ef7 addTime / subtractTime handle non-Number argument
Claus Gittinger <cg@exept.de>
parents: 6795
diff changeset
   738
        ^ self addSeconds:(timeAmount asSeconds).
d75cbe2e8ef7 addTime / subtractTime handle non-Number argument
Claus Gittinger <cg@exept.de>
parents: 6795
diff changeset
   739
    ].
3476
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   740
    ^ self addSeconds:timeAmount
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   741
!
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   742
16475
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   743
deltaFrom:aTimeOrInteger
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   744
    "return the delta as a timeDuration between 2 timeStamps.
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   745
     The argument is supposed to be BEFORE the receiver,
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   746
        computes self - aTimestamp"
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   747
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   748
    ^ aTimeOrInteger differenceFromTimestamp:self
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   749
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   750
    "
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   751
        Time now deltaFrom:10 minutes.
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   752
        Time now deltaFrom:3600.
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   753
        Time now deltaFrom:3600 seconds.
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   754
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   755
        Timestamp now deltaFrom:10 minutes.
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   756
        Timestamp now deltaFrom:3600.
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   757
        Timestamp now deltaFrom:3600 seconds.
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   758
    "
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   759
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   760
    "
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   761
     |t1 t2|
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   762
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   763
     t1 := Timestamp now.
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   764
     Delay waitForSeconds:0.5.
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   765
     t2 := Timestamp now.
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   766
     t2 deltaFrom:t1   
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   767
    "
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   768
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   769
    "Created: / 04-10-2007 / 13:34:28 / cg"
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   770
    "Modified: / 10-07-2010 / 09:37:01 / cg"
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   771
!
dd2e012601bf class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16407
diff changeset
   772
16505
c285d94f2248 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16475
diff changeset
   773
roundTo:aTimeDuration
c285d94f2248 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16475
diff changeset
   774
     ^ self class new setMilliseconds:(self getMilliseconds roundTo:aTimeDuration getMilliseconds)
c285d94f2248 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16475
diff changeset
   775
c285d94f2248 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16475
diff changeset
   776
    "
c285d94f2248 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16475
diff changeset
   777
      (TimeDuration fromMilliseconds:25234) roundTo:2 seconds
c285d94f2248 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16475
diff changeset
   778
      Time now roundTo:10 minutes
c285d94f2248 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16475
diff changeset
   779
      Timestamp now roundTo:10 minutes
c285d94f2248 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16475
diff changeset
   780
    "
c285d94f2248 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16475
diff changeset
   781
!
c285d94f2248 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16475
diff changeset
   782
6048
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   783
subtractDays:numberOfDays
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   784
    "return a new instance of myself, numberOfDays before."
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   785
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   786
    ^ self subtractSeconds:(numberOfDays * (60 * 60 * 24))
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   787
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   788
    "
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   789
     |t|
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   790
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   791
     t := Timestamp now.
6048
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   792
     Transcript showCR:t.
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   793
     Transcript showCR:(t subtractDays:50)
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   794
    "
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   795
!
af4b1127f362 refactored - some methods moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 6043
diff changeset
   796
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   797
subtractHours:numberOfHours
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   798
    "return a new instance of myself, numberOfHours before."
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   799
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   800
    ^ self subtractSeconds:(numberOfHours * (60 * 60))
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   801
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   802
    "
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   803
     |t|
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   804
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   805
     t := Timestamp now.
3476
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   806
     Transcript showCR:t.
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   807
     Transcript showCR:(t subtractHours:12).
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   808
    "
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   809
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   810
    "
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   811
     |t|
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   812
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   813
     t := Time now.
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   814
     Transcript showCR:t.
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   815
     Transcript showCR:(t subtractHours:12).
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   816
    "
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   817
!
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   818
6043
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   819
subtractMilliseconds:numberOfMilliSeconds
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   820
    "return a new instance of myself, numberOfMilliSeconds before."
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   821
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   822
    ^ self species basicNew 
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   823
        setMilliseconds:(self getMilliseconds - numberOfMilliSeconds)
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   824
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   825
    "
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   826
     |t|
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   827
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   828
     t := Timestamp now.
6043
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   829
     Transcript showCR:t.
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   830
     Transcript showCR:(t subtractMilliseconds:100).
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   831
    "
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   832
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   833
    "
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   834
     |t|
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   835
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   836
     t := Time now.
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   837
     Transcript showCR:t.
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   838
     Transcript showCR:(t subtractMilliseconds:1000).
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   839
    "
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   840
!
ee486429674b pushed up addMilliseconds/subtractMilliseconds
Claus Gittinger <cg@exept.de>
parents: 5968
diff changeset
   841
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   842
subtractMinutes:numberOfMinutes
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   843
    "return a new instance of myself, numberOfMinutes before."
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   844
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   845
    ^ self subtractSeconds:(numberOfMinutes * 60)
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   846
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   847
    "
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   848
     |t|
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   849
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   850
     t := Timestamp now.
3476
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   851
     Transcript showCR:t.
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   852
     Transcript showCR:(t subtractMinutes:60).
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   853
    "
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   854
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   855
    "
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   856
     |t|
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   857
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   858
     t := Time now.
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   859
     Transcript showCR:t.
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   860
     Transcript showCR:(t subtractMinutes:60).
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   861
    "
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   862
!
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   863
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   864
subtractSeconds:numberOfSeconds
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   865
    "return a new instance of myself, numberOfSeconds before."
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   866
3476
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   867
    ^ self species basicNew 
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   868
        setMilliseconds:(self getMilliseconds - (numberOfSeconds * 1000))
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   869
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   870
    "
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   871
     |t|
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   872
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   873
     t := Timestamp now.
3476
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   874
     Transcript showCR:t.
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   875
     Transcript showCR:(t subtractSeconds:60).
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   876
    "
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   877
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   878
    "
3476
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   879
     |t|
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   880
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   881
     t := Time now.
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   882
     Transcript showCR:t.
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   883
     Transcript showCR:(t subtractSeconds:60).
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   884
    "
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   885
!
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   886
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   887
subtractTime:timeAmount
3476
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   888
    "return a new instance of myself, timeAmount seconds before myself.
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   889
     Provided for ST-80 compatibility.
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   890
     WARNING:
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   891
        SubtractTime is a bad name - it does not add a time, but expects
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   892
        a numberOfSeconds as argument. 
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   893
        Use any of addSeconds/addHours etc. to make things clear"
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   894
6888
d75cbe2e8ef7 addTime / subtractTime handle non-Number argument
Claus Gittinger <cg@exept.de>
parents: 6795
diff changeset
   895
    timeAmount isNumber ifFalse:[
d75cbe2e8ef7 addTime / subtractTime handle non-Number argument
Claus Gittinger <cg@exept.de>
parents: 6795
diff changeset
   896
        ^ self subtractSeconds:(timeAmount asSeconds).
d75cbe2e8ef7 addTime / subtractTime handle non-Number argument
Claus Gittinger <cg@exept.de>
parents: 6795
diff changeset
   897
    ].
3476
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   898
    ^ self subtractSeconds:timeAmount
f2ebb76a952d dont loose milliseconds when adding seconds to a Timestamp.
Claus Gittinger <cg@exept.de>
parents: 2310
diff changeset
   899
16505
c285d94f2248 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16475
diff changeset
   900
!
c285d94f2248 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16475
diff changeset
   901
c285d94f2248 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16475
diff changeset
   902
truncateTo:aTimeDuration
c285d94f2248 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16475
diff changeset
   903
     ^ self class new setMilliseconds:(self getMilliseconds truncateTo:aTimeDuration getMilliseconds)
c285d94f2248 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16475
diff changeset
   904
c285d94f2248 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16475
diff changeset
   905
    "
c285d94f2248 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16475
diff changeset
   906
      (TimeDuration fromMilliseconds:25234) truncateTo:2 seconds
c285d94f2248 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16475
diff changeset
   907
      Time now truncateTo:10 minutes
c285d94f2248 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16475
diff changeset
   908
      Timestamp now truncateTo:10 minutes
c285d94f2248 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16475
diff changeset
   909
    "
275
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   910
! !
a76029ddaa98 *** empty log message ***
claus
parents: 240
diff changeset
   911
5573
efd0dc6578ac #-, #< and #> moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 5548
diff changeset
   912
!AbstractTime methodsFor:'comparing'!
efd0dc6578ac #-, #< and #> moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 5548
diff changeset
   913
efd0dc6578ac #-, #< and #> moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 5548
diff changeset
   914
< aTime
efd0dc6578ac #-, #< and #> moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 5548
diff changeset
   915
    "return true if the receiver is before the argument"
efd0dc6578ac #-, #< and #> moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 5548
diff changeset
   916
efd0dc6578ac #-, #< and #> moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 5548
diff changeset
   917
    ^ self getMilliseconds < aTime getMilliseconds
efd0dc6578ac #-, #< and #> moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 5548
diff changeset
   918
efd0dc6578ac #-, #< and #> moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 5548
diff changeset
   919
    "Modified: 3.7.1996 / 13:10:17 / cg"
efd0dc6578ac #-, #< and #> moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 5548
diff changeset
   920
!
efd0dc6578ac #-, #< and #> moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 5548
diff changeset
   921
efd0dc6578ac #-, #< and #> moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 5548
diff changeset
   922
> aTime
efd0dc6578ac #-, #< and #> moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 5548
diff changeset
   923
    "return true if the receiver is after the argument"
efd0dc6578ac #-, #< and #> moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 5548
diff changeset
   924
efd0dc6578ac #-, #< and #> moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 5548
diff changeset
   925
    ^ self getMilliseconds > aTime getMilliseconds
efd0dc6578ac #-, #< and #> moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 5548
diff changeset
   926
efd0dc6578ac #-, #< and #> moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 5548
diff changeset
   927
    "Modified: 1.7.1996 / 15:24:38 / cg"
efd0dc6578ac #-, #< and #> moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 5548
diff changeset
   928
! !
efd0dc6578ac #-, #< and #> moved from AbsoluteTime
Claus Gittinger <cg@exept.de>
parents: 5548
diff changeset
   929
8200
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
   930
!AbstractTime methodsFor:'converting'!
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
   931
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
   932
asAbsoluteTime
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   933
    "deprecated, use #asTimestamp"
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   934
    <resource:#obsolete>
8200
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
   935
12002
3ecffb2d77ad *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11772
diff changeset
   936
    self obsoleteMethodWarning:'use #asTimestamp'.
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   937
    ^ self asTimestamp
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   938
!
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   939
13233
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   940
asLocalTimestamp
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   941
    "represent myself as a timestamp in the local timezone"
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   942
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   943
    ^ self subclassResponsibility
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   944
!
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   945
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
   946
asTimestamp
13233
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   947
    "represent myself as a Timestamp"
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   948
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   949
    ^ self subclassResponsibility
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   950
!
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   951
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   952
asUtcTimestamp
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   953
    "represent myself as a timestamp in the local timezone"
Stefan Vogel <sv@exept.de>
parents: 13175
diff changeset
   954
8200
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
   955
    ^ self subclassResponsibility
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
   956
! !
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
   957
11518
8b4cafbd318a double dispatch for time-difference
sr
parents: 11515
diff changeset
   958
!AbstractTime methodsFor:'double dispatching'!
8b4cafbd318a double dispatch for time-difference
sr
parents: 11515
diff changeset
   959
8b4cafbd318a double dispatch for time-difference
sr
parents: 11515
diff changeset
   960
differenceFromTimestamp:aTimestamp
16365
7255d544da96 class: TimeDuration
Claus Gittinger <cg@exept.de>
parents: 15684
diff changeset
   961
    "/ the correct thing to do (and I will, in the future) is to
7255d544da96 class: TimeDuration
Claus Gittinger <cg@exept.de>
parents: 15684
diff changeset
   962
    "/ return a TimeDuration:
7255d544da96 class: TimeDuration
Claus Gittinger <cg@exept.de>
parents: 15684
diff changeset
   963
    "/
16934
2a4639715b07 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 16926
diff changeset
   964
    ^ TimeDuration fromMilliseconds:(aTimestamp getMilliseconds - self getMilliseconds).
16407
67eeb7ae5eb8 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16365
diff changeset
   965
16365
7255d544da96 class: TimeDuration
Claus Gittinger <cg@exept.de>
parents: 15684
diff changeset
   966
    "/ which is the same as: deltaFrom:aTimestamp
7255d544da96 class: TimeDuration
Claus Gittinger <cg@exept.de>
parents: 15684
diff changeset
   967
    "/
7255d544da96 class: TimeDuration
Claus Gittinger <cg@exept.de>
parents: 15684
diff changeset
   968
    "/ however, there might be old code around, which is not be prepared for
7255d544da96 class: TimeDuration
Claus Gittinger <cg@exept.de>
parents: 15684
diff changeset
   969
    "/ getting a non-number (the seconds). Therefore, for the meantime,
7255d544da96 class: TimeDuration
Claus Gittinger <cg@exept.de>
parents: 15684
diff changeset
   970
    "/ we return:
7255d544da96 class: TimeDuration
Claus Gittinger <cg@exept.de>
parents: 15684
diff changeset
   971
7255d544da96 class: TimeDuration
Claus Gittinger <cg@exept.de>
parents: 15684
diff changeset
   972
    "/ ^ aTimestamp getSeconds - self getSeconds
11518
8b4cafbd318a double dispatch for time-difference
sr
parents: 11515
diff changeset
   973
! !
8b4cafbd318a double dispatch for time-difference
sr
parents: 11515
diff changeset
   974
4649
3eaf75dd8973 Move printOn:format: to AbstractTime
Stefan Vogel <sv@exept.de>
parents: 3476
diff changeset
   975
!AbstractTime methodsFor:'printing & storing'!
3eaf75dd8973 Move printOn:format: to AbstractTime
Stefan Vogel <sv@exept.de>
parents: 3476
diff changeset
   976
16829
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
   977
addBasicPrintBindingsTo:aDictionary language:languageOrNil
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
   978
    "private print support: add bindings for printing to aDictionary.
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
   979
     languageOrNil can be #en, #fr, #de or nil for the current language.
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
   980
     Here only basic bindings are added - no timezone am am/pm stuff,
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
   981
     which doesn't make sense for TimeDuration.
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
   982
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
   983
     bindings:
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
   984
        %h      hours, 00..23 (i.e. european)  0-padded to length 2
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
   985
        %m      minutes, 00..59                0-padded to length 2
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
   986
        %s      seconds, 00..59                0-padded to length 2
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
   987
        %i      milliseconds, 000..999         0-padded to length 3
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
   988
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
   989
     Timestamp only:
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
   990
        %(day)   day, 00..31                    0-padded to length 2
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
   991
        %(month) month, 00..12                  0-padded to length 2
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
   992
        %(year)  year, 4 digits                 0-padded to length 4
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
   993
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
   994
     special:
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
   995
        %H      24-hours - unpadded
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
   996
        %M      minutes - unpadded
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
   997
        %S      seconds - unpadded
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
   998
        %I      milliseconds, unpadded
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
   999
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1000
        %t      seconds within hour  (unpadded)
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1001
        %T      seconds from midNight  (unpadded)
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1002
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1003
        %(milli1) milliseconds, truncated to 1/10th of a second 0..9         
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1004
        %(milli2) milliseconds, truncated to 1/100th of a second 00..99 0-padded to length 2        
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1005
        %(milli3) milliseconds, same as %i for convenience
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1006
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1007
     Timestamp only:
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1008
        %(Day)         - day - unpadded                    
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1009
        %(Month)       - month - unpadded                    
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1010
        %(yearOrTime)  - year or time 5 digits    as in unix-ls:
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1011
                                                  year if it is not the current year;
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1012
                                                  time otherwise
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1013
        %(weekDay)      - day in week (1->monday, 2->tuesday, ... ,7->sunday)
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1014
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1015
        %(dayName)      - full day name     
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1016
        %(DayName)      - full day name, first character uppercase      
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1017
        %(DAYNAME)      - full day name, all uppercase       
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1018
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1019
        %(monthName)    - full month name     
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1020
        %(MonthName)    - full month name, first character uppercase      
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1021
        %(MONTHNAME)    - full month name, all uppercase       
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1022
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1023
        %(shortDayName) - short (abbreviated) day name     
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1024
        %(ShortDayName) - short (abbreviated) day name, first character uppercase      
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1025
        %(SHORTDAYNAME) - short (abbreviated) day name, all uppercase       
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1026
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1027
        %(shortMonthName) - short (abbreviated) month name     
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1028
        %(ShortMonthName) - short (abbreviated) month name, first character uppercase      
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1029
        %(SHORTMONTHNAME) - short (abbreviated) month name, all uppercase       
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1030
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1031
        %(nth)          - counting day-in-month (1->'st'; 2->'nd'; 3->'rd'; 4...->'th')      
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1032
        %(weekDayNth)   - counting day-in-week (1->'st'; 2->'nd'; 3->'rd'; 4...->'th')      
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1033
        %(weekNth)      - counting week-in-year (1->'st'; 2->'nd'; 3->'rd'; 4...->'th')
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1034
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1035
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1036
     The ISO8601 printString are generated with:
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1037
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1038
       Year:
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1039
          YYYY (eg 1997)
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1040
                Date today printStringFormat:'%(year)'
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1041
                Timestamp now printStringFormat:'%(year)'  
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1042
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1043
       Year and month:
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1044
          YYYY-MM (eg 1997-07)
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1045
                Date today printStringFormat:'%(year)-%(month)'  
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1046
                Timestamp now printStringFormat:'%(year)-%(month)'  
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1047
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1048
       Complete date:
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1049
          YYYY-MM-DD (eg 1997-07-16)
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1050
                Date today printStringFormat:'%(year)-%(month)-%(day)'    
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1051
                Timestamp now printStringFormat:'%(year)-%(month)-%(day)'  
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1052
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1053
       Complete date plus hours and minutes:
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1054
          YYYY-MM-DDThh:mmTZD (eg 1997-07-16T19:20+01:00)
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1055
                Timestamp now printStringFormat:'%(year)-%(month)-%(day)T%h:%m%(TZD)'  
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1056
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1057
       Complete date plus hours, minutes and seconds:
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1058
          YYYY-MM-DDThh:mm:ssTZD (eg 1997-07-16T19:20:30+01:00)
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1059
                Timestamp now printStringFormat:'%(year)-%(month)-%(day)T%h:%m:%s%(TZD)'  
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1060
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1061
       Complete date plus hours, minutes, seconds and a decimal fraction of a second
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1062
          YYYY-MM-DDThh:mm:ss.sTZD (eg 1997-07-16T19:20:30.45+01:00)
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1063
                Timestamp now printStringFormat:'%(year)-%(month)-%(day)T%h:%m:%s.%(milli2)%(TZD)'  
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1064
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1065
    "
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1066
16926
755f4c452bf4 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 16829
diff changeset
  1067
    |time hours minutes seconds millis s t|
16829
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1068
16926
755f4c452bf4 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 16829
diff changeset
  1069
    time := self asTime.
755f4c452bf4 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 16829
diff changeset
  1070
    hours := time hours.
755f4c452bf4 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 16829
diff changeset
  1071
    minutes := time minutes.
755f4c452bf4 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 16829
diff changeset
  1072
    seconds := time seconds.
16829
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1073
    millis := self milliseconds.
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1074
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1075
    aDictionary at:$H put:(s := hours printString).
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1076
    aDictionary at:$h put:(s leftPaddedTo:2 with:$0).
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1077
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1078
    aDictionary at:$M put:(s := minutes printString).
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1079
    aDictionary at:$m put:(s leftPaddedTo:2 with:$0).
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1080
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1081
    aDictionary at:$S put:(s := seconds printString).
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1082
    aDictionary at:$s put:(s leftPaddedTo:2 with:$0).
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1083
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1084
    aDictionary at:$I put:(s := millis printString).
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1085
    aDictionary at:$i put:(t := s leftPaddedTo:3 with:$0).
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1086
    aDictionary at:#milli3 put:t.
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1087
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1088
    aDictionary at:#milli1 put:((millis // 100) printString).
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1089
    aDictionary at:#milli2 put:((millis // 10) printStringLeftPaddedTo:2 with:$0).
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1090
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1091
    aDictionary at:$t put:(seconds * minutes) printString.
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1092
    aDictionary at:$T put:(seconds * minutes * hours) printString.
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1093
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1094
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1095
    "
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1096
      |dict|
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1097
      dict := Dictionary new.
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1098
      Timestamp now addBasicPrintBindingsTo:dict language:#en.
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1099
      dict inspect
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1100
    "
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1101
!
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1102
4844
6938f0df31f7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4841
diff changeset
  1103
addPrintBindingsTo:aDictionary
16829
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1104
    <resource: #obsolete>
8111
67347b7e3e69 print bindings (care for language specifics)
Claus Gittinger <cg@exept.de>
parents: 7672
diff changeset
  1105
16829
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1106
    self obsoleteMethodWarning:'use #addPrintBindingsTo:language:'.
8111
67347b7e3e69 print bindings (care for language specifics)
Claus Gittinger <cg@exept.de>
parents: 7672
diff changeset
  1107
    self addPrintBindingsTo:aDictionary language:nil
67347b7e3e69 print bindings (care for language specifics)
Claus Gittinger <cg@exept.de>
parents: 7672
diff changeset
  1108
!
67347b7e3e69 print bindings (care for language specifics)
Claus Gittinger <cg@exept.de>
parents: 7672
diff changeset
  1109
67347b7e3e69 print bindings (care for language specifics)
Claus Gittinger <cg@exept.de>
parents: 7672
diff changeset
  1110
addPrintBindingsTo:aDictionary language:languageOrNil
67347b7e3e69 print bindings (care for language specifics)
Claus Gittinger <cg@exept.de>
parents: 7672
diff changeset
  1111
    "private print support: add bindings for printing to aDictionary.
13175
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1112
     languageOrNil can be #en, #fr, #de or nil for the current language.
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1113
11772
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1114
     bindings:
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1115
        %h      hours, 00..23 (i.e. european)  0-padded to length 2
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1116
        %u      hours, 00..12 (i.e. us)        0-padded to length 2
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1117
        %m      minutes, 00..59                0-padded to length 2
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1118
        %s      seconds, 00..59                0-padded to length 2
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1119
        %i      milliseconds, 000..999         0-padded to length 3
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1120
        %a      am/pm
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1121
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1122
     Timestamp only:
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1123
        %(day)   day, 00..31                    0-padded to length 2
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1124
        %(month) month, 00..12                  0-padded to length 2
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1125
        %(year)  year, 4 digits                 0-padded to length 4
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1126
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1127
     special:
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1128
        %H      24-hours - unpadded
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1129
        %U      12-hours - unpadded
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1130
        %M      minutes - unpadded
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1131
        %S      seconds - unpadded
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1132
        %I      milliseconds, unpadded
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1133
        %A      AM/PM   - uppercase
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1134
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1135
        %t      seconds within hour  (unpadded)
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1136
        %T      seconds from midNight  (unpadded)
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1137
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1138
        %(TZD)  timeZone delta from UTC in the format +/-hh:mm  
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1139
13175
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1140
        %(milli1) milliseconds, truncated to 1/10th of a second 0..9         
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1141
        %(milli2) milliseconds, truncated to 1/100th of a second 00..99 0-padded to length 2        
14493
0a3c9081d40a changed: #addPrintBindingsTo:language:
Claus Gittinger <cg@exept.de>
parents: 13701
diff changeset
  1142
        %(milli3) milliseconds, same as %i for convenience
11772
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1143
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1144
     Timestamp only:
13175
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1145
        %(Day)         - day - unpadded                    
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1146
        %(Month)       - month - unpadded                    
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1147
        %(yearOrTime)  - year or time 5 digits    as in unix-ls:
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1148
                                                  year if it is not the current year;
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1149
                                                  time otherwise
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1150
        %(weekDay)      - day in week (1->monday, 2->tuesday, ... ,7->sunday)
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1151
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1152
        %(dayName)      - full day name     
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1153
        %(DayName)      - full day name, first character uppercase      
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1154
        %(DAYNAME)      - full day name, all uppercase       
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1155
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1156
        %(monthName)    - full month name     
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1157
        %(MonthName)    - full month name, first character uppercase      
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1158
        %(MONTHNAME)    - full month name, all uppercase       
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1159
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1160
        %(shortDayName) - short (abbreviated) day name     
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1161
        %(ShortDayName) - short (abbreviated) day name, first character uppercase      
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1162
        %(SHORTDAYNAME) - short (abbreviated) day name, all uppercase       
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1163
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1164
        %(shortMonthName) - short (abbreviated) month name     
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1165
        %(ShortMonthName) - short (abbreviated) month name, first character uppercase      
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1166
        %(SHORTMONTHNAME) - short (abbreviated) month name, all uppercase       
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1167
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1168
        %(nth)          - counting day-in-month (1->'st'; 2->'nd'; 3->'rd'; 4...->'th')      
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1169
        %(weekDayNth)   - counting day-in-week (1->'st'; 2->'nd'; 3->'rd'; 4...->'th')      
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1170
        %(weekNth)      - counting week-in-year (1->'st'; 2->'nd'; 3->'rd'; 4...->'th')
11772
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1171
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1172
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1173
     The ISO8601 printString are generated with:
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1174
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1175
       Year:
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1176
          YYYY (eg 1997)
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1177
                Date today printStringFormat:'%(year)'
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1178
                Timestamp now printStringFormat:'%(year)'  
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1179
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1180
       Year and month:
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1181
          YYYY-MM (eg 1997-07)
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1182
                Date today printStringFormat:'%(year)-%(month)'  
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1183
                Timestamp now printStringFormat:'%(year)-%(month)'  
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1184
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1185
       Complete date:
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1186
          YYYY-MM-DD (eg 1997-07-16)
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1187
                Date today printStringFormat:'%(year)-%(month)-%(day)'    
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1188
                Timestamp now printStringFormat:'%(year)-%(month)-%(day)'  
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1189
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1190
       Complete date plus hours and minutes:
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1191
          YYYY-MM-DDThh:mmTZD (eg 1997-07-16T19:20+01:00)
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1192
                Timestamp now printStringFormat:'%(year)-%(month)-%(day)T%h:%m%(TZD)'  
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1193
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1194
       Complete date plus hours, minutes and seconds:
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1195
          YYYY-MM-DDThh:mm:ssTZD (eg 1997-07-16T19:20:30+01:00)
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1196
                Timestamp now printStringFormat:'%(year)-%(month)-%(day)T%h:%m:%s%(TZD)'  
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1197
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1198
       Complete date plus hours, minutes, seconds and a decimal fraction of a second
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1199
          YYYY-MM-DDThh:mm:ss.sTZD (eg 1997-07-16T19:20:30.45+01:00)
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1200
                Timestamp now printStringFormat:'%(year)-%(month)-%(day)T%h:%m:%s.%(milli2)%(TZD)'  
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1201
a220d63dfc64 comment
Claus Gittinger <cg@exept.de>
parents: 11771
diff changeset
  1202
    "
4844
6938f0df31f7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4841
diff changeset
  1203
16829
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1204
    |usHours ampm s zone tzDelta|
4844
6938f0df31f7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4841
diff changeset
  1205
16829
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1206
    self addBasicPrintBindingsTo:aDictionary language:languageOrNil.
5968
4832ed93f0b4 preps for timeZone
Claus Gittinger <cg@exept.de>
parents: 5964
diff changeset
  1207
    zone := self timeZoneName.
6172
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
  1208
    tzDelta := self timeZoneDeltaInMinutes.
4844
6938f0df31f7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4841
diff changeset
  1209
6419
5cf00f5e656d more ANSI compatibility
Claus Gittinger <cg@exept.de>
parents: 6172
diff changeset
  1210
    ampm := self meridianAbbreviation.
16829
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1211
    usHours := self hour12 printString.
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1212
    aDictionary at:$U put:usHours.
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1213
    aDictionary at:$u put:(usHours leftPaddedTo:2 with:$0).
14493
0a3c9081d40a changed: #addPrintBindingsTo:language:
Claus Gittinger <cg@exept.de>
parents: 13701
diff changeset
  1214
0a3c9081d40a changed: #addPrintBindingsTo:language:
Claus Gittinger <cg@exept.de>
parents: 13701
diff changeset
  1215
12662
a19b835e49a0 changed: #addPrintBindingsTo:language:
sr
parents: 12660
diff changeset
  1216
    aDictionary at:$a put:ampm.
a19b835e49a0 changed: #addPrintBindingsTo:language:
sr
parents: 12660
diff changeset
  1217
    aDictionary at:$A put:ampm asUppercase.
a19b835e49a0 changed: #addPrintBindingsTo:language:
sr
parents: 12660
diff changeset
  1218
    aDictionary at:$z put:zone.
a19b835e49a0 changed: #addPrintBindingsTo:language:
sr
parents: 12660
diff changeset
  1219
    aDictionary at:$Z put:zone asUppercase.
6172
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
  1220
9432
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
  1221
    tzDelta == 0 ifTrue:[
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
  1222
        s := 'Z'.
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
  1223
    ] ifFalse:[
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
  1224
        s := tzDelta < 0 ifTrue:[ '-' ] ifFalse:[ '+' ].
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
  1225
        tzDelta := tzDelta abs.
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
  1226
        s := s  , ((tzDelta // 60) printStringLeftPaddedTo:2 with:$0), 
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
  1227
            ':' , ((tzDelta \\ 60) printStringLeftPaddedTo:2 with:$0).
79e9c3e9bb75 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 9429
diff changeset
  1228
    ].
6172
a3c88ea5efe9 comment and iso8601 (time/date formats) fixes
Claus Gittinger <cg@exept.de>
parents: 6048
diff changeset
  1229
    aDictionary at:#TZD put:s
13082
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1230
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1231
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1232
    "
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1233
      |dict|
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1234
      dict := Dictionary new.
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1235
      Timestamp now addPrintBindingsTo:dict language:#en.
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1236
      dict inspect
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1237
    "
4844
6938f0df31f7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4841
diff changeset
  1238
!
6938f0df31f7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4841
diff changeset
  1239
4649
3eaf75dd8973 Move printOn:format: to AbstractTime
Stefan Vogel <sv@exept.de>
parents: 3476
diff changeset
  1240
printOn:aStream format:aFormatString
3eaf75dd8973 Move printOn:format: to AbstractTime
Stefan Vogel <sv@exept.de>
parents: 3476
diff changeset
  1241
    "print using a format string;
13175
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1242
     See #addPrintBindingsTo:language: for allowed format strings"
7327
ab17eb5f11a6 printFormat
Claus Gittinger <cg@exept.de>
parents: 7294
diff changeset
  1243
13175
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1244
    self printOn:aStream format:aFormatString language:nil.
10907
8b98ba82a46f Now printStringXXXX uses printOn:XXXX.
Stefan Vogel <sv@exept.de>
parents: 10770
diff changeset
  1245
8b98ba82a46f Now printStringXXXX uses printOn:XXXX.
Stefan Vogel <sv@exept.de>
parents: 10770
diff changeset
  1246
    "
8b98ba82a46f Now printStringXXXX uses printOn:XXXX.
Stefan Vogel <sv@exept.de>
parents: 10770
diff changeset
  1247
     Timestamp now printOn:Transcript format:'%h:%m:%s'   . Transcript cr.      
8b98ba82a46f Now printStringXXXX uses printOn:XXXX.
Stefan Vogel <sv@exept.de>
parents: 10770
diff changeset
  1248
     Time now printOn:Transcript format:'%h:%m:%s'   . Transcript cr.      
8b98ba82a46f Now printStringXXXX uses printOn:XXXX.
Stefan Vogel <sv@exept.de>
parents: 10770
diff changeset
  1249
     Time now printOn:Transcript format:'%H:%m:%s'   . Transcript cr.      
8b98ba82a46f Now printStringXXXX uses printOn:XXXX.
Stefan Vogel <sv@exept.de>
parents: 10770
diff changeset
  1250
     Time now printOn:Transcript format:'%u:%m:%s %a'. Transcript cr.   
8b98ba82a46f Now printStringXXXX uses printOn:XXXX.
Stefan Vogel <sv@exept.de>
parents: 10770
diff changeset
  1251
     Time now printOn:Transcript format:'%h:%m'      . Transcript cr. 
8b98ba82a46f Now printStringXXXX uses printOn:XXXX.
Stefan Vogel <sv@exept.de>
parents: 10770
diff changeset
  1252
     Time now printOn:Transcript format:'%H:%m %A'   . Transcript cr.
8b98ba82a46f Now printStringXXXX uses printOn:XXXX.
Stefan Vogel <sv@exept.de>
parents: 10770
diff changeset
  1253
     Time now printOn:Transcript format:'minutes:%M seconds:%S'. Transcript cr.
8b98ba82a46f Now printStringXXXX uses printOn:XXXX.
Stefan Vogel <sv@exept.de>
parents: 10770
diff changeset
  1254
    "
8b98ba82a46f Now printStringXXXX uses printOn:XXXX.
Stefan Vogel <sv@exept.de>
parents: 10770
diff changeset
  1255
8b98ba82a46f Now printStringXXXX uses printOn:XXXX.
Stefan Vogel <sv@exept.de>
parents: 10770
diff changeset
  1256
    "Modified: 22.2.1996 / 16:58:30 / cg"
8b98ba82a46f Now printStringXXXX uses printOn:XXXX.
Stefan Vogel <sv@exept.de>
parents: 10770
diff changeset
  1257
!
8b98ba82a46f Now printStringXXXX uses printOn:XXXX.
Stefan Vogel <sv@exept.de>
parents: 10770
diff changeset
  1258
13082
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1259
printOn:aStream format:aFormatString language:languageString
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1260
    "print using a format string;
13175
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1261
     See #addPrintBindingsTo:language: for allowed format strings"
13082
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1262
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1263
    |dict|
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1264
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1265
    dict := IdentityDictionary new.
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1266
    self addPrintBindingsTo:dict language:languageString.
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1267
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1268
    aFormatString expandPlaceholdersWith:dict on:aStream
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1269
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1270
    "
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1271
     Timestamp now printOn:Transcript format:'%h:%m:%s'   . Transcript cr.      
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1272
     Time now printOn:Transcript format:'%h:%m:%s'   . Transcript cr.      
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1273
     Time now printOn:Transcript format:'%H:%m:%s'   . Transcript cr.      
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1274
     Time now printOn:Transcript format:'%u:%m:%s %a'. Transcript cr.   
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1275
     Time now printOn:Transcript format:'%h:%m'      . Transcript cr. 
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1276
     Time now printOn:Transcript format:'%H:%m %A'   . Transcript cr.
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1277
     Time now printOn:Transcript format:'minutes:%M seconds:%S'. Transcript cr.
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1278
    "
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1279
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1280
    "Modified: 22.2.1996 / 16:58:30 / cg"
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1281
!
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1282
10907
8b98ba82a46f Now printStringXXXX uses printOn:XXXX.
Stefan Vogel <sv@exept.de>
parents: 10770
diff changeset
  1283
printStringFormat:aFormatString
13175
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1284
    "print using a format string.
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1285
     See #addPrintBindingsTo:language: for allowed format strings"
10907
8b98ba82a46f Now printStringXXXX uses printOn:XXXX.
Stefan Vogel <sv@exept.de>
parents: 10770
diff changeset
  1286
13175
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1287
    ^ self printStringFormat:aFormatString language:nil.
4649
3eaf75dd8973 Move printOn:format: to AbstractTime
Stefan Vogel <sv@exept.de>
parents: 3476
diff changeset
  1288
3eaf75dd8973 Move printOn:format: to AbstractTime
Stefan Vogel <sv@exept.de>
parents: 3476
diff changeset
  1289
    "
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
  1290
     Timestamp now printStringFormat:'%U:%m:%s %a'   
4649
3eaf75dd8973 Move printOn:format: to AbstractTime
Stefan Vogel <sv@exept.de>
parents: 3476
diff changeset
  1291
     Time now printStringFormat:'%U:%m:%s %a'   
3eaf75dd8973 Move printOn:format: to AbstractTime
Stefan Vogel <sv@exept.de>
parents: 3476
diff changeset
  1292
4844
6938f0df31f7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4841
diff changeset
  1293
     Time now printStringFormat:'%h:%m:%s'      
4649
3eaf75dd8973 Move printOn:format: to AbstractTime
Stefan Vogel <sv@exept.de>
parents: 3476
diff changeset
  1294
     Time now printStringFormat:'%H:%m:%s'      
4844
6938f0df31f7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4841
diff changeset
  1295
     Time now printStringFormat:'%H:%m:%s.%i'           
8256
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
  1296
     Timestamp now printStringFormat:'%H:%m:%s.%i'   
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
  1297
     Timestamp now printStringFormat:'%H:%m:%s.%(milli1)'   
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
  1298
     Timestamp now printStringFormat:'%H:%m:%s.%(milli2)'     
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
  1299
     Timestamp now printStringFormat:'%(day)-%(month)-%(year) :%m:%s'       
4c3d944ef85a Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8244
diff changeset
  1300
     Timestamp now printStringFormat:'%(day)-%(monthName)-%(year) :%m:%s'       
4649
3eaf75dd8973 Move printOn:format: to AbstractTime
Stefan Vogel <sv@exept.de>
parents: 3476
diff changeset
  1301
     Time now printStringFormat:'%u:%m:%s %a'   
3eaf75dd8973 Move printOn:format: to AbstractTime
Stefan Vogel <sv@exept.de>
parents: 3476
diff changeset
  1302
     Time now printStringFormat:'%h:%m'         
4844
6938f0df31f7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4841
diff changeset
  1303
     Time now printStringFormat:'%h:%m'         
4649
3eaf75dd8973 Move printOn:format: to AbstractTime
Stefan Vogel <sv@exept.de>
parents: 3476
diff changeset
  1304
     Time now printStringFormat:'%H:%m %A'     
3eaf75dd8973 Move printOn:format: to AbstractTime
Stefan Vogel <sv@exept.de>
parents: 3476
diff changeset
  1305
     Time now printStringFormat:'%m minutes after %U %a'     
3eaf75dd8973 Move printOn:format: to AbstractTime
Stefan Vogel <sv@exept.de>
parents: 3476
diff changeset
  1306
     Time now printStringFormat:'%t seconds after %U %a'     
3eaf75dd8973 Move printOn:format: to AbstractTime
Stefan Vogel <sv@exept.de>
parents: 3476
diff changeset
  1307
     Time now printStringFormat:'%T seconds from midNight'     
3eaf75dd8973 Move printOn:format: to AbstractTime
Stefan Vogel <sv@exept.de>
parents: 3476
diff changeset
  1308
    "
3eaf75dd8973 Move printOn:format: to AbstractTime
Stefan Vogel <sv@exept.de>
parents: 3476
diff changeset
  1309
3eaf75dd8973 Move printOn:format: to AbstractTime
Stefan Vogel <sv@exept.de>
parents: 3476
diff changeset
  1310
    "Modified: 22.2.1996 / 16:58:30 / cg"
13082
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1311
!
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1312
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1313
printStringFormat:aFormatString language:languageString
13175
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1314
    "print using a format string.
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1315
     See #addPrintBindingsTo:language: for allowed format strings"
13082
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1316
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1317
    |s|
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1318
16829
2b434f626099 class: AbstractTime
Stefan Vogel <sv@exept.de>
parents: 16673
diff changeset
  1319
    s := CharacterWriteStream on:(String new:20).
13082
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1320
    self printOn:s format:aFormatString language:languageString.
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1321
    ^ s contents.
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1322
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1323
    "
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1324
     Timestamp now printStringFormat:'%U:%m:%s %a  
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1325
     Time now printStringFormat:'%U:%m:%s %a'   
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1326
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1327
     Time now printStringFormat:'%h:%m:%s'      
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1328
     Time now printStringFormat:'%H:%m:%s'      
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1329
     Time now printStringFormat:'%H:%m:%s.%i'           
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1330
     Timestamp now printStringFormat:'%H:%m:%s.%i'   
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1331
     Timestamp now printStringFormat:'%H:%m:%s.%(milli1)'   
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1332
     Timestamp now printStringFormat:'%H:%m:%s.%(milli2)'     
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1333
     Timestamp now printStringFormat:'%(day)-%(month)-%(year) :%m:%s'       
13175
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1334
     Timestamp now printStringFormat:'%(day)-%(monthName)-%(year) :%m:%s' language:#en      
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1335
     Timestamp now printStringFormat:'%(day)-%(monthName)-%(year) :%m:%s' language:#de      
ea7102cce519 comment/format in:
Stefan Vogel <sv@exept.de>
parents: 13082
diff changeset
  1336
     Timestamp now printStringFormat:'%(day)-%(monthName)-%(year) :%m:%s' language:#fr      
13082
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1337
     Time now printStringFormat:'%u:%m:%s %a'   
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1338
     Time now printStringFormat:'%h:%m'         
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1339
     Time now printStringFormat:'%h:%m'         
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1340
     Time now printStringFormat:'%H:%m %A'     
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1341
     Time now printStringFormat:'%m minutes after %U %a'     
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1342
     Time now printStringFormat:'%t seconds after %U %a'     
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1343
     Time now printStringFormat:'%T seconds from midNight'     
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1344
    "
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1345
Stefan Vogel <sv@exept.de>
parents: 13026
diff changeset
  1346
    "Modified: 22.2.1996 / 16:58:30 / cg"
4649
3eaf75dd8973 Move printOn:format: to AbstractTime
Stefan Vogel <sv@exept.de>
parents: 3476
diff changeset
  1347
! !
3eaf75dd8973 Move printOn:format: to AbstractTime
Stefan Vogel <sv@exept.de>
parents: 3476
diff changeset
  1348
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1349
!AbstractTime methodsFor:'private'!
240
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
  1350
1500
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
  1351
fromOSTime:osTime
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1352
    "set my time, from operatingSystems time parts"
240
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
  1353
1500
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
  1354
    ^ self subclassResponsibility
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
  1355
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
  1356
    "Modified: 1.7.1996 / 15:09:44 / cg"
240
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
  1357
!
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
  1358
1500
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
  1359
getMilliseconds
8200
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
  1360
    "get the milliseconds since some point of time in the past.
1500
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
  1361
     Since I am abstract (not knowing how the time is actually
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
  1362
     represented), this must be done by a concrete class."
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
  1363
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
  1364
    ^ self subclassResponsibility
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
  1365
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
  1366
    "Created: 1.7.1996 / 14:16:49 / cg"
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
  1367
!
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
  1368
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1369
getSeconds
8200
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
  1370
    "get the seconds since some point of time in the past.
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1371
     Since I am abstract (not knowing how the time is actually
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1372
     represented), this must be done by a concrete class."
240
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
  1373
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1374
    ^ self subclassResponsibility
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1375
!
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1376
1500
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
  1377
setMilliseconds:millis
8200
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
  1378
    "set the milliseconds since some point of time in the past.
1500
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
  1379
     Since I am abstract (not knowing how the time is actually
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
  1380
     represented), this must be done by a concrete class."
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
  1381
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
  1382
    ^ self subclassResponsibility
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
  1383
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
  1384
    "Created: 1.7.1996 / 14:17:00 / cg"
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
  1385
!
d42e61e53cee changed osTime to a largeInt, which includes the milliseconds
Claus Gittinger <cg@exept.de>
parents: 1476
diff changeset
  1386
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1387
setSeconds:secs
8200
d443d3c8ce40 More arithmethic.
Stefan Vogel <sv@exept.de>
parents: 8111
diff changeset
  1388
    "set the seconds since some point of time in the past.
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1389
     Since I am abstract (not knowing how the time is actually
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1390
     represented), this must be done by a concrete class."
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1391
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1392
    ^ self subclassResponsibility
240
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
  1393
! !
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
  1394
2310
2cb1366e0eb3 Correct name: #secondDay --> #secondInDay.
Stefan Vogel <sv@exept.de>
parents: 1500
diff changeset
  1395
!AbstractTime class methodsFor:'documentation'!
240
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
  1396
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1397
version
16941
78358165ed6b class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 16934
diff changeset
  1398
    ^ '$Header: /cvs/stx/stx/libbasic/AbstractTime.st,v 1.86 2014-11-06 16:54:42 cg Exp $'
12660
518ee2523071 changed: #addPrintBindingsTo:language:
sr
parents: 12002
diff changeset
  1399
!
518ee2523071 changed: #addPrintBindingsTo:language:
sr
parents: 12002
diff changeset
  1400
518ee2523071 changed: #addPrintBindingsTo:language:
sr
parents: 12002
diff changeset
  1401
version_CVS
16941
78358165ed6b class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 16934
diff changeset
  1402
    ^ '$Header: /cvs/stx/stx/libbasic/AbstractTime.st,v 1.86 2014-11-06 16:54:42 cg Exp $'
240
f5ff68fffb92 Initial revision
claus
parents:
diff changeset
  1403
! !
15684
4c4bc53e32c8 class: AbstractTime
Claus Gittinger <cg@exept.de>
parents: 14494
diff changeset
  1404