litesoft

URLs

Explore

Commits

Diff Revisions 897 vs 898 for /trunk/Java/core/Anywhere/src/org/litesoft/core/simpletypes/temporal/AbstractTimestampHMSM.java

		@@ -7,18 +7,25 @@
7	7		{
8	8		private static final long serialVersionUID = 1L;
9	9
10		-	private /* final */ int mMilliSec;
	10	+	protected AbstractTimestampHMSM( int pOriginalZuluOffsetMins, long pUTC )
	11	+	{
	12	+	super( pOriginalZuluOffsetMins, pUTC );
	13	+	}
	14	+
	15	+	protected AbstractTimestampHMSM( int pOriginalZuluOffsetMins, UtilDateAdaptor pDateAdaptor )
	16	+	{
	17	+	super( pOriginalZuluOffsetMins, pDateAdaptor );
	18	+	}
11	19
12		-	protected AbstractTimestampHMSM( int pYear, int pMonth, int pDay, int pZuluOffsetMins, int pHour, int pMin, int pSec, int pMilliSec )
	20	+	protected AbstractTimestampHMSM( UtilDateAdaptor pDateAdaptor )
13	21		{
14		-	super( pYear, pMonth, pDay, pZuluOffsetMins, pHour, pMin, pSec );
15		-	mMilliSec = validateMilliSec( pMilliSec );
	22	+	super( pDateAdaptor );
16	23		}
17	24
18	25		@Override
19	26		public final int getMilliSec()
20	27		{
21		-	return mMilliSec;
	28	+	return getWall().getMilliSec();
22	29		}
23	30
24	31		/**
		@@ -27,7 +34,7 @@
27	34		public final T milliSec( int pMilliSec )
28	35		{
29	36		validateMilliSec( pMilliSec );
30		-	return (mMilliSec == pMilliSec) ? us() : LLsetMilliSec( pMilliSec );
	37	+	return (getMilliSec() == pMilliSec) ? us() : LLsetMilliSec( pMilliSec );
31	38		}
32	39
33	40		/**
		@@ -35,7 +42,7 @@
35	42		*/
36	43		public final T addMilliSecs( int pMilliSecs )
37	44		{
38		-	return (pMilliSecs == 0) ? us() : LLsetMilliSec( mMilliSec + pMilliSecs );
	45	+	return (pMilliSecs == 0) ? us() : LLsetMilliSec( getMilliSec() + pMilliSecs );
39	46		}
40	47
41	48		/**
		@@ -43,7 +50,7 @@
43	50		*/
44	51		public final T minusMilliSecs( int pMilliSecs )
45	52		{
46		-	return (pMilliSecs == 0) ? us() : LLsetMilliSec( mMilliSec - pMilliSecs );
	53	+	return (pMilliSecs == 0) ? us() : LLsetMilliSec( getMilliSec() - pMilliSecs );
47	54		}
48	55
49	56		// vvvvvvvvvvvvvvvvvv Support methods vvvvvvvvvvvvvvvvv
		@@ -85,7 +92,7 @@
85	92
86	93		protected int LL_hashCode()
87	94		{
88		-	return hashCodeEm( super.hashCode(), mMilliSec );
	95	+	return hashCodeEm( super.hashCode(), getMilliSec() );
89	96		}
90	97
91	98		/**
		@@ -118,13 +125,13 @@
118	125
119	126		protected abstract M createMutable( int pYear, int pMonth, int pDay, int pHour, int pMin, int pSec, int pNewMilliSec );
120	127
121		-	protected static class Mutable extends AbstractTimestampHMS.Mutable implements TimestampAccessorHMSM
	128	+	protected static class Mutable extends AbstractTimestampHMS.Mutable
122	129		{
123	130		protected int mMilliSec;
124	131
125		-	public Mutable( int pYear, int pMonth, int pDay, boolean pDayConstrained, int pZuluOffsetMins, int pHour, int pMin, int pSec, int pMilliSec )
	132	+	public Mutable( int pYear, int pMonth, int pDay, boolean pDayConstrained, int pHour, int pMin, int pSec, int pMilliSec )
126	133		{
127		-	super( pYear, pMonth, pDay, pDayConstrained, pZuluOffsetMins, pHour, pMin, pSec );
	134	+	super( pYear, pMonth, pDay, pDayConstrained, pHour, pMin, pSec );
128	135		mMilliSec = pMilliSec;
129	136		}
130	137

View View this file contents

History View the full history

Feeds

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