9. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 7/20/2018 12:56:39 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.

9.1 Files compared

#	Location	File	Last Modified
1	CTT_Release_8_June_2018.zip\CTT_ISAAC\hl7-messaging\src\main\java\gov\vha\isaac\ochre\access\maint\deployment\dto	SiteDTO.java	Tue Jul 17 16:29:28 2018 UTC
2	CTT_Release_8_June_2018.zip\CTT_ISAAC\hl7-messaging\src\main\java\gov\vha\isaac\ochre\access\maint\deployment\dto	SiteDTO.java	Wed Jul 18 19:04:32 2018 UTC

9.2 Comparison summary

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

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

9.4 Active regular expressions

No regular expressions were active.

9.5 Comparison detail

	1	/**
	2	* Copyrig ht Notice
	3	*
	4	* This is a work of the U.S. Government and is no t subject to copyrig ht
	5	* protect ion in the United St ates. Fore ign copyri ghts may a pply.
	6	*
	7	* License d under th e Apache L icense, Ve rsion 2.0 (the "Lice nse");
	8	* you may not use t his file e xcept in c ompliance with the L icense.
	9	* You may obtain a copy of th e License at
	10	*
	11	* http:// www.apache .org/licen ses/LICENS E-2.0
	12	*
	13	* Unless required b y applicab le law or agreed to in writing , software
	14	* distrib uted under the Licen se is dist ributed on an "AS IS " BASIS,
	15	* WITHOUT WARRANTIE S OR CONDI TIONS OF A NY KIND, e ither expr ess or imp lied.
	16	* See the License f or the spe cific lang uage gover ning permi ssions and
	17	* limitat ions under the Licen se.
	18	*/
	19	package go v.vha.isaa c.ochre.ac cess.maint .deploymen t.dto;
	20
	21	import jav a.io.Seria lizable;
	22
	23	/**
	24	* @author PI I
	25	*/
	26
	27	public cla ss SiteDTO implement s Serializ able, Comp arable<Sit e>, Site
	28	{
	29	pr ivate long id;
	30	pr ivate Stri ng name;
	31	pr ivate Stri ng vaSiteI d;
	32	pr ivate Stri ng type;
	33	pr ivate Stri ng groupNa me;
	34	pr ivate Stri ng message Type;
	35
	36	/* (non-Java doc)
	37	* @see gov. vha.isaac. ochre.acce ss.maint.d eployment. dto.Site#g etId()
	38	* /
	39	@O verride
	40	pu blic long getId() {
	41	retu rn id;
	42	}
	43
	44	/* (non-Java doc)
	45	* @see gov. vha.isaac. ochre.acce ss.maint.d eployment. dto.Site#s etId(long)
	46	* /
	47	@O verride
	48	pu blic void setId(long id) {
	49	this .id = id;
	50	}
	51
	52	/* (non-Java doc)
	53	* @see gov. vha.isaac. ochre.acce ss.maint.d eployment. dto.Site#g etGroupNam e()
	54	* /
	55	@O verride
	56	pu blic Strin g getGroup Name() {
	57	retu rn groupNa me;
	58	}
	59
	60	/* (non-Java doc)
	61	* @see gov. vha.isaac. ochre.acce ss.maint.d eployment. dto.Site#s etGroupNam e(java.lan g.String)
	62	* /
	63	@O verride
	64	pu blic void setGroupNa me(String groupName) {
	65	this .groupName = groupNa me;
	66	}
	67
	68	/* (non-Java doc)
	69	* @see gov. vha.isaac. ochre.acce ss.maint.d eployment. dto.Site#g etName()
	70	* /
	71	@O verride
	72	pu blic Strin g getName( ) {
	73	retu rn name;
	74	}
	75
	76	/* (non-Java doc)
	77	* @see gov. vha.isaac. ochre.acce ss.maint.d eployment. dto.Site#s etName(jav a.lang.Str ing)
	78	* /
	79	@O verride
	80	pu blic void setName(St ring name) {
	81	this .name = na me;
	82	}
	83
	84	/* (non-Java doc)
	85	* @see gov. vha.isaac. ochre.acce ss.maint.d eployment. dto.Site#g etType()
	86	* /
	87	@O verride
	88	pu blic Strin g getType( ) {
	89	retu rn type;
	90	}
	91
	92	/* (non-Java doc)
	93	* @see gov. vha.isaac. ochre.acce ss.maint.d eployment. dto.Site#s etType(jav a.lang.Str ing)
	94	* /
	95	@O verride
	96	pu blic void setType(St ring type) {
	97	this .type = ty pe;
	98	}
	99
	100	/* (non-Java doc)
	101	* @see gov. vha.isaac. ochre.acce ss.maint.d eployment. dto.Site#g etVaSiteId ()
	102	* /
	103	@O verride
	104	pu blic Strin g getVaSit eId() {
	105	retu rn vaSiteI d;
	106	}
	107
	108	/* (non-Java doc)
	109	* @see gov. vha.isaac. ochre.acce ss.maint.d eployment. dto.Site#s etVaSiteId (java.lang .String)
	110	* /
	111	@O verride
	112	pu blic void setVaSiteI d(String v aSiteId) {
	113	this .vaSiteId = vaSiteId ;
	114	}
	115
	116	/* (non-Java doc)
	117	* @see gov. vha.isaac. ochre.acce ss.maint.d eployment. dto.Site#g etMessageT ype()
	118	* /
	119	@O verride
	120	pu blic Strin g getMessa geType() {
	121	retu rn message Type;
	122	}
	123
	124	/* (non-Java doc)
	125	* @see gov. vha.isaac. ochre.acce ss.maint.d eployment. dto.Site#s etMessageT ype(java.l ang.String )
	126	* /
	127	@O verride
	128	pu blic void setMessage Type(Strin g messageT ype) {
	129	this .messageTy pe = messa geType;
	130	}
	131
	132	/* (non-Java doc)
	133	* @see java .lang.Comp arable#com pareTo(jav a.lang.Obj ect)
	134	* /
	135	/* (non-Java doc)
	136	* @see gov. vha.isaac. ochre.acce ss.maint.d eployment. dto.Site#c ompareTo(g ov.vha.isa ac.ochre.a ccess.main t.deployme nt.dto.Sit eDTO)
	137	* /
	138	@O verride
	139	pu blic int c ompareTo(S ite site) {
	140	retu rn this.ge tName().co mpareTo(si te.getName ());
	141	}
	142
	143	// Comparable <SiteDTO>. compareTo( SiteDTO)
	144	}