Time.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Mon, 20 Dec 2010 07:13:27 +0000
branchjv
changeset 17814 b75a7f0c346b
parent 17807 06cc6c49e291
child 17815 956b46750806
permissions -rw-r--r--
Merged with /trunk
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
     1
"
5
67342904af11 *** empty log message ***
claus
parents: 3
diff changeset
     2
 COPYRIGHT (c) 1989 by Claus Gittinger
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
     3
	      All Rights Reserved
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
     4
a27a279701f8 Initial revision
claus
parents:
diff changeset
     5
 This software is furnished under a license and may be used
a27a279701f8 Initial revision
claus
parents:
diff changeset
     6
 only in accordance with the terms of that license and with the
a27a279701f8 Initial revision
claus
parents:
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
a27a279701f8 Initial revision
claus
parents:
diff changeset
     8
 be provided or otherwise made available to, or used by, any
a27a279701f8 Initial revision
claus
parents:
diff changeset
     9
 other person.  No title to or ownership of the software is
a27a279701f8 Initial revision
claus
parents:
diff changeset
    10
 hereby transferred.
a27a279701f8 Initial revision
claus
parents:
diff changeset
    11
"
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
    12
"{ Package: 'stx:libbasic' }"
5390
5a7c0581cfce comment changes
Claus Gittinger <cg@exept.de>
parents: 4999
diff changeset
    13
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
    14
AbstractTime subclass:#Time
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
    15
	instanceVariableNames:'timeEncoding'
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
    16
	classVariableNames:''
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
    17
	poolDictionaries:''
7672
46f206594db3 Category change
Stefan Vogel <sv@exept.de>
parents: 7513
diff changeset
    18
	category:'Magnitude-Time'
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    19
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
    20
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
    21
!Time class methodsFor:'documentation'!
88
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    22
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    23
copyright
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    24
"
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    25
 COPYRIGHT (c) 1989 by Claus Gittinger
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
    26
	      All Rights Reserved
88
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    27
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    28
 This software is furnished under a license and may be used
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    29
 only in accordance with the terms of that license and with the
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    30
 inclusion of the above copyright notice.   This software may not
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    31
 be provided or otherwise made available to, or used by, any
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    32
 other person.  No title to or ownership of the software is
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    33
 hereby transferred.
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    34
"
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    35
!
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    36
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    37
documentation
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    38
"
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    39
    Instances of time represent a particular time-of-day.
409
claus
parents: 394
diff changeset
    40
    Since they only store hours, minutes and seconds within a day,
claus
parents: 394
diff changeset
    41
    they cannot be used to compare times across midnight 
claus
parents: 394
diff changeset
    42
    (i.e. they should not be used as timeStamps).
1228
127d990e2f77 commentary
Claus Gittinger <cg@exept.de>
parents: 993
diff changeset
    43
8249
bdcae1232e6d Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8231
diff changeset
    44
    Use instances of Timestamp (and read the comment there) to do this.
241
6f30be88e314 *** empty log message ***
claus
parents: 239
diff changeset
    45
6f30be88e314 *** empty log message ***
claus
parents: 239
diff changeset
    46
    Examples:
1228
127d990e2f77 commentary
Claus Gittinger <cg@exept.de>
parents: 993
diff changeset
    47
        |t|
241
6f30be88e314 *** empty log message ***
claus
parents: 239
diff changeset
    48
1228
127d990e2f77 commentary
Claus Gittinger <cg@exept.de>
parents: 993
diff changeset
    49
        t := Time now.
1422
9a0b792f2953 showCr: -> showCR:
Claus Gittinger <cg@exept.de>
parents: 1302
diff changeset
    50
        Transcript showCR:t.
241
6f30be88e314 *** empty log message ***
claus
parents: 239
diff changeset
    51
6f30be88e314 *** empty log message ***
claus
parents: 239
diff changeset
    52
1228
127d990e2f77 commentary
Claus Gittinger <cg@exept.de>
parents: 993
diff changeset
    53
        |t1 t2|
241
6f30be88e314 *** empty log message ***
claus
parents: 239
diff changeset
    54
1228
127d990e2f77 commentary
Claus Gittinger <cg@exept.de>
parents: 993
diff changeset
    55
        t1 := Time now.
127d990e2f77 commentary
Claus Gittinger <cg@exept.de>
parents: 993
diff changeset
    56
        (Delay forSeconds:10) wait.
127d990e2f77 commentary
Claus Gittinger <cg@exept.de>
parents: 993
diff changeset
    57
        t2 := Time now.
127d990e2f77 commentary
Claus Gittinger <cg@exept.de>
parents: 993
diff changeset
    58
        t2 - t1   
1295
83f594f05c52 documentation
Claus Gittinger <cg@exept.de>
parents: 1228
diff changeset
    59
83f594f05c52 documentation
Claus Gittinger <cg@exept.de>
parents: 1228
diff changeset
    60
    [author:]
83f594f05c52 documentation
Claus Gittinger <cg@exept.de>
parents: 1228
diff changeset
    61
        Claus Gittinger
83f594f05c52 documentation
Claus Gittinger <cg@exept.de>
parents: 1228
diff changeset
    62
83f594f05c52 documentation
Claus Gittinger <cg@exept.de>
parents: 1228
diff changeset
    63
    [see also:]
8249
bdcae1232e6d Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8231
diff changeset
    64
        Date Timestamp AbstractTime OperatingSystem
1295
83f594f05c52 documentation
Claus Gittinger <cg@exept.de>
parents: 1228
diff changeset
    65
        Filename
88
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    66
"
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    67
! !
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    68
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
    69
!Time class methodsFor:'instance creation'!
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
    70
8749
2efa8ed1f9f4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8249
diff changeset
    71
hour:h minute:m
2efa8ed1f9f4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8249
diff changeset
    72
    "compatibility"
2efa8ed1f9f4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8249
diff changeset
    73
2efa8ed1f9f4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8249
diff changeset
    74
    ^ self hours:h minutes:m seconds:0
2efa8ed1f9f4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8249
diff changeset
    75
2efa8ed1f9f4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8249
diff changeset
    76
    "
2efa8ed1f9f4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8249
diff changeset
    77
     Time hour:2 minute:33 
2efa8ed1f9f4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8249
diff changeset
    78
    "
2efa8ed1f9f4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8249
diff changeset
    79
!
2efa8ed1f9f4 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8249
diff changeset
    80
7818
30eb2226645b +hour:minute:second:
Claus Gittinger <cg@exept.de>
parents: 7817
diff changeset
    81
hour:h minute:m second:s
30eb2226645b +hour:minute:second:
Claus Gittinger <cg@exept.de>
parents: 7817
diff changeset
    82
    "compatibility"
30eb2226645b +hour:minute:second:
Claus Gittinger <cg@exept.de>
parents: 7817
diff changeset
    83
30eb2226645b +hour:minute:second:
Claus Gittinger <cg@exept.de>
parents: 7817
diff changeset
    84
    ^ self hours:h minutes:m seconds:s
30eb2226645b +hour:minute:second:
Claus Gittinger <cg@exept.de>
parents: 7817
diff changeset
    85
30eb2226645b +hour:minute:second:
Claus Gittinger <cg@exept.de>
parents: 7817
diff changeset
    86
    "
30eb2226645b +hour:minute:second:
Claus Gittinger <cg@exept.de>
parents: 7817
diff changeset
    87
     Time hour:2 minute:33 second:0 
30eb2226645b +hour:minute:second:
Claus Gittinger <cg@exept.de>
parents: 7817
diff changeset
    88
    "
30eb2226645b +hour:minute:second:
Claus Gittinger <cg@exept.de>
parents: 7817
diff changeset
    89
!
30eb2226645b +hour:minute:second:
Claus Gittinger <cg@exept.de>
parents: 7817
diff changeset
    90
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
    91
hour:h minutes:m seconds:s
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
    92
    "return an instance of Time representing the given time.
8249
bdcae1232e6d Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8231
diff changeset
    93
     See also Time now / Date today / Timestamp now.
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
    94
     Obsolete: please use #hours:minutes:seconds:"
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
    95
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
    96
    <resource:#obsolete>
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
    97
9061
20af48b9b295 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8994
diff changeset
    98
    self obsoleteMethodWarning:'use #hours:minutes:seconds:'.
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
    99
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   100
    ^ self hours:h minutes:m seconds:s
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   101
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   102
    "
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   103
     Time hours:2 minutes:33 seconds:0 
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   104
     Time hours:0 minutes:0 seconds:0 
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   105
     Time hours:24 minutes:0 seconds:0 
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   106
     Time hours23 minutes:59 seconds:59 
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   107
    "
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   108
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   109
    "Modified: 19.4.1996 / 15:32:40 / cg"
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   110
!
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   111
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   112
hours:h minutes:m seconds:s
4031
de8ae1bf2827 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3995
diff changeset
   113
    "return an instance of Time representing the given time.
8249
bdcae1232e6d Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8231
diff changeset
   114
     See also Time now / Date today / Timestamp now."
4031
de8ae1bf2827 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3995
diff changeset
   115
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   116
    ^ self basicNew setHours:h minutes:m seconds:s
4031
de8ae1bf2827 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3995
diff changeset
   117
de8ae1bf2827 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3995
diff changeset
   118
    "
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   119
     Time hours:2 minutes:33 seconds:0 
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   120
     Time hours:0 minutes:0 seconds:0 
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   121
     Time hours:24 minutes:0 seconds:0 
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   122
     Time hours:23 minutes:59 seconds:59 
95
d22739a0c6e9 *** empty log message ***
claus
parents: 88
diff changeset
   123
    "
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   124
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   125
    "Modified: 19.4.1996 / 15:32:40 / cg"
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   126
!
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   127
7293
f042dd09afd3 +midnight
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
   128
midnight
f042dd09afd3 +midnight
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
   129
    "Answer a new instance at midnight."
f042dd09afd3 +midnight
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
   130
f042dd09afd3 +midnight
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
   131
    ^self fromSeconds: 0
f042dd09afd3 +midnight
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
   132
f042dd09afd3 +midnight
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
   133
    "
f042dd09afd3 +midnight
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
   134
     Time midnight
f042dd09afd3 +midnight
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
   135
    "
f042dd09afd3 +midnight
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
   136
!
f042dd09afd3 +midnight
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
   137
f042dd09afd3 +midnight
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
   138
noon
f042dd09afd3 +midnight
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
   139
    "Answer a new instance at noon."
f042dd09afd3 +midnight
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
   140
f042dd09afd3 +midnight
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
   141
    ^self fromSeconds: 43200 "12*60*60"
f042dd09afd3 +midnight
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
   142
f042dd09afd3 +midnight
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
   143
    "
f042dd09afd3 +midnight
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
   144
     Time noon
f042dd09afd3 +midnight
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
   145
    "
f042dd09afd3 +midnight
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
   146
!
f042dd09afd3 +midnight
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
   147
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   148
readFrom:aStringOrStream onError:exceptionBlock
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   149
    "return a new Time, reading a printed representation from aStream.
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   150
     If no am/pm follows the time, the string is interpreted as 
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   151
     either 24 hour format or being am."
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   152
6624
886265eff14c #readFrom:onError: - avoid block creation
Stefan Vogel <sv@exept.de>
parents: 6467
diff changeset
   153
    ^ [
11308
fa79c438bb34 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11151
diff changeset
   154
        |str hour min sec peekC|
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   155
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   156
        str := aStringOrStream readStream.
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   157
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   158
        hour := Integer readFrom:str.
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   159
        (hour between:0 and:24) ifFalse:[^ exceptionBlock value].
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   160
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   161
        min := 0.
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   162
        sec := 0.
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   163
        str atEnd ifFalse:[
11308
fa79c438bb34 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11151
diff changeset
   164
            peekC := str peek.
fa79c438bb34 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11151
diff changeset
   165
            (peekC == $:) ifTrue:[
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   166
                str next.
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   167
                min := Integer readFrom:str.
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   168
                (min between:0 and:59) ifFalse:[^ exceptionBlock value].
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   169
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   170
                (str peek == $:) ifTrue:[
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   171
                    str next.
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   172
                    sec := Integer readFrom:str.
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   173
                    (sec between:0 and:59) ifFalse:[^ exceptionBlock value].
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   174
                ].
11308
fa79c438bb34 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11151
diff changeset
   175
                peekC := str peek.
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   176
            ].
11308
fa79c438bb34 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11151
diff changeset
   177
            [peekC == Character space] whileTrue:[str next. peekC := str peek].
fa79c438bb34 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11151
diff changeset
   178
            (peekC == $p or:[peekC == $P]) ifTrue:[
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   179
                str next.
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   180
                (str peek == $m or:[str peek == $M]) ifTrue:[
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   181
                    str next
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   182
                ].
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   183
                (hour <= 0 or:[hour > 12]) ifTrue:[^ exceptionBlock value].
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   184
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   185
                "pm"
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   186
                hour ~~ 12 ifTrue:[
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   187
                    hour := hour + 12
11308
fa79c438bb34 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11151
diff changeset
   188
                ].
fa79c438bb34 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11151
diff changeset
   189
                peekC := str peek
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   190
            ] ifFalse:[
11308
fa79c438bb34 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11151
diff changeset
   191
                (peekC == $a or:[peekC == $A]) ifTrue:[
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   192
                    str next.
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   193
                    (str peek == $m or:[str peek == $M]) ifTrue:[
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   194
                        str next
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   195
                    ].
7240
341d1ac49d42 Handle 12:10 am correct when reading times.
Stefan Vogel <sv@exept.de>
parents: 7118
diff changeset
   196
                    hour == 12 ifTrue:[
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   197
                        hour := 0.
7240
341d1ac49d42 Handle 12:10 am correct when reading times.
Stefan Vogel <sv@exept.de>
parents: 7118
diff changeset
   198
                    ].
341d1ac49d42 Handle 12:10 am correct when reading times.
Stefan Vogel <sv@exept.de>
parents: 7118
diff changeset
   199
                    hour > 12 ifTrue:[^ exceptionBlock value].
11308
fa79c438bb34 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11151
diff changeset
   200
                    peekC := str peek
fa79c438bb34 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11151
diff changeset
   201
                ] ifFalse:[
17728
bbc5fa73dfab Merged with trunk r10466
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   202
                    "/ cg: dont be too picky here - we do not care, what comes after the
bbc5fa73dfab Merged with trunk r10466
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   203
                    "/ time string. (Needed to be able to read rfc822 strings where a timezone
bbc5fa73dfab Merged with trunk r10466
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   204
                    "/ follows (-/+0700 GMT, for example)
bbc5fa73dfab Merged with trunk r10466
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   205
"/                    peekC notNil ifTrue:[
bbc5fa73dfab Merged with trunk r10466
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   206
"/                        peekC isSeparator ifFalse:[^ exceptionBlock value].
bbc5fa73dfab Merged with trunk r10466
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17711
diff changeset
   207
"/                    ]
11308
fa79c438bb34 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11151
diff changeset
   208
                ].
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   209
            ]
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   210
        ].
6624
886265eff14c #readFrom:onError: - avoid block creation
Stefan Vogel <sv@exept.de>
parents: 6467
diff changeset
   211
        self basicNew setHours:hour minutes:min seconds:sec
886265eff14c #readFrom:onError: - avoid block creation
Stefan Vogel <sv@exept.de>
parents: 6467
diff changeset
   212
    ] on:Error do:exceptionBlock.
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   213
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   214
    "
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   215
     Time readFrom:'0:00'     
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   216
     Time readFrom:'2:00'     
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   217
     Time readFrom:'12:00'    
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   218
     Time readFrom:'14:00'    
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   219
     Time readFrom:'23:00'    
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   220
     Time readFrom:'24:00'    
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   221
     Time readFrom:'2:30 am'    
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   222
     Time readFrom:'2:30 pm'    
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   223
     Time readFrom:'14'    
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   224
     Time readFrom:'2 am'    
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   225
     Time readFrom:'2 pm'    
7240
341d1ac49d42 Handle 12:10 am correct when reading times.
Stefan Vogel <sv@exept.de>
parents: 7118
diff changeset
   226
     Time readFrom:'12:05 pm'    
341d1ac49d42 Handle 12:10 am correct when reading times.
Stefan Vogel <sv@exept.de>
parents: 7118
diff changeset
   227
     Time readFrom:'12:06 am'    
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   228
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   229
     Time readFrom:'18:22:00'    
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   230
     Time readFrom:'14:00:11'    
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   231
     Time readFrom:'7:00:11'     
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   232
     Time readFrom:'24:00:00'     
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   233
     Time readFrom:'0:00:00'     
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   234
     Time readFrom:'12:00:00'     
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   235
     Time readFrom:'0:00:00'     
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   236
     Time readFrom:'6:22:00 pm'   
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   237
     Time readFrom:'2:00:11 pm'  
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   238
     Time readFrom:'7:00:11 am'  
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   239
     Time readFrom:'12:00:00 am'  
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   240
     Time readFrom:'0:00:00 am'  
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   241
     Time readFrom:'24:00:00 am'  
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   242
     Time readFrom:'12:00:00 pm'  
6624
886265eff14c #readFrom:onError: - avoid block creation
Stefan Vogel <sv@exept.de>
parents: 6467
diff changeset
   243
     Time readFrom:'0:00:00 pm' onError:'invalid'
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   244
     Time readFrom:'24:00:00 pm'  
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   245
    "
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   246
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   247
    "Modified: 8.10.1996 / 19:32:11 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   248
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   249
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   250
!Time class methodsFor:'format strings'!
4411
684a2b944463 much improved formatting (see #printOn:format:)
Claus Gittinger <cg@exept.de>
parents: 4392
diff changeset
   251
684a2b944463 much improved formatting (see #printOn:format:)
Claus Gittinger <cg@exept.de>
parents: 4392
diff changeset
   252
formatString12us
684a2b944463 much improved formatting (see #printOn:format:)
Claus Gittinger <cg@exept.de>
parents: 4392
diff changeset
   253
    "return the format string used to format US times (and other areas)"
684a2b944463 much improved formatting (see #printOn:format:)
Claus Gittinger <cg@exept.de>
parents: 4392
diff changeset
   254
8231
0006aff04952 12 hour time (am/pm uppercase)
ca
parents: 8199
diff changeset
   255
    ^ '%u:%m:%s %A'
4411
684a2b944463 much improved formatting (see #printOn:format:)
Claus Gittinger <cg@exept.de>
parents: 4392
diff changeset
   256
!
684a2b944463 much improved formatting (see #printOn:format:)
Claus Gittinger <cg@exept.de>
parents: 4392
diff changeset
   257
684a2b944463 much improved formatting (see #printOn:format:)
Claus Gittinger <cg@exept.de>
parents: 4392
diff changeset
   258
formatString24
8231
0006aff04952 12 hour time (am/pm uppercase)
ca
parents: 8199
diff changeset
   259
    "return the format string used to format non US times"
4411
684a2b944463 much improved formatting (see #printOn:format:)
Claus Gittinger <cg@exept.de>
parents: 4392
diff changeset
   260
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   261
    ^ '%h:%m:%s'
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   262
! !
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   263
7261
f35fc9cee675 method category rename
Claus Gittinger <cg@exept.de>
parents: 7240
diff changeset
   264
!Time methodsFor:'Compatibility-Squeak'!
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   265
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   266
intervalString
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   267
    "Treat the time as a difference.  
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   268
     Give it in hours and minutes with two digits of accuracy."
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   269
6467
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   270
    |hours minutes seconds hh mm ss s|
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   271
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   272
    hours := self hours.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   273
    minutes := self minutes.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   274
    seconds := self seconds.
6467
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   275
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   276
    hours = 0   
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   277
        ifTrue: [hh := ''] 
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   278
        ifFalse: [
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   279
            hh := hours printString, ' hour'.
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   280
            hours > 1 ifTrue:[
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   281
                hh := hh , 's'
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   282
            ]
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   283
        ].
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   284
    minutes = 0 
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   285
        ifTrue: [mm := ''] 
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   286
        ifFalse: [
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   287
            mm := minutes printString, ' minute'.
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   288
            minutes > 1 ifTrue:[
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   289
                mm := mm , 's'
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   290
            ]
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   291
        ].
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   292
    seconds = 0 
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   293
        ifTrue: [ss := ''] 
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   294
        ifFalse: [
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   295
            ss := seconds printString, ' second'.
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   296
            seconds > 1 ifTrue:[
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   297
                ss := ss , 's'
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   298
            ]
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   299
        ].
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   300
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   301
    "/ do not show seconds, if hours are there
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   302
    hh size > 0 ifTrue: [ss := ''].
6467
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   303
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   304
    s := hh.
6873
c70b04265d33 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 6624
diff changeset
   305
    mm notEmpty ifTrue:[
c70b04265d33 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 6624
diff changeset
   306
        s notEmpty ifTrue:[
c70b04265d33 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 6624
diff changeset
   307
            s := s , ' '
c70b04265d33 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 6624
diff changeset
   308
        ].
c70b04265d33 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 6624
diff changeset
   309
        s := s , mm.
6467
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   310
    ].
6873
c70b04265d33 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 6624
diff changeset
   311
    ss notEmpty ifTrue:[
c70b04265d33 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 6624
diff changeset
   312
        s notEmpty ifTrue:[
c70b04265d33 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 6624
diff changeset
   313
            s := s , ' '
c70b04265d33 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 6624
diff changeset
   314
        ].
c70b04265d33 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 6624
diff changeset
   315
        s := s , ss
6467
f200ac48f2a8 intervalString
Claus Gittinger <cg@exept.de>
parents: 6165
diff changeset
   316
    ].
6873
c70b04265d33 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 6624
diff changeset
   317
    ^ s
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   318
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   319
    "
6873
c70b04265d33 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 6624
diff changeset
   320
     (Time fromSeconds:3600) intervalString     
c70b04265d33 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 6624
diff changeset
   321
     (Time fromSeconds:3605) intervalString    
c70b04265d33 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 6624
diff changeset
   322
     (Time fromSeconds:3700) intervalString    
c70b04265d33 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 6624
diff changeset
   323
     (Time fromSeconds:5) intervalString       
c70b04265d33 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 6624
diff changeset
   324
     (Time fromSeconds:65) intervalString      
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   325
    "
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   326
!
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   327
7024
aab4f98eb6b2 squeak: print24:on:
penk
parents: 7011
diff changeset
   328
print24:prnt24FormatBoolean on:aStream
aab4f98eb6b2 squeak: print24:on:
penk
parents: 7011
diff changeset
   329
    "print me either US or 24hr format on a stream"
aab4f98eb6b2 squeak: print24:on:
penk
parents: 7011
diff changeset
   330
aab4f98eb6b2 squeak: print24:on:
penk
parents: 7011
diff changeset
   331
    ^ self print24:prnt24FormatBoolean showSeconds:true on:aStream
aab4f98eb6b2 squeak: print24:on:
penk
parents: 7011
diff changeset
   332
aab4f98eb6b2 squeak: print24:on:
penk
parents: 7011
diff changeset
   333
    "
aab4f98eb6b2 squeak: print24:on:
penk
parents: 7011
diff changeset
   334
     Time now print24:true on:Transcript. Transcript cr.
aab4f98eb6b2 squeak: print24:on:
penk
parents: 7011
diff changeset
   335
     Time now print24:false on:Transcript. Transcript cr.
aab4f98eb6b2 squeak: print24:on:
penk
parents: 7011
diff changeset
   336
    "
aab4f98eb6b2 squeak: print24:on:
penk
parents: 7011
diff changeset
   337
!
aab4f98eb6b2 squeak: print24:on:
penk
parents: 7011
diff changeset
   338
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   339
print24:prnt24Format showSeconds:doSeconds on:aStream
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   340
    "print me either US or 24hr format, optionally with
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   341
     seconds on a stream"
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   342
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   343
    |format|
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   344
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   345
    prnt24Format ifTrue:[
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   346
        doSeconds ifTrue:[
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   347
            format := '%h:%m:%s'
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   348
        ] ifFalse:[
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   349
            format := '%h:%m'
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   350
        ].
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   351
    ] ifFalse:[
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   352
        "/ US format
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   353
        doSeconds ifTrue:[
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   354
            format := '%u:%m:%s %a'
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   355
        ] ifFalse:[
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   356
            format := '%u:%m %a'
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   357
        ].
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   358
    ].
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   359
    ^ self
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   360
        printOn:aStream 
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   361
        format:format.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   362
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   363
    "
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   364
     Time now print24:true showSeconds:true on:Transcript. Transcript cr.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   365
     Time now print24:false showSeconds:true on:Transcript. Transcript cr.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   366
     Time now print24:true showSeconds:false on:Transcript. Transcript cr.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   367
     Time now print24:false showSeconds:false on:Transcript. Transcript cr.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   368
    "
4411
684a2b944463 much improved formatting (see #printOn:format:)
Claus Gittinger <cg@exept.de>
parents: 4392
diff changeset
   369
! !
684a2b944463 much improved formatting (see #printOn:format:)
Claus Gittinger <cg@exept.de>
parents: 4392
diff changeset
   370
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   371
!Time methodsFor:'accessing'!
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   372
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   373
hours
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   374
    "return the number of hours since midnight (i.e. 0..23)"
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   375
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   376
    ^ self getSeconds // 3600
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   377
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   378
    "
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   379
     Time now hours
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   380
    "
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   381
!
275
a76029ddaa98 *** empty log message ***
claus
parents: 241
diff changeset
   382
4845
ffd67920b3a3 added dummy milliseconds.
Claus Gittinger <cg@exept.de>
parents: 4649
diff changeset
   383
milliseconds
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   384
    "time does not keep milliseconds 
8249
bdcae1232e6d Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8231
diff changeset
   385
     - for compatibility with Timestamp"
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   386
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   387
    ^ 0
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   388
!
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   389
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   390
minutes
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   391
    "return the number of minutes within the hour (i.e. 0..59)"
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   392
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   393
    ^ (self getSeconds \\ 3600) // 60
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   394
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   395
    "
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   396
     Time now minutes
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   397
    "
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   398
!
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   399
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   400
seconds
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   401
    "return the number of seconds within the minute (i.e. 0..59)"
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   402
7733
f556d689cf53 Speed up computations
Stefan Vogel <sv@exept.de>
parents: 7672
diff changeset
   403
    ^ self getSeconds \\ 60
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   404
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   405
    "
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   406
     Time now seconds
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   407
    "
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   408
!
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   409
9441
bbc70993779b typo in comment
Stefan Vogel <sv@exept.de>
parents: 9061
diff changeset
   410
timeZoneDeltaInMinutes
bbc70993779b typo in comment
Stefan Vogel <sv@exept.de>
parents: 9061
diff changeset
   411
    "answer the number of minutes between local time and utc time.
bbc70993779b typo in comment
Stefan Vogel <sv@exept.de>
parents: 9061
diff changeset
   412
     Delta is positive if local time is ahead of utc, negative if behind utc.
bbc70993779b typo in comment
Stefan Vogel <sv@exept.de>
parents: 9061
diff changeset
   413
bbc70993779b typo in comment
Stefan Vogel <sv@exept.de>
parents: 9061
diff changeset
   414
     Time is local time, so answer the delta of today"
bbc70993779b typo in comment
Stefan Vogel <sv@exept.de>
parents: 9061
diff changeset
   415
bbc70993779b typo in comment
Stefan Vogel <sv@exept.de>
parents: 9061
diff changeset
   416
    ^ Timestamp now timeZoneDeltaInMinutes
bbc70993779b typo in comment
Stefan Vogel <sv@exept.de>
parents: 9061
diff changeset
   417
bbc70993779b typo in comment
Stefan Vogel <sv@exept.de>
parents: 9061
diff changeset
   418
bbc70993779b typo in comment
Stefan Vogel <sv@exept.de>
parents: 9061
diff changeset
   419
    "
bbc70993779b typo in comment
Stefan Vogel <sv@exept.de>
parents: 9061
diff changeset
   420
      Time now timeZoneDeltaInMinutes
bbc70993779b typo in comment
Stefan Vogel <sv@exept.de>
parents: 9061
diff changeset
   421
    "
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   422
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   423
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   424
!Time methodsFor:'comparing'!
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   425
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   426
< aTime
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   427
    "return true if the receiver is before the argument"
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   428
10744
afd1835c12d2 comparison did only care for seconds, when used with timeDurations
sr
parents: 10666
diff changeset
   429
    aTime class == self class ifTrue:[
afd1835c12d2 comparison did only care for seconds, when used with timeDurations
sr
parents: 10666
diff changeset
   430
        ^ timeEncoding < aTime timeEncoding
afd1835c12d2 comparison did only care for seconds, when used with timeDurations
sr
parents: 10666
diff changeset
   431
    ].
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   432
    ^ self getSeconds < aTime getSeconds
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   433
!
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   434
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   435
= aTime
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   436
    "return true if the argument, aTime represents the same timeOfDay"
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   437
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   438
    aTime class == self class ifTrue:[
10666
609bedc85066 changed #'=' (for largeinteger timeEncodings in TimeDuration)
Claus Gittinger <cg@exept.de>
parents: 9441
diff changeset
   439
        ^ timeEncoding = aTime timeEncoding
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   440
    ].
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   441
    (aTime species == self species) ifFalse:[^ false].
10666
609bedc85066 changed #'=' (for largeinteger timeEncodings in TimeDuration)
Claus Gittinger <cg@exept.de>
parents: 9441
diff changeset
   442
    ^ self getSeconds = aTime getSeconds
609bedc85066 changed #'=' (for largeinteger timeEncodings in TimeDuration)
Claus Gittinger <cg@exept.de>
parents: 9441
diff changeset
   443
609bedc85066 changed #'=' (for largeinteger timeEncodings in TimeDuration)
Claus Gittinger <cg@exept.de>
parents: 9441
diff changeset
   444
    "Modified: / 18-07-2007 / 14:16:34 / cg"
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   445
!
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   446
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   447
> aTime
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   448
    "return true if the receiver is before the argument"
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   449
10744
afd1835c12d2 comparison did only care for seconds, when used with timeDurations
sr
parents: 10666
diff changeset
   450
    aTime class == self class ifTrue:[
afd1835c12d2 comparison did only care for seconds, when used with timeDurations
sr
parents: 10666
diff changeset
   451
        ^ timeEncoding > aTime timeEncoding
afd1835c12d2 comparison did only care for seconds, when used with timeDurations
sr
parents: 10666
diff changeset
   452
    ].
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   453
    ^ self getSeconds > aTime getSeconds
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   454
!
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   455
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   456
hash
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   457
    "return an integer useful for hashing on times"
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   458
10744
afd1835c12d2 comparison did only care for seconds, when used with timeDurations
sr
parents: 10666
diff changeset
   459
    ^ timeEncoding
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   460
! !
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   461
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   462
!Time methodsFor:'converting'!
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   463
17751
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17728
diff changeset
   464
asNative
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17728
diff changeset
   465
	#swAdded.
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17728
diff changeset
   466
	^self
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17728
diff changeset
   467
!
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17728
diff changeset
   468
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   469
asSeconds
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   470
    "return the number of seconds elapsed since midnight"
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   471
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   472
    ^ self getSeconds
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   473
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   474
    "
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   475
     Time now asSeconds
10933
01e6c805b3df comment
Claus Gittinger <cg@exept.de>
parents: 10744
diff changeset
   476
     (TimeDuration days:1) asSeconds 
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   477
    "
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   478
!
95
d22739a0c6e9 *** empty log message ***
claus
parents: 88
diff changeset
   479
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
   480
asTime
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
   481
    "return a Time object from the receiver - thats the receiver."
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
   482
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   483
    ^ self
8249
bdcae1232e6d Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8231
diff changeset
   484
!
bdcae1232e6d Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8231
diff changeset
   485
8796
1b9711a23424 +asTimeDuration
Claus Gittinger <cg@exept.de>
parents: 8749
diff changeset
   486
asTimeDuration
1b9711a23424 +asTimeDuration
Claus Gittinger <cg@exept.de>
parents: 8749
diff changeset
   487
    "return an TimeDuration object from the receiver, taking the time since midnight."
1b9711a23424 +asTimeDuration
Claus Gittinger <cg@exept.de>
parents: 8749
diff changeset
   488
1b9711a23424 +asTimeDuration
Claus Gittinger <cg@exept.de>
parents: 8749
diff changeset
   489
    ^ TimeDuration 
1b9711a23424 +asTimeDuration
Claus Gittinger <cg@exept.de>
parents: 8749
diff changeset
   490
                   hours:(self hours) minutes:(self minutes) seconds:(self seconds)
1b9711a23424 +asTimeDuration
Claus Gittinger <cg@exept.de>
parents: 8749
diff changeset
   491
                   milliseconds:(self milliseconds)
1b9711a23424 +asTimeDuration
Claus Gittinger <cg@exept.de>
parents: 8749
diff changeset
   492
    "
1b9711a23424 +asTimeDuration
Claus Gittinger <cg@exept.de>
parents: 8749
diff changeset
   493
     Time now asTimeDuration 
1b9711a23424 +asTimeDuration
Claus Gittinger <cg@exept.de>
parents: 8749
diff changeset
   494
    "
1b9711a23424 +asTimeDuration
Claus Gittinger <cg@exept.de>
parents: 8749
diff changeset
   495
!
1b9711a23424 +asTimeDuration
Claus Gittinger <cg@exept.de>
parents: 8749
diff changeset
   496
8994
cbf9e75584fe asTimeStamp -> asTimestamp for AbstractTime protocol compatibility
Stefan Vogel <sv@exept.de>
parents: 8796
diff changeset
   497
asTimestamp
cbf9e75584fe asTimeStamp -> asTimestamp for AbstractTime protocol compatibility
Stefan Vogel <sv@exept.de>
parents: 8796
diff changeset
   498
    "return an Timestamp object from the receiver.
8249
bdcae1232e6d Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8231
diff changeset
   499
     The date components are taken from today."
bdcae1232e6d Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8231
diff changeset
   500
bdcae1232e6d Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8231
diff changeset
   501
    |today|
bdcae1232e6d Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8231
diff changeset
   502
bdcae1232e6d Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8231
diff changeset
   503
    today := Date today.
bdcae1232e6d Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8231
diff changeset
   504
    ^ Timestamp year:today year month:today month day:today day
bdcae1232e6d Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8231
diff changeset
   505
                   hour:(self hours) minute:(self minutes) second:(self seconds)
bdcae1232e6d Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8231
diff changeset
   506
                   millisecond:(self milliseconds)
bdcae1232e6d Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8231
diff changeset
   507
    "
8994
cbf9e75584fe asTimeStamp -> asTimestamp for AbstractTime protocol compatibility
Stefan Vogel <sv@exept.de>
parents: 8796
diff changeset
   508
      Time now asTimestamp
8249
bdcae1232e6d Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents: 8231
diff changeset
   509
    "
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
   510
! !
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
   511
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   512
!Time methodsFor:'printing & storing'!
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   513
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   514
print12HourFormatOn:aStream
11151
61a33963c219 comments
Claus Gittinger <cg@exept.de>
parents: 10933
diff changeset
   515
    "append a human readable printed representation of the receiver to aStream.
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   516
     Format is hh:mm:ss am/pm (i.e. 12-hour american format)."
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   517
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   518
    ^ self
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   519
        printOn:aStream 
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   520
        format:(self class formatString12us)
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   521
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   522
"/    |h m s ampm|
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   523
"/
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   524
"/    h := self hours.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   525
"/
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   526
"/    "/ 0 -> 12 am
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   527
"/    "/ 12 -> 12 pm
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   528
"/
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   529
"/    h // 12 == 0 ifTrue:[
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   530
"/        ampm := ' am'.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   531
"/    ] ifFalse:[
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   532
"/        ampm := ' pm'.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   533
"/    ].
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   534
"/
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   535
"/    h == 0 ifFalse:[
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   536
"/        h := h - 1 \\ 12 + 1.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   537
"/    ].
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   538
"/
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   539
"/    h printOn:aStream.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   540
"/    aStream nextPut:$:.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   541
"/    m := self minutes.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   542
"/    (m < 10) ifTrue:[aStream nextPut:$0].
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   543
"/    m printOn:aStream.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   544
"/    aStream nextPut:$:.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   545
"/    s := self seconds.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   546
"/    (s < 10) ifTrue:[aStream nextPut:$0].
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   547
"/    s printOn:aStream.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   548
"/    aStream nextPutAll:ampm
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   549
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   550
    "
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   551
     Time now print12HourFormatOn:Transcript. Transcript cr
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   552
     (Time now subtractHours:12) print12HourFormatOn:Transcript. Transcript cr
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   553
     (Time hour:24 minutes:0 seconds:0) print12HourFormatOn:Transcript. Transcript cr
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   554
     (Time hour:12 minutes:0 seconds:0) print12HourFormatOn:Transcript. Transcript cr
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   555
     (Time hour:0 minutes:0 seconds:0) print12HourFormatOn:Transcript. Transcript cr
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   556
     0 to:24 do:[:h |
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   557
         (Time hour:h minutes:0 seconds:0) print12HourFormatOn:Transcript. Transcript cr
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   558
     ]
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   559
    "
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   560
!
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   561
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   562
print24HourFormatOn:aStream
11151
61a33963c219 comments
Claus Gittinger <cg@exept.de>
parents: 10933
diff changeset
   563
    "append a human readable printed representation of the receiver to aStream.
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   564
     Format is hh:mm:ss (i.e. 24-hour european format)."
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   565
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   566
    ^ self
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   567
        printOn:aStream 
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   568
        format:(self class formatString24).
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   569
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   570
"/    |h m s|
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   571
"/
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   572
"/    h := self hours.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   573
"/    (h < 10) ifTrue:[aStream nextPut:$0].
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   574
"/    h printOn:aStream.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   575
"/    aStream nextPut:$:.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   576
"/    m := self minutes.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   577
"/    (m < 10) ifTrue:[aStream nextPut:$0].
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   578
"/    m printOn:aStream.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   579
"/    aStream nextPut:$:.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   580
"/    s := self seconds.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   581
"/    (s < 10) ifTrue:[aStream nextPut:$0].
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   582
"/    s printOn:aStream
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   583
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   584
    "
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   585
     Time now print24HourFormatOn:Transcript. Transcript cr
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   586
    "
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   587
!
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   588
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   589
printOn:aStream
11151
61a33963c219 comments
Claus Gittinger <cg@exept.de>
parents: 10933
diff changeset
   590
    "append a human readable printed representation of the receiver to aStream.
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   591
     The format is suitable for a human - not meant to be read back.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   592
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   593
     Format is hh:mm:ss either in 12-hour or 24-hour format.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   594
     depending on the setting of LanguageTerritory.
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   595
     I dont know what ST-80 does here (12-hour format ?)"
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   596
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   597
    LanguageTerritory == #us ifTrue:[
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   598
        self print12HourFormatOn:aStream
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   599
    ] ifFalse:[
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   600
        self print24HourFormatOn:aStream
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   601
    ]
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   602
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   603
    "
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   604
     Time now printOn:Transcript. Transcript cr
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   605
    "
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   606
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   607
    "Modified: 22.2.1996 / 16:58:30 / cg"
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   608
!
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   609
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   610
printString12HourFormat
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   611
    "return a printed representation in 12 hour format"
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   612
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   613
    ^ self printStringFormat:(self class formatString12us)               
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   614
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   615
    "
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   616
     Time now printString12HourFormat
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   617
    "
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   618
!
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   619
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   620
printString24HourFormat
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   621
    "return a printed representation in 24 hour format"
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   622
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   623
    ^ self printStringFormat:(self class formatString24)               
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   624
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   625
    "
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   626
     Time now printString24HourFormat
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   627
    "
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   628
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   629
!
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   630
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   631
shortPrintString
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   632
    "dummy - for now"
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   633
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   634
    ^ self printString
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   635
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   636
    "Created: 20.6.1997 / 17:17:01 / cg"
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   637
! !
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   638
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   639
!Time methodsFor:'private'!
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   640
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   641
fromOSTime:osTime
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   642
    "set my time, given an osTime"
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   643
7513
8a39ab36a0f0 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 7293
diff changeset
   644
    |i|
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   645
7513
8a39ab36a0f0 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 7293
diff changeset
   646
    i := OperatingSystem computeTimeAndDateFrom:osTime.
7740
5a9d544b8906 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 7733
diff changeset
   647
    self setHours:(i hours) minutes:(i minutes) seconds:(i seconds)
6164
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   648
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   649
    "Modified: 1.7.1996 / 15:21:06 / cg"
8335251d4cf9 *** empty log message ***
md
parents: 6163
diff changeset
   650
!
275
a76029ddaa98 *** empty log message ***
claus
parents: 241
diff changeset
   651
3477
ac8613ab02c9 fixed am/pm printing
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   652
getMilliseconds
6046
f95c62b9831d checkin from browser
Claus Gittinger <cg@exept.de>
parents: 6045
diff changeset
   653
    "return the number of milliseconds since midnight"
f95c62b9831d checkin from browser
Claus Gittinger <cg@exept.de>
parents: 6045
diff changeset
   654
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   655
    ^ self getSeconds * 1000
3477
ac8613ab02c9 fixed am/pm printing
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   656
!
ac8613ab02c9 fixed am/pm printing
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   657
275
a76029ddaa98 *** empty log message ***
claus
parents: 241
diff changeset
   658
getSeconds
6046
f95c62b9831d checkin from browser
Claus Gittinger <cg@exept.de>
parents: 6045
diff changeset
   659
    "return the number of seconds since midnight"
f95c62b9831d checkin from browser
Claus Gittinger <cg@exept.de>
parents: 6045
diff changeset
   660
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   661
    ^ timeEncoding
275
a76029ddaa98 *** empty log message ***
claus
parents: 241
diff changeset
   662
!
a76029ddaa98 *** empty log message ***
claus
parents: 241
diff changeset
   663
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   664
setHours:h minutes:m seconds:s
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
   665
    "set my time given individual values"
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
   666
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   667
    self setSeconds:(((h\\24) * 60 * 60 ) + (m * 60) + s).
3477
ac8613ab02c9 fixed am/pm printing
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   668
!
ac8613ab02c9 fixed am/pm printing
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   669
ac8613ab02c9 fixed am/pm printing
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   670
setMilliseconds:millis
ac8613ab02c9 fixed am/pm printing
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   671
    "set my time given milliseconds since midnight"
ac8613ab02c9 fixed am/pm printing
Claus Gittinger <cg@exept.de>
parents: 2706
diff changeset
   672
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   673
    self setSeconds:(millis // 1000)
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
   674
!
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
   675
6904
680e7d97de38 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6903
diff changeset
   676
setSeconds:secs
680e7d97de38 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6903
diff changeset
   677
    "set my time given seconds since midnight.
9441
bbc70993779b typo in comment
Stefan Vogel <sv@exept.de>
parents: 9061
diff changeset
   678
     Notice the modulo operations here - there cannot be a time beyond 24hours
6904
680e7d97de38 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6903
diff changeset
   679
     (use TimeDuration, if you need that)."
680e7d97de38 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6903
diff changeset
   680
680e7d97de38 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6903
diff changeset
   681
    secs < 0 ifTrue:[
680e7d97de38 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6903
diff changeset
   682
        timeEncoding := (24 * 3600) - (secs negated \\ (24 * 3600))
680e7d97de38 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6903
diff changeset
   683
    ] ifFalse:[
680e7d97de38 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6903
diff changeset
   684
        timeEncoding := secs
680e7d97de38 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6903
diff changeset
   685
    ].
680e7d97de38 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6903
diff changeset
   686
    timeEncoding > (24 * 3600) ifTrue:[
680e7d97de38 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6903
diff changeset
   687
        timeEncoding := timeEncoding \\ (24 * 3600).
680e7d97de38 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6903
diff changeset
   688
    ]
680e7d97de38 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6903
diff changeset
   689
680e7d97de38 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6903
diff changeset
   690
    "
7011
4d7910fcaa7e add methods for squeak compatibility
penk
parents: 6904
diff changeset
   691
     Time basicNew setSeconds:0 
4d7910fcaa7e add methods for squeak compatibility
penk
parents: 6904
diff changeset
   692
     Time fromSeconds:3601  
6904
680e7d97de38 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6903
diff changeset
   693
     Time now seconds
680e7d97de38 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6903
diff changeset
   694
     Time now timeEncoding
680e7d97de38 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6903
diff changeset
   695
     (Time now addDays:5) seconds     
680e7d97de38 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6903
diff changeset
   696
     (Time now addDays:5) timeEncoding
680e7d97de38 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6903
diff changeset
   697
    "
680e7d97de38 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6903
diff changeset
   698
!
680e7d97de38 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6903
diff changeset
   699
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   700
timeEncoding
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   701
    "the internal encoding is stricktly private, 
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   702
     and should not be used outside."
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   703
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   704
    ^ timeEncoding
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   705
!
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   706
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   707
timeEncoding:encoding
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   708
    "the internal encoding is stricktly private, 
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   709
     and should not be used outside."
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   710
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   711
    timeEncoding := encoding
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
   712
! !
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
   713
6165
0ac589c3d92a comparing & hash fixed (to work with TimeEncoding)
md
parents: 6164
diff changeset
   714
!Time class methodsFor:'documentation'!
241
6f30be88e314 *** empty log message ***
claus
parents: 239
diff changeset
   715
699
12f456343eea checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
   716
version
17814
b75a7f0c346b Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17807
diff changeset
   717
    ^ '$Id: Time.st 10602 2010-12-20 07:13:27Z vranyj1 $'
17751
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17728
diff changeset
   718
!
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17728
diff changeset
   719
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17728
diff changeset
   720
version_CVS
17814
b75a7f0c346b Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17807
diff changeset
   721
    ^ 'Header: /cvs/stx/stx/libbasic/Time.st,v 1.87 2010/03/31 09:39:45 stefan Exp '
17761
b0e5971141bc Added Lookup and BuiltinLookup classes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17757
diff changeset
   722
!
17751
b2273fa8d59f Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17728
diff changeset
   723
17761
b0e5971141bc Added Lookup and BuiltinLookup classes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17757
diff changeset
   724
version_SVN
17814
b75a7f0c346b Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17807
diff changeset
   725
    ^ '$Id: Time.st 10602 2010-12-20 07:13:27Z vranyj1 $'
17761
b0e5971141bc Added Lookup and BuiltinLookup classes
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17757
diff changeset
   726
! !
17767
a4a32df3aa5e merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17761
diff changeset
   727
17772
6e0b3c06c364 Method reverted to r10532
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17767
diff changeset
   728
17780
b6e42c92eba0 Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17772
diff changeset
   729
17807
06cc6c49e291 merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17780
diff changeset
   730
17814
b75a7f0c346b Merged with /trunk
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 17807
diff changeset
   731