432. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 12/13/2018 10:35:31 AM Eastern Standard Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

432.1 Files compared

#	Location	File	Last Modified
1	v12.5_iter_7_build 51.zip\TRM_Upgrade\src\main\java\gov\va\med\fw\util\date	DateWithTimeZone.java	Fri Dec 7 17:36:40 2018 UTC
2	v12.5_iter_7_build 51.zip\TRM_Upgrade\src\main\java\gov\va\med\fw\util\date	DateWithTimeZone.java	Wed Dec 12 19:52:48 2018 UTC

432.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	2	154
Changed	1	2
Inserted	0	0
Removed	0	0

432.3 Comparison options

Whitespace
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail

432.4 Active regular expressions

No regular expressions were active.

432.5 Comparison detail

	1	/******* ****** ****** ****** ****** ****** *******
	2	* Copyrii ght 2008 V HA. All ri ghts reser ved
	3	******* ****** ****** ****** ****** ****** *******/
	4	package go v.va.med.f w.util.dat e;
	5
	6	import jav a.io.Seria lizable;
	7	import jav a.util.Dat e;
	8	import jav a.util.Tim eZone;
	9
	10	/**
	11	* Wrapper object fo r tracking a Date wi th an asso ciated Tim eZone. Use ful for
	12	* "taggin g" a TimeZ one to alw ays format a date wi th (eg, th e TimeZone the Date
	13	* was ent ered in).
	14	*
	15	* Oct 10, 2008
	16	*
	17	* @author DN S
	18	*/
	19	public cla ss DateWit hTimeZone implements Serializa ble {
	20	/* *
	21	*
	22	* /
	23	pr ivate stat ic final l ong serial VersionUID = 3157346 9893761135 50L;
	24	pr ivate Date date;
	25	pr ivate Time Zone timeZ one;
	26
	27	pu blic DateW ithTimeZon e() {
	28	}
	29
	30	pu blic DateW ithTimeZon e(Date dat e, TimeZon e timeZone ) {
	31	this .date = da te;
	32	this .timeZone = timeZone ;
	33	}
	34
	35	/* *
	36	* @return t he date
	37	* /
	38	pu blic Date getDate() {
	39	retu rn date;
	40	}
	41
	42	/* *
	43	* @param da te
	44	* the date to set
	45	* /
	46	pu blic void setDate(Da te date) {
	47	this .date = da te;
	48	}
	49
	50	/* *
	51	* @return t he timeZon e
	52	* /
	53	pu blic TimeZ one getTim eZone() {
	54	retu rn timeZon e;
	55	}
	56
	57	/* *
	58	* @param ti meZone
	59	* the time Zone to se t
	60	* /
	61	pu blic void setTimeZon e(TimeZone timeZone) {
	62	this .timeZone = timeZone ;
	63	}
	64
	65	pu blic boole an equals( DateWithTi meZone tzD ate) {
	66	if ( tzDate == null && da te == null ) {
	67	return true;
	68	}
	69	if ( tzDate != null && tz Date.date != null && date != n ull) {
	70	return date.equa ls(tzDate. date);
	71	}
	72	retu rn false;
	73	}
	74
	75	pu blic Strin g toString () {
	76	retu rn TimeZon eUtils.con vertDateTo TimeZone(t his);
	77	}
	78	}