21. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 6/18/2018 3:36:59 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.

21.1 Files compared

#	Location	File	Last Modified
1	CTT_DM2_v7.zip\CTT_ISAAC\hl7-messaging\src\main\java\gov\vha\isaac\ochre\services\terminology	DependentSubsetRule.java	Tue Jun 12 16:42:14 2018 UTC
2	CTT_DM2_v7.zip\CTT_ISAAC\hl7-messaging\src\main\java\gov\vha\isaac\ochre\services\terminology	DependentSubsetRule.java	Thu Jun 14 16:19:12 2018 UTC

21.2 Comparison summary

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

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

21.4 Active regular expressions

No regular expressions were active.

21.5 Comparison detail

	1	/*
	2	* Created on May 10 , 2006
	3	*
	4	*/
	5	package go v.vha.isaa c.ochre.se rvices.ter minology;
	6
	7	import jav a.io.Seria lizable;
	8
	9	/**
	10	* @author PII
	11	*
	12	*/
	13	public cla ss Depende ntSubsetRu le impleme nts Serial izable
	14	{
	15	protec ted String subsetNam e;
	16	protec ted String relations hipName;
	17
	18	/**
	19	* @pa ram subset Name
	20	* @pa ram relati onshipName
	21	*/
	22	public Dependent SubsetRule (String su bsetName, String rel ationshipN ame)
	23	{
	24	th is.subsetN ame = subs etName;
	25	th is.relatio nshipName = relation shipName;
	26	}
	27
	28	/**
	29	* @re turn Retur ns the sub setName.
	30	*/
	31	public String ge tSubsetNam e()
	32	{
	33	re turn subse tName;
	34	}
	35
	36	/**
	37	* @pa ram subset Name The s ubsetName to set.
	38	*/
	39	public void setS ubsetName( String sub setName)
	40	{
	41	th is.subsetN ame = subs etName;
	42	}
	43
	44	/**
	45	* @re turn Retur ns the rel ationshipN ame.
	46	*/
	47	public String ge tRelations hipName()
	48	{
	49	re turn relat ionshipNam e;
	50	}
	51
	52	/**
	53	* @pa ram relati onshipName The relat ionshipNam e to set.
	54	*/
	55	public void setR elationshi pName(Stri ng relatio nshipName)
	56	{
	57	th is.relatio nshipName = relation shipName;
	58	}
	59	}