117. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 7/10/2017 1:01:46 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.

117.1 Files compared

#	Location	File	Last Modified
1	C:\AraxisMergeCompare\Pri_un\IV-ehmp_cif\MIXCommon\main\src\java\gov\va\med\imaging\mix\webservices\rest\types\v1	TextType.java	Thu Jun 29 17:22:02 2017 UTC
2	C:\AraxisMergeCompare\Pri_re\IV-ehmp_cif\MIXCommon\main\src\java\gov\va\med\imaging\mix\webservices\rest\types\v1	TextType.java	Thu Jul 6 15:04:09 2017 UTC

117.2 Comparison summary

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

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

117.4 Active regular expressions

No regular expressions were active.

117.5 Comparison detail

	1	/**
	2	*
	3	*/
	4	package go v.va.med.i maging.mix .webservic es.rest.ty pes.v1;
	5
	6	import jav ax.xml.bin d.annotati on.XmlRoot Element;
	7
	8	/**
	9	* @author DNS TITTOC
	10	*
	11	*/
	12	@XmlRootEl ement
	13	public cla ss TextTyp e
	14	{
	15	pr otected St ring statu s;
	16	pr otected St ring div;
	17
	18	pu blic TextT ype(String status, S tring div)
	19	{
	20	this .status = status;
	21	this .div = div ;
	22	}
	23
	24	pu blic Strin g getStatu s() {
	25	retu rn status;
	26	}
	27
	28
	29	pu blic void setStatus( String sta tus) {
	30	this .status = status;
	31	}
	32
	33
	34	pu blic Strin g getDiv() {
	35	retu rn div;
	36	}
	37
	38
	39	pu blic void setDiv(Str ing div) {
	40	this .div = div ;
	41	}
	42
	43
	44
	45	}