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

413.1 Files compared

#	Location	File	Last Modified
1	IV-eHMP_CIF.zip\IMAG_Source\VISA\Java\VixCacheWebApp\main\src\gov\va\med\imaging\cache	InstanceVO.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	InstanceVO.java	Mon Dec 4 22:07:19 2017 UTC

413.2 Comparison summary

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

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

413.4 Active regular expressions

No regular expressions were active.

413.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.Sor tedSet;
	8
	9	/**
	10	* @author BECKEC
	11	*
	12	*/
	13	public cla ss Instanc eVO
	14	extends Ab stractName dVO
	15	implements Serializa ble
	16	{
	17	pr ivate stat ic final l ong serialVers ionUID = 1L;
	18	pr ivate Stri ng semanti cTypeName;
	19	pr ivate Cach eInstanceM etadata me tadata = n ull;
	20	pr ivate Cach eItemPath path = nul l;
	21
	22	pu blic Insta nceVO(){}
	23
	24	pu blic Insta nceVO(Stri ng name, C acheInstan ceMetadata metadata, String se manticType Name)
	25	{
	26	supe r(name);
	27	this .metadata = metadata ;
	28	this .semanticT ypeName = semanticTy peName;
	29	}
	30
	31	pu blic Insta nceVO(Stri ng name, C acheInstan ceMetadata metadata, String se manticType Name, Cach eItemPath path)
	32	{
	33	supe r(name);
	34	this .metadata = metadata ;
	35	this .semanticT ypeName = semanticTy peName;
	36	this .path = pa th;
	37	}
	38
	39	pu blic Cache InstanceMe tadata get Metadata() {
	40	retu rn metadat a;
	41	}
	42
	43	pu blic void setMetadat a(CacheIns tanceMetad ata metada ta) {
	44	this .metadata = metadata ;
	45	}
	46
	47	/* *
	48	* Indicates a semanti c to be ap plied to t his group, the speci fics are d ependent o n the
	49	* individua l caches, the UI wil l use this as a CSS style name .
	50	* @return
	51	* /
	52	pu blic Strin g getSeman ticTypeNam e() {retur n semantic TypeName;}
	53	pu blic void setSemanti cTypeName( String sem anticTypeN ame) {this .semanticT ypeName = semanticTy peName;}
	54
	55	@O verride
	56	pu blic void merge(Abst ractNamedV O other)
	57	th rows Merge Exception
	58	{
	59	if(o ther insta nceof Inst anceVO)
	60	{
	61	if(thi s.getMetad ata() == n ull && ((I nstanceVO) other).get Metadata() != null)
	62	this.set Metadata( ((Instance VO)other). getMetadat a() );
	63
	64	super. merge(othe r);
	65	}
	66	else
	67	throw new MergeE xception(" InstanceVO is unable to merge with '" + other.toSt ring() + " '.");
	68	}
	69
	70
	71	@O verride
	72	pu blic Cache ItemPath g etPath()
	73	{
	74	if ( path != nu ll)
	75	return path;
	76	else if( getPa rent() != null )
	77	{
	78	CacheI temPath pa rentPath = getParent ().getPath ();
	79	path = parentPat h.createCh ildPath(th is.getName (), false) ;
	80	return path;
	81	}
	82	else
	83	{
	84	logger .error( "I nstanceVO. getParent( ) returns null." );
	85	return null;
	86	}
	87	}
	88
	89	@O verride
	90	pu blic int g etChildCou nt(){retur n 0;}
	91
	92	@O verride
	93	pu blic Abstr actNamedVO childWith Name(Strin g name)
	94	{
	95	retu rn null;
	96	}
	97
	98	@O verride
	99	pu blic boole an removeC hild(Abstr actNamedVO child){re turn false ;}
	100
	101	@O verride
	102	pu blic Sorte dSet<Abstr actNamedVO > getChild ren()
	103	{
	104	retu rn null;
	105	}
	106	}