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

114.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	DeviceType.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	DeviceType.java	Wed Dec 12 22:33:38 2018 UTC

114.2 Comparison summary

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

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

114.4 Active regular expressions

No regular expressions were active.

114.5 Comparison detail

	1	package go v.va.med.c cht.model. common;
	2
	3	import jav ax.persist ence.Attri buteOverri de;
	4	import jav ax.persist ence.Colum n;
	5	import jav ax.persist ence.Entit y;
	6	import jav ax.persist ence.Gener atedValue;
	7	import jav ax.persist ence.Gener ationType;
	8	import jav ax.persist ence.Id;
	9	import jav ax.persist ence.JoinC olumn;
	10	import jav ax.persist ence.ManyT oOne;
	11	import jav ax.persist ence.Table ;
	12
	13	import gov .va.med.fw .model.loo kup.Abstra ctLookup;
	14
	15	/**
	16	* @author DNS
	17	*
	18	*/
	19	@Entity
	20	@Table(sch ema="dbo", name="MED ICAL_DEVIC E_MODEL_TY PE")
	21	@Attribute Override(n ame = "id" , column = @Column(n ame = "ID" ))
	22	public cla ss DeviceT ype extend s Abstract Lookup {
	23
	24	pr ivate stat ic final l ong serial VersionUID = 1408398 3268254235 66L;
	25
	26	pu blic stati c final St ring NULL_ DEVICE_NAM E = "{none }";
	27
	28	pr ivate Long id;
	29	pr ivate Vend or vendor;
	30
	31	@I d
	32	@C olumn(name = "ID")
	33	@G eneratedVa lue(strate gy=Generat ionType.ID ENTITY)
	34	pu blic Long getId() {
	35	retu rn this.id ;
	36	}
	37
	38	pu blic void setId(Long id) {
	39	this .id = id;
	40	}
	41
	42	@M anyToOne(t argetEntit y=Vendor.c lass)
	43	@J oinColumn( name="VEND OR_ID")
	44	pu blic Vendo r getVendo r() {
	45	retu rn vendor;
	46	}
	47	pu blic void setVendor( Vendor ven dor) {
	48	this .vendor = vendor;
	49	}
	50
	51	pu blic Strin g toString ()
	52	{
	53	retu rn getName ();
	54	}
	55	}