406. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 12/5/2017 12:06:51 PM Central 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.

406.1 Files compared

#	Location	File	Last Modified
1	IV-eHMP_CIF.zip\IMAG_Source\VISA\Java\VixCacheWebApp\main\src\gov\va\med\imaging\cache	AbstractGroupParent.java	Mon Dec 4 21:34:28 2017 UTC
2	IV-eHMP_CIF.zip\IMAG_Source\VISA\Java\VixCacheWebApp\main\src\gov\va\med\imaging\cache	AbstractGroupParent.java	Mon Dec 4 22:07:16 2017 UTC

406.2 Comparison summary

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

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

406.4 Active regular expressions

No regular expressions were active.

406.5 Comparison detail

	1	/**
	2	*
	3	*/
	4	package go v.va.med.i maging.cac he;
	5
	6	import jav a.io.Seria lizable;
	7	import jav a.util.Col lection;
	8	import jav a.util.Ite rator;
	9	import jav a.util.Sor tedSet;
	10	import jav a.util.Tre eSet;
	11
	12	/**
	13	* @author BECKEC
	14	*
	15	*/
	16	public abs tract clas s Abstract GroupParen t
	17	extends Ab stractName dVO
	18	implements Serializa ble
	19	{
	20	pr ivate stat ic final l ong serialVers ionUID = 1L;
	21	So rtedSet<Gr oupVO> gro ups = new TreeSet<Gr oupVO>();
	22
	23	pu blic Abstr actGroupPa rent(){}
	24
	25	pu blic Abstr actGroupPa rent(Strin g name)
	26	{
	27	supe r(name);
	28	}
	29
	30	pu blic boole an add(Gro upVO group ){return g roups.add( group);}
	31	pu blic boole an addAll( Collection <GroupVO> groupColle ction){ret urn groups .addAll(gr oupCollect ion);}
	32
	33	pu blic boole an remove( GroupVO gr oup){retur n groups.r emove(grou p);}
	34	pu blic boole an removeA ll(Collect ion<GroupV O> groupCo llection){ return gro ups.remove All(groupC ollection) ;}
	35
	36	pu blic Itera tor<GroupV O> iterato r(){return groups.it erator();}
	37
	38	pu blic int g etGroupCou nt(){retur n this.gro ups.size() ;}
	39
	40	pu blic Sorte dSet<Group VO> getGro ups()
	41	{
	42	retu rn this.gr oups;
	43	}
	44
	45	@O verride
	46	pu blic void merge(Abst ractNamedV O other)
	47	th rows Merge Exception
	48	{
	49	if(o ther insta nceof Abst ractGroupP arent)
	50	{
	51	super. merge(othe r);
	52	mergeC ollections (this, thi s.groups, ((Abstract GroupParen t)other).g roups);
	53	}
	54	else
	55	{
	56	String msg = "Ab stractGrou pParent is unable to merge '" + other.to String() + "'";
	57	logger .error(msg );
	58	throw new MergeE xception(m sg);
	59	}
	60	}
	61	}