185. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 12/13/2018 10:35:24 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.

185.1 Files compared

#	Location	File	Last Modified
1	v12.5_iter_7_build 51.zip\TRM_Upgrade\src\main\java\gov\va\med\ccht\ui\model	FormattedDateForm.java	Fri Dec 7 17:36:30 2018 UTC
2	v12.5_iter_7_build 51.zip\TRM_Upgrade\src\main\java\gov\va\med\ccht\ui\model	FormattedDateForm.java	Wed Dec 12 19:52:47 2018 UTC

185.2 Comparison summary

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

185.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

185.4 Active regular expressions

No regular expressions were active.

185.5 Comparison detail

	1	/******* ****** ****** ****** ****** ****** *******
	2	* Copyrig ht � 2010 VHA. All r ights rese rved
	3	******* ****** ****** ****** ****** ****** *******/
	4	package go v.va.med.c cht.ui.mod el;
	5
	6	import jav a.util.Dat e;
	7
	8	import gov .va.med.fw .util.date .DateWithT imeZone;
	9	import gov .va.med.fw .util.date .TimeZoneU tils;
	10
	11	/**
	12	* Useful to preserv e custom D ate format ting (eg, track date s with ori ginal
	13	* TimeZon e formatti ng)
	14	*
	15	* Oct 24, 2010
	16	*
	17	* @author DN S
	18	*/
	19	public cla ss Formatt edDateForm {
	20	pr ivate Date date;
	21	pr ivate Stri ng formatt edDate;
	22
	23	/* *
	24	* @return t he date
	25	* /
	26	pu blic Date getDate() {
	27	retu rn date;
	28	}
	29
	30	/* *
	31	* @param da te
	32	* the date to set
	33	* /
	34	pu blic void setDate(Da te date) {
	35	this .date = da te;
	36	}
	37
	38	/* *
	39	* @return t he formatt edDate
	40	* /
	41	pu blic Strin g getForma ttedDate() {
	42	retu rn formatt edDate;
	43	}
	44
	45	/* *
	46	* @param fo rmattedDat e
	47	* the form attedDate to set
	48	* /
	49	pu blic void setFormatt edDate(Str ing format tedDate) {
	50	this .formatted Date = for mattedDate ;
	51	}
	52
	53	pu blic Forma ttedDateFo rm() {
	54	supe r();
	55	}
	56
	57	pu blic Forma ttedDateFo rm(DateWit hTimeZone dwtz) {
	58	supe r();
	59	if ( dwtz != nu ll) {
	60	setDat e(dwtz.get Date());
	61	setFor mattedDate (TimeZoneU tils.conve rtDateToTi meZone(dwt z));
	62	}
	63	}
	64	}