54. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 8/22/2017 3:39:50 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.

54.1 Files compared

#	Location	File	Last Modified
1	PRE-Inbound-eRx-2.0.4.056.zip\PRE-Inbound-eRx-2.0.4.056\PS_INB_ERX_Common\src\main\java\gov\va\med\pharmacy\wsclients\eAnde	MilitaryServiceSiteRecordInfo.java	Fri Aug 26 22:28:58 2016 UTC
2	PRE-Inbound-eRx-2.0.4.056.zip\PRE-Inbound-eRx-2.0.4.056\PS_INB_ERX_Common\src\main\java\gov\va\med\pharmacy\wsclients\eAnde	MilitaryServiceSiteRecordInfo.java	Tue Aug 22 16:14:45 2017 UTC

54.2 Comparison summary

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

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

54.4 Active regular expressions

No regular expressions were active.

54.5 Comparison detail

	1
	2	package go v.va.med.p harmacy.ws clients.eA nde;
	3
	4	import jav ax.xml.bin d.annotati on.XmlAcce ssType;
	5	import jav ax.xml.bin d.annotati on.XmlAcce ssorType;
	6	import jav ax.xml.bin d.annotati on.XmlType ;
	7
	8
	9	/**
	10	* <p>Java class for militaryS erviceSite RecordInfo complex t ype.
	11	*
	12	* <p>The following schema fra gment spec ifies the expected c ontent con tained wit hin this c lass.
	13	*
	14	* <pre>
	15	* <com plexType n ame="milit aryService SiteRecord Info">
	16	* <c omplexCont ent>
	17	* &lt ;restricti on base="{ http://www .w3.org/20 01/XMLSche ma}anyType ">
	18	* & lt;all>
	19	* <elemen t name="co nflictExpe riences" t ype="{http ://jaxws.w ebservices .esr. URL /schemas}c onflictExp erienceCol lection" m inOccurs=" 0"/>
	20	* <elemen t name="mi litaryServ iceEpisode s" type="{ http://jax ws.webserv ices.esr. URL /schemas}m ilitarySer viceEpisod eCollectio n" minOccu rs="0"/&gt ;
	21	* <eleme nt name="s ervicePeri od" type=" {http://ww w.w3.org/2 001/XMLSch ema}string " minOccur s="0"/>
	22	* <eleme nt name="s ite" type= "{http://w ww.w3.org/ 2001/XMLSc hema}strin g" minOccu rs="0"/&gt ;
	23	* & lt;/all&gt ;
	24	* &lt ;/restrict ion>
	25	* </ complexCon tent>
	26	* </co mplexType& gt;
	27	* </pre>
	28	*
	29	*
	30	*/
	31	@XmlAccess orType(Xml AccessType .FIELD)
	32	@XmlType(n ame = "mil itaryServi ceSiteReco rdInfo", p ropOrder = {
	33
	34	})
	35	public cla ss Militar yServiceSi teRecordIn fo {
	36
	37	protec ted Confli ctExperien ceCollecti on conflic tExperienc es;
	38	protec ted Milita ryServiceE pisodeColl ection mil itaryServi ceEpisodes ;
	39	protec ted String servicePe riod;
	40	protec ted String site;
	41
	42	/**
	43	* Get s the valu e of the c onflictExp eriences p roperty.
	44	*
	45	* @re turn
	46	* possible object is
	47	* {@link Co nflictExpe rienceColl ection }
	48	*
	49	*/
	50	public ConflictE xperienceC ollection getConflic tExperienc es() {
	51	re turn confl ictExperie nces;
	52	}
	53
	54	/**
	55	* Set s the valu e of the c onflictExp eriences p roperty.
	56	*
	57	* @pa ram value
	58	* allowed o bject is
	59	* {@link Co nflictExpe rienceColl ection }
	60	*
	61	*/
	62	public void setC onflictExp eriences(C onflictExp erienceCol lection va lue) {
	63	th is.conflic tExperienc es = value ;
	64	}
	65
	66	/**
	67	* Get s the valu e of the m ilitarySer viceEpisod es propert y.
	68	*
	69	* @re turn
	70	* possible object is
	71	* {@link Mi litaryServ iceEpisode Collection }
	72	*
	73	*/
	74	public MilitaryS erviceEpis odeCollect ion getMil itaryServi ceEpisodes () {
	75	re turn milit aryService Episodes;
	76	}
	77
	78	/**
	79	* Set s the valu e of the m ilitarySer viceEpisod es propert y.
	80	*
	81	* @pa ram value
	82	* allowed o bject is
	83	* {@link Mi litaryServ iceEpisode Collection }
	84	*
	85	*/
	86	public void setM ilitarySer viceEpisod es(Militar yServiceEp isodeColle ction valu e) {
	87	th is.militar yServiceEp isodes = v alue;
	88	}
	89
	90	/**
	91	* Get s the valu e of the s ervicePeri od propert y.
	92	*
	93	* @re turn
	94	* possible object is
	95	* {@link St ring }
	96	*
	97	*/
	98	public String ge tServicePe riod() {
	99	re turn servi cePeriod;
	100	}
	101
	102	/**
	103	* Set s the valu e of the s ervicePeri od propert y.
	104	*
	105	* @pa ram value
	106	* allowed o bject is
	107	* {@link St ring }
	108	*
	109	*/
	110	public void setS ervicePeri od(String value) {
	111	th is.service Period = v alue;
	112	}
	113
	114	/**
	115	* Get s the valu e of the s ite proper ty.
	116	*
	117	* @re turn
	118	* possible object is
	119	* {@link St ring }
	120	*
	121	*/
	122	public String ge tSite() {
	123	re turn site;
	124	}
	125
	126	/**
	127	* Set s the valu e of the s ite proper ty.
	128	*
	129	* @pa ram value
	130	* allowed o bject is
	131	* {@link St ring }
	132	*
	133	*/
	134	public void setS ite(String value) {
	135	th is.site = value;
	136	}
	137
	138	}