Subversion Repository Public Repository

litesoft

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
// This Source Code is in the Public Domain per: http://litesoft.org/License.txt
package org.litesoft.core.simpletypes.temporal;

import org.litesoft.commonfoundation.typeutils.*;

import java.util.*;

import org.litesoft.core.*;
import org.litesoft.core.simpletypes.temporal.nonpublic.*;
import org.litesoft.commonfoundation.typeutils.gregorian.*;

/**
 * A Simple Timestamp that acts as a proxy for a java.util.Date (burying the depricated method use) and variable
 * resolution from the Hour thru the Millisecond.
 */
public final class SimpleTimestamp extends AbstractWithTimeResAspects<SimpleTimestamp> implements TimestampWithResolutionAccessor,
                                                                                                  TemporalSimpleType,
                                                                                                  SQLtimestampable
{
    public static final String DEFAULT_TS_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS"; // Note this is representational - IT IS NOT USED!

    private int mYear, mMonth, mDay;
    private SimpleTime mTime;

    /**
     * @deprecated - for Serialization
     */
    protected SimpleTimestamp()
    {
    }

    private SimpleTimestamp( SimpleTime pTime )
            throws IllegalArgumentException
    {
        if ( null == (mTime = pTime) )
        {
            throw new IllegalArgumentException( "Time required for a Timestamp" );
        }
    }

    public SimpleTimestamp( int pYear, int pMonth, int pDay, SimpleTime pTime )
            throws IllegalArgumentException
    {
        this( pTime );
        setDate( pYear, pMonth, pDay );
    }

    public SimpleTimestamp( CalendarYMD pDate, SimpleTime pTime )
            throws IllegalArgumentException
    {
        this( pTime );
        if ( pDate == null )
        {
            throw new IllegalArgumentException( "Date may NOT be null" );
        }
        setDate( pDate );
    }

    public SimpleTimestamp( int pYear, int pMonth, int pDay, int pHour )
            throws IllegalArgumentException
    {
        this( pYear, pMonth, pDay, new SimpleTime( pHour ) );
    }

    public SimpleTimestamp( int pYear, int pMonth, int pDay, int pHour, int pMin )
            throws IllegalArgumentException
    {
        this( pYear, pMonth, pDay, new SimpleTime( pHour, pMin ) );
    }

    public SimpleTimestamp( int pYear, int pMonth, int pDay, int pHour, int pMin, int pSec )
            throws IllegalArgumentException
    {
        this( pYear, pMonth, pDay, new SimpleTime( pHour, pMin, pSec ) );
    }

    public SimpleTimestamp( int pYear, int pMonth, int pDay, int pHour, int pMin, int pSec, int pMilliSec )
            throws IllegalArgumentException
    {
        this( pYear, pMonth, pDay, new SimpleTime( pHour, pMin, pSec, pMilliSec ) );
    }

    public SimpleTimestamp( CalendarYMD pDate, int pHour )
            throws IllegalArgumentException
    {
        this( pDate, new SimpleTime( pHour ) );
    }

    public SimpleTimestamp( CalendarYMD pDate, int pHour, int pMin )
            throws IllegalArgumentException
    {
        this( pDate, new SimpleTime( pHour, pMin ) );
    }

    public SimpleTimestamp( CalendarYMD pDate, int pHour, int pMin, int pSec )
            throws IllegalArgumentException
    {
        this( pDate, new SimpleTime( pHour, pMin, pSec ) );
    }

    public SimpleTimestamp( CalendarYMD pDate, int pHour, int pMin, int pSec, int pMilliSec )
            throws IllegalArgumentException
    {
        this( pDate, new SimpleTime( pHour, pMin, pSec, pMilliSec ) );
    }

    public SimpleTimestamp( TimeRes pResolution, Date pDate )
            throws IllegalArgumentException
    {
        this( new CalendarYMD( pDate ), SimpleTime.timeComponents( pResolution, pDate ) );
    }

//    public SimpleTimestamp( TimeRes pResolution, UtilDateAdaptor pDate )
//            throws IllegalArgumentException
//    {
//        this( pDate.getYear(), pDate.getMonth(), pDate.getDay(), SimpleTime.timeComponents( pResolution, pDate ) );
//    }

    public SimpleTimestamp( UtilDateAdaptor pDate )
            throws IllegalArgumentException
    {
        this( pDate.getYear(), pDate.getMonth(), pDate.getDay(), SimpleTime.timeComponents( pDate ) );
    }

    public SimpleTimestamp( Date pDate )
            throws IllegalArgumentException
    {
        this( new CalendarYMD( pDate ), SimpleTime.timeComponents( pDate ) );
    }

    public static SimpleTimestamp now()
    {
        return new SimpleTimestamp( new UtilDateAdaptor() );
    }

    public SimpleTimestamp copy()
    {
        return new SimpleTimestamp( getYear(), getMonth(), getDay(), mTime.copy() );
    }

    public SimpleTimestamp copyWithUpdatedResolution( TimeRes pResolution )
            throws IllegalArgumentException
    {
        return new SimpleTimestamp( getYear(), getMonth(), getDay(), mTime.copyWithUpdatedResolution( pResolution ) );
    }

    /**
     * Delete this method...
     */
    public SimpleTimestamp copyWithExpandedResolution( TimeRes pResolution )
            throws IllegalArgumentException
    {
        return new SimpleTimestamp( getYear(), getMonth(), getDay(), mTime.copyWithExpandedResolution( pResolution ) );
    }

    /**
     * Delete this method...
     */
    public SimpleTimestamp copyWithReducedResolution( TimeRes pResolution )
            throws IllegalArgumentException
    {
        return new SimpleTimestamp( getYear(), getMonth(), getDay(), mTime.copyWithReducedResolution( pResolution ) );
    }

    @Override
    public int getResolutionIndex()
    {
        return mTime.getResolutionIndex();
    }

    @Override
    public TimeRes getTimeRes()
    {
        return mTime.getTimeRes();
    }

    public CalendarYMD getDateComponents()
    {
        return new CalendarYMD( mYear, mMonth, mDay );
    }

    public SimpleTime getTimeComponents()
    {
        return new SimpleTime( mTime );
    }

    @Override
    public int getYear()
    {
        return mYear;
    }

    @Override
    public int getMonth()
    {
        return mMonth;
    }

    @Override
    public int getDay()
    {
        return mDay;
    }

    @Override
    public int getHour()
    {
        return mTime.getHour();
    }

    @Override
    public int getMin()
    {
        return mTime.getMin();
    }

    @Override
    public int getSec()
    {
        return mTime.getSec();
    }

    @Override
    public int getMilliSec()
    {
        return mTime.getMilliSec();
    }

    public UtilDateAdaptor getUtilDateAdaptor()
    {
        switch ( mTime.getResolutionIndex() )
        {
            case TimeRes.HOURindex:
                return UtilDateAdaptor.currentWall( mYear, mMonth, mDay, //
                                                    mTime.getHour() );
            case TimeRes.MINindex:
                return UtilDateAdaptor.currentWall( mYear, mMonth, mDay, //
                                                    mTime.getHour(), //
                                                    mTime.getMin() );
            case TimeRes.SECindex:
                return UtilDateAdaptor.currentWall( mYear, mMonth, mDay, //
                                                    mTime.getHour(), //
                                                    mTime.getMin(), //
                                                    mTime.getSec() );
            case TimeRes.MSECindex:
            default:
                return UtilDateAdaptor.currentWall( mYear, mMonth, mDay, //
                                                    mTime.getHour(), //
                                                    mTime.getMin(), //
                                                    mTime.getSec(), //
                                                    mTime.getMilliSec() );
        }
    }

    public Date getDate()
    {
        return getUtilDateAdaptor().getWallDate();
    }

    public void setDate( Date pDate )
    {
        if ( pDate == null )
        {
            throw new IllegalArgumentException( "Date was null" );
        }
        setDateToResolution( new UtilDateAdaptor( pDate ) );
    }

    public void setDate( CalendarYMD pDate )
    {
        if ( pDate == null )
        {
            throw new IllegalArgumentException( "Date was null" );
        }
        setDateToResolution( pDate.toUtilDateAdaptor() );
    }

    public void setTimestamp( SimpleTimestamp pTimestamp )
            throws IllegalArgumentException
    {
        if ( pTimestamp == null )
        {
            throw new IllegalArgumentException( "Date was null" );
        }
        setDateToResolution( pTimestamp.getUtilDateAdaptor() );
    }

    private void setDateToResolution( UtilDateAdaptor pDateAdaptor )
            throws IllegalArgumentException
    {
        setDate( pDateAdaptor.getYear(), pDateAdaptor.getMonth(), pDateAdaptor.getDay() );
        switch ( pDateAdaptor.getTemporalResolution() )
        {
            case ToMilliSec:
                if ( isValidToMilliSec() )
                {
                    setMilliSec( pDateAdaptor.getMilliSec() );
                }
                // Fall Thru
            case ToSec:
                if ( isValidToSec() )
                {
                    setSec( pDateAdaptor.getSec() );
                }
                // Fall Thru
            case ToMin:
                if ( isValidToMin() )
                {
                    setMin( pDateAdaptor.getMin() );
                }
                // Fall Thru
            case ToHour:
                setHour( pDateAdaptor.getHour() );
                // Fall Thru
            default:
                break;
        }
    }

    public void setDate( int pYear, int pMonth, int pDay )
            throws IllegalArgumentException
    {
        validate( pYear, pMonth, pDay );
        mYear = pYear;
        mMonth = pMonth;
        mDay = pDay;
    }

    public void setYearAndMonth( int pYear, int pMonth )
            throws IllegalArgumentException
    {
        validate( pYear, pMonth, mDay );
        mYear = pYear;
        mMonth = pMonth;
    }

    public void setMonthAndDay( int pMonth, int pDay )
            throws IllegalArgumentException
    {
        validate( mYear, pMonth, pDay );
        mMonth = pMonth;
        mDay = pDay;
    }

    public void setYear( int pYear )
            throws IllegalArgumentException
    {
        validate( pYear, mMonth, mDay );
        mYear = pYear;
    }

    public void setMonth( int pMonth )
            throws IllegalArgumentException
    {
        validate( mYear, pMonth, mDay );
        mMonth = pMonth;
    }

    public void setDay( int pDay )
            throws IllegalArgumentException
    {
        validate( mYear, mMonth, pDay );
        mDay = pDay;
    }

    public void setHour( int pHour )
    {
        mTime.setHour( pHour );
    }

    public void setMin( int pMin )
    {
        mTime.setMin( pMin );
    }

    public void setSec( int pSec )
    {
        mTime.setSec( pSec );
    }

    public void setMilliSec( int pMilliSec )
    {
        mTime.setMilliSec( pMilliSec );
    }

    protected void validate( int pYear, int pMonth, int pDay )
            throws IllegalArgumentException
    {
        String error = Dates.checkValidity( pYear, pMonth, pDay );
        if ( error != null )
        {
            throw new IllegalArgumentException( error );
        }
    }

    /**
     * True if this is 'before' pThem.
     * <p/>
     * Note: Uses the lesser resolution of pThem or this.
     *
     * @param pThem !null
     *
     * @throws IllegalArgumentException if pThem is null
     */
    public boolean before( SimpleTimestamp pThem )
            throws IllegalArgumentException
    {
        return LLbeforeOrAfter( pThem, "before", -1 );
    }

    /**
     * True if this is 'after' pThem.
     * <p/>
     * Note: Uses the lesser resolution of pThem or this.
     *
     * @param pThem !null
     *
     * @throws IllegalArgumentException if pThem is null
     */
    public boolean after( SimpleTimestamp pThem )
            throws IllegalArgumentException
    {
        return LLbeforeOrAfter( pThem, "after", 1 );
    }

    private boolean LLbeforeOrAfter( SimpleTimestamp pThem, String pWhat, int pCompareRetValue )
            throws IllegalArgumentException
    {
        undefinedResultIfNull( pWhat, pThem );
        int cv;
        if ( 0 == (cv = compare( this.getYear(), pThem.getYear() )) )
        {
            if ( 0 == (cv = compare( this.getMonth(), pThem.getMonth() )) )
            {
                if ( 0 == (cv = compare( this.getDay(), pThem.getDay() )) )
                {
                    if ( 0 == (cv = compare( this.getHour(), pThem.getHour() )) )
                    {
                        if ( this.isValidToMin() && pThem.isValidToMin() && //
                             0 == (cv = compare( this.getMin(), pThem.getMin() )) )
                        {
                            if ( this.isValidToSec() && pThem.isValidToSec() && //
                                 0 == (cv = compare( this.getSec(), pThem.getSec() )) )
                            {
                                if ( this.isValidToMilliSec() && pThem.isValidToMilliSec() )
                                {
                                    cv = compare( this.getMilliSec(), pThem.getMilliSec() );
                                }
                            }
                        }
                    }
                }
            }
        }
        return pCompareRetValue == cv;
    }

    /**
     * True if this is 'before' pThem.
     * <p/>
     * Note: Treats pThem as if its resolution is the same as this' resolution.
     *
     * @param pThem !null
     *
     * @throws IllegalArgumentException if pThem is null
     */
    public boolean before( Date pThem )
            throws IllegalArgumentException
    {
        undefinedResultIfNull( "before", pThem );
        return before( new SimpleTimestamp( pThem ) );
    }

    /**
     * True if this is 'after' pThem.
     * <p/>
     * Note: Treats pThem as if its resolution is the same as this' resolution.
     *
     * @param pThem !null
     *
     * @throws IllegalArgumentException if pThem is null
     */
    public boolean after( Date pThem )
            throws IllegalArgumentException
    {
        undefinedResultIfNull( "after", pThem );
        return after( new SimpleTimestamp( pThem ) );
    }

    /**
     * Determine the Number of Days, Hours, Mins, Secs, & MilliSecs between this and pThem.
     * <p/>
     * The Maximum resolution of the result is the minimum resolution of this and pThem.  However, the actual
     * resolution is dependant on the result.
     *
     * @param pThem !null
     *
     * @throws IllegalArgumentException if pThem is null
     */
    public SimpleTimespan difference( SimpleTimestamp pThem )
            throws IllegalArgumentException
    {
        return LLbeforeOrAfter( pThem, "difference", -1 ) ? // this < pThem ?
               this.LLtill( pThem ) : //
               pThem.LLtill( this );
    }

    public SimpleTimestamp add( SimpleTimespan pAdjustBy )
            throws IllegalArgumentException
    {
        SimpleTime time = getTimeComponents();
        int adjustByDays = time.add( pAdjustBy ); // Should be 0 / positive
        CalendarYMD date = getDateComponents();
        date.addDays( adjustByDays );
        setTimestamp( new SimpleTimestamp( date, time ) );
        return this; // TODO: XXX
    }

    public SimpleTimestamp subtract( SimpleTimespan pAdjustBy )
            throws IllegalArgumentException
    {
        SimpleTime time = getTimeComponents();
        int adjustByDays = time.subtract( pAdjustBy ); // Should be 0 / negative
        CalendarYMD date = getDateComponents();
        date.addDays( adjustByDays );
        setTimestamp( new SimpleTimestamp( date, time ) );
        return this; // TODO: XXX
    }

    @Override
    public boolean equals( Object o )
    {
        return (this == o) || //
               (((o instanceof SimpleTimestamp) && equals( (SimpleTimestamp) o )) || ((o instanceof Date) && equals( (Date) o )));
    }

    public boolean equals( Date pDate )
    {
        return (pDate != null) && equals( new SimpleTimestamp( pDate ) );
    }

    public boolean equals( SimpleTimestamp them )
    {
        return (this == them) || //
               ((them != null) //
                && equal( this.mYear, them.mYear ) //
                && equal( this.mMonth, them.mMonth ) //
                && equal( this.mDay, them.mDay ) //
                && equal( this.mTime, them.mTime ) //
               );
    }

    @Override
    public int hashCode()
    {
        return hashCodeEm( calcHashCode( mYear ), //
                           calcHashCode( mMonth ), //
                           calcHashCode( mDay ) );
    }

    @Override
    public int compareTo( SimpleTimestamp them )
    {
        return compareEm( compare( this.mYear, them.mYear ), //
                          compare( this.mMonth, them.mMonth ), //
                          compare( this.mDay, them.mDay ), //
                          compare( this.mTime, them.mTime ) );
    }

    public static String toString( SimpleTimestamp pFromString )
    {
        return (pFromString != null) ? pFromString.toString() : null;
    }

    @Override
    public String toString()
    {
        StringBuilder sb = new StringBuilder();
        for ( Chunk chunk : getToStringChunks() )
        {
            chunk.appendTo( sb, this );
        }
        return sb.toString();
    }

    public static SimpleTimestamp fromString( String pToString )
            throws IllegalArgumentException
    {
        if ( pToString == null )
        {
            return null;
        }
        // yyyy-MM-dd HH:mm:ss.SSS
        String[] parts = SimpleParser.parse( pToString, "-- ::.", 4 );
        int zYear = parseInt( parts[0], "Year", pToString );
        int zMonth = parseInt( parts[1], "Month", pToString );
        int zDay = parseInt( parts[2], "Day", pToString );
        switch ( parts.length )
        {
            case 4:
                return new SimpleTimestamp( zYear, zMonth, zDay, //
                                            parseInt( parts[3], "Hour", pToString ) );
            case 5:
                return new SimpleTimestamp( zYear, zMonth, zDay, //
                                            parseInt( parts[3], "Hour", pToString ), //
                                            parseInt( parts[4], "Min", pToString ) );
            case 6:
                return new SimpleTimestamp( zYear, zMonth, zDay, //
                                            parseInt( parts[3], "Hour", pToString ), //
                                            parseInt( parts[4], "Min", pToString ), //
                                            parseInt( parts[5], "Sec", pToString ) );
            case 7:
                return new SimpleTimestamp( zYear, zMonth, zDay, //
                                            parseInt( parts[3], "Hour", pToString ), //
                                            parseInt( parts[4], "Min", pToString ), //
                                            parseInt( parts[5], "Sec", pToString ), //
                                            parseInt( parts[6], "MilliSec", pToString ) );
            default:
                throw new IllegalStateException( "parts.length = " + parts.length );
        }
    }

    private transient List<Chunk> mToStringChunks = null;

    private synchronized List<Chunk> getToStringChunks()
    {
        if ( mToStringChunks == null )
        {
            List<Chunk> chunks = Lists.newArrayList();
            chunks.add( y_Chunk );
            chunks.add( DASH );
            chunks.add( MM_Chunk );
            chunks.add( DASH );
            chunks.add( dd_Chunk );
            chunks.add( SPACE );
            chunks.add( new Chunk()
                {
                    @Override
                    public void appendTo( StringBuilder pSB, CalendarAccessorYMD pYMDsource )
                    {
                        pSB.append( mTime );
                    }
                } );
            mToStringChunks = chunks;
        }
        return mToStringChunks;
    }

    private SimpleTimespan LLtill( SimpleTimestamp them )
    {
        int days = this.getDateComponents().daysTill( them.getDateComponents() );

        SimpleTime thisTime = this.getTimeComponents();
        SimpleTime themTime = them.getTimeComponents();

        SimpleTimespan rv = thisTime.difference( themTime );
        rv.addDays( days );

        if ( thisTime.after( themTime ) ) // Unhappy Case: this > them
        {
            rv.addHours( -24 );
        }
        return rv;
    }

    @Override
    public java.sql.Timestamp toSQLvalue()
    {
        return new java.sql.Timestamp( getDate().getTime() );
    }
}

Commits for litesoft/trunk/Java/core/Anywhere/src/org/litesoft/core/simpletypes/temporal/SimpleTimestamp.java

Diff revisions: vs.
Revision Author Commited Message
939 Diff Diff GeorgeS picture GeorgeS Mon 02 Jun, 2014 21:30:31 +0000

Extracting commonfoundation

915 Diff Diff GeorgeS picture GeorgeS Sun 04 Aug, 2013 21:26:58 +0000

Changes

912 Diff Diff GeorgeS picture GeorgeS Fri 28 Jun, 2013 06:48:05 +0000

Revert to mixed & Working (PEDS & Prioritizer) code!

897 Diff Diff GeorgeS picture GeorgeS Mon 25 Feb, 2013 02:04:34 +0000
867 Diff Diff GeorgeS picture GeorgeS Sun 25 Nov, 2012 22:20:46 +0000

Updated Field Name

865 Diff Diff GeorgeS picture GeorgeS Mon 19 Nov, 2012 02:25:29 +0000
864 Diff Diff GeorgeS picture GeorgeS Mon 19 Nov, 2012 01:48:25 +0000
862 Diff Diff GeorgeS picture GeorgeS Thu 15 Nov, 2012 02:23:36 +0000

On the Way...

860 Diff Diff GeorgeS picture GeorgeS Mon 05 Nov, 2012 01:39:02 +0000
859 GeorgeS picture GeorgeS Mon 05 Nov, 2012 01:26:38 +0000