24. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 7/10/2017 1:01:42 PM Central 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.

24.1 Files compared

#	Location	File	Last Modified
1	C:\AraxisMergeCompare\Pri_un\IV-ehmp_cif\CoreValueObjects\main\src\java\gov\va\med\imaging\mix\business	SeriesComparator.java	Thu Jun 29 17:22:22 2017 UTC
2	C:\AraxisMergeCompare\Pri_re\IV-ehmp_cif\CoreValueObjects\main\src\java\gov\va\med\imaging\mix\business	SeriesComparator.java	Thu Jul 6 15:00:09 2017 UTC

24.2 Comparison summary

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

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

24.4 Active regular expressions

No regular expressions were active.

24.5 Comparison detail

	1	package go v.va.med.i maging.mix .business;
	2
	3	import gov .va.med.im aging.mix. business.f hir.Series ;
	4
	5	import jav a.io.Seria lizable;
	6	import jav a.util.Com parator;
	7
	8	/**
	9	*
	10	* A Compa rator clas s to assur e that the Study rem ains in or der of ien relation
	11	*
	12	* @author DNS TITTOC
	13	*
	14	*/
	15	public cla ss SeriesC omparator implements Comparato r<Series>, Serializa ble {
	16
	17	pr ivate stat ic final l ong serial VersionUID = 4739063 6356417770 02L;
	18
	19	pu blic int c ompare(Ser ies series 1, Series series2)
	20	{
	21	// J MW 3/12/08 - reversi ng the ord er of the sorts (was causing t he series to be in d escending order inst ead of asc ending)
	22	int ienRelatio n = series 1.getSerie sIen().com pareTo(ser ies2.getSe riesIen()) ;
	23	int numberRela tion = 0;
	24	int seriesUidR elation = series1.ge tUid().com pareTo(ser ies2.getUi d());
	25
	26	try
	27	{
	28	Intege r series1N umber = In teger.pars eInt(serie s1.getNumb er());
	29	Intege r series2N umber = In teger.pars eInt(serie s2.getNumb er());
	30	number Relation = series1Nu mber.compa reTo(serie s2Number);
	31	}
	32	catc h(Exceptio n ex)
	33	{
	34	if(ser ies1.getNu mber() != null)
	35	{
	36	numberRe lation = s eries1.get Number().c ompareTo(s eries2.get Number());
	37	}
	38	}
	39
	40	retu rn numberR elation != 0 ? numbe rRelation :
	41	ienRel ation != 0 ? ienRela tion :
	42	seriesUi dRelation;
	43	/*
	44	retu rn ienRela tion != 0 ? ienRelat ion :
	45	series UidRelatio n != 0 ? s eriesUidRe lation :
	46	numberRe lation;
	47	*/
	48	}
	49	}