112. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 12/13/2018 10:35:22 AM Eastern Standard 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.

112.1 Files compared

#	Location	File	Last Modified
1	v12.5_iter_7_build 51.zip\TRM_Upgrade\src\main\java\gov\va\med\ccht\model\common	DeviceInventory.java	Fri Dec 7 17:36:34 2018 UTC
2	v12.5_iter_7_build 51.zip\TRM_Upgrade\src\main\java\gov\va\med\ccht\model\common	DeviceInventory.java	Wed Dec 12 22:33:38 2018 UTC

112.2 Comparison summary

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

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

112.4 Active regular expressions

No regular expressions were active.

112.5 Comparison detail

	1	/**
	2	*
	3	*/
	4	package go v.va.med.c cht.model. common;
	5
	6	import gov .va.med.fw .model.Abs tractKeyed Entity;
	7
	8	/**
	9	* @author DNS
	10	*
	11	*/
	12	public cla ss DeviceI nventory e xtends Abs tractKeyed Entity<Obj ect> {
	13
	14	pr ivate stat ic final l ong serial VersionUID = 6710571 1015699088 14L;
	15
	16	pr ivate Simp leFacility facility = null;
	17	pr ivate Devi ceType dev iceType = null;
	18	pr ivate Inte ger device sOnHand = 0;
	19
	20	pu blic Simpl eFacility getFacilit y() {
	21	retu rn facilit y;
	22	}
	23	pu blic void setFacilit y(SimpleFa cility fac ility) {
	24	this .facility = facility ;
	25	}
	26	pu blic Devic eType getD eviceType( ) {
	27	retu rn deviceT ype;
	28	}
	29	pu blic void setDeviceT ype(Device Type devic eType) {
	30	this .deviceTyp e = device Type;
	31	}
	32	pu blic Integ er getDevi cesOnHand( ) {
	33	retu rn devices OnHand;
	34	}
	35	pu blic void setDevices OnHand(Int eger devic esOnHand) {
	36	this .devicesOn Hand = dev icesOnHand ;
	37	}
	38
	39	}