75. EPMO Open Source Coordination Office Redaction File Detail Report

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

75.1 Files compared

#	Location	File	Last Modified
1	IV-eHMP_CIF.zip\IMAG_Source\VISA\Java\CacheWeb\src\gov\va\med\cache\gui\shared	AbstractGroupParent.java	Mon Dec 4 21:34:22 2017 UTC
2	IV-eHMP_CIF.zip\IMAG_Source\VISA\Java\CacheWeb\src\gov\va\med\cache\gui\shared	AbstractGroupParent.java	Mon Dec 4 21:58:02 2017 UTC

75.2 Comparison summary

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

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

75.4 Active regular expressions

No regular expressions were active.

75.5 Comparison detail

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