litesoft

URLs

Explore

Commits

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

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

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