101. EPMO Open Source Coordination Office Redaction File Detail Report

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

101.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	LuckyType.java	Thu Jun 29 17:22:01 2017 UTC
2	C:\AraxisMergeCompare\Pri_re\IV-ehmp_cif\MIXCommon\main\src\java\gov\va\med\imaging\mix\webservices\rest\types\v1	LuckyType.java	Thu Jul 6 15:04:02 2017 UTC

101.2 Comparison summary

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

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

101.4 Active regular expressions

No regular expressions were active.

101.5 Comparison detail

	1	/**
	2	*
	3	*/
	4	package go v.va.med.i maging.mix .webservic es.rest.ty pes.v1;
	5
	6	// import gov.va.med .imaging.e xchange.bu siness.Com parableUti l;
	7	// import java.io.Se rializable ;
	8
	9	import jav ax.xml.bin d.annotati on.XmlRoot Element;
	10
	11	// import org.apache .log4j.Log ger;
	12
	13	/**
	14	* @author DNS TITTOC
	15	*
	16	* This is a test
	17	*/
	18	@XmlRootEl ement (nam e="Lucky")
	19	public cla ss LuckyTy pe
	20	{
	21	// pr ivate stat ic final l ong serial VersionUID = -402941 6178345334 605L;
	22	// pr ivate fina l static L ogger logg er = Logge r.getLogge r(Instance .class);
	23
	24	pr otected St ring word; // defaul t is ""
	25	protec ted Intege r number; // default is 0
	26	pr otected St ring messa ge; // def ault is ""
	27
	28	pu blic Lucky Type()
	29	{
	30	word = message = "";
	31	numb er=0;
	32	}
	33
	34	public LuckyType (String w ord, Integ er number, String me sg)
	35	{
	36	th is.setNumb er(number) ;
	37	th is.setWord (word);
	38	th is.setMess age(mesg);
	39	}
	40
	41
	42	public Integer g etNumber() {
	43	retu rn this.nu mber;
	44	}
	45
	46	pu blic void setNumber( Integer nu mber) {
	47	this .number = number;
	48	}
	49
	50	public String ge tWord() {
	51	re turn this. word;
	52	}
	53
	54	public void setW ord(String word) {
	55	th is.word = word;
	56	}
	57
	58	publi c String g etMessage( ) {
	59	re turn this. message;
	60	}
	61
	62	publi c void set Message(St ring messa ge) {
	63	th is.message = message ;
	64	}
	65
	66	}