3191. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 6/9/2017 3:49:56 PM Eastern Daylight 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.

3191.1 Files compared

#	Location	File	Last Modified
1			Fri Jun 9 19:49:56 2017 UTC
2	eHealth_Exch (eHealth Exchange Enhancements) Build 3 docs & code_May_2017.zip\VAP_CIF_CODE0502.zip\VAP_CIF_CODE0502\VAP_CIF_CODE0502\nvap-common\src\main\java\gov\va\nvap\common\date\hl7	HL7DateUtil.java	Fri Apr 21 20:03:26 2017 UTC

3191.2 Comparison summary

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

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

3191.4 Active regular expressions

No regular expressions were active.

3191.5 Comparison detail

				1		package go v.va.nvap. common.dat e.hl7;
				2
				3		import gov .va.nvap.c ommon.vali dation.Nul lChecker;
				4
				5		import jav a.text.Par seExceptio n;
				6		import jav a.text.Sim pleDateFor mat;
				7		import jav a.util.Dat e;
				8
				9		/**
				10		* Utility for date and time.
				11		*
				12		* @author Asha Amri traj
				13		*/
				14		public cla ss HL7Date Util {
				15
				16		pu blic stati c Date dat eFromStrin g(final St ring s) th rows Parse Exception {
				17
				18		if ( NullChecke r.isEmpty( s)) {
				19		return null;
				20		}
				21		Date date = nu ll;
				22		Simp leDateForm at ofd = n ull;
				23		try {
				24		// 199 2060313143 8-0500
				25		//ofd = new Simp leDateForm at("yyyyMM ddhhmmssZ" );
				26		ofd = new Simple DateFormat ("yyyyMMdd kkmmssZ");
				27		date = ofd.parse (s);
				28		return date;
				29		} ca tch (final ParseExce ption ex) {
				30		}
				31		retu rn date;
				32		}
				33
				34		pu blic stati c String y yyyMMddhhm mssZ(final Date date ) throws P arseExcept ion {
				35
				36		if ( NullChecke r.isEmpty( date)) {
				37		return null;
				38		}
				39		//fi nal Simple DateFormat ofd = new SimpleDat eFormat("y yyyMMddhhm mssZ");
				40		fina l SimpleDa teFormat o fd = new S impleDateF ormat("yyy yMMddkkmms sZ");
				41		fina l String d ateString = ofd.form at(date);
				42		retu rn dateStr ing;
				43		}
				44
				45		}