4153. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 6/9/2017 3:51:18 PM Eastern 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.

4153.1 Files compared

#	Location	File	Last Modified
1			Fri Jun 9 19:51:18 2017 UTC
2	eHealth_Exch (eHealth Exchange Enhancements) Build 3 docs & code_May_2017.zip\VAP_CIF_CODE0502.zip\VAP_CIF_CODE0502\VAP_CIF_CODE0502\nvap-svc-consent-mgmt\src\main\java\gov\va\nvap\svc\consentmgmt\stub\data	Descriptor.java	Fri Apr 21 20:03:30 2017 UTC

4153.2 Comparison summary

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

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

4153.4 Active regular expressions

No regular expressions were active.

4153.5 Comparison detail

				1		/*
				2		* To chan ge this li cense head er, choose License H eaders in Project Pr operties.
				3		* To chan ge this te mplate fil e, choose Tools \| Te mplates
				4		* and ope n the temp late in th e editor.
				5		*/
				6		package go v.va.nvap. svc.consen tmgmt.stub .data;
				7
				8		import jav a.io.Seria lizable;
				9		import jav ax.persist ence.Basic ;
				10		import jav ax.persist ence.Colum n;
				11		import jav ax.persist ence.Entit y;
				12		import jav ax.persist ence.Gener atedValue;
				13		import jav ax.persist ence.Gener ationType;
				14		import jav ax.persist ence.Id;
				15
				16		/**
				17		*
				18		* @author Johann So nnenberg
				19		*/
				20		@Entity
				21		public cla ss Descrip tor implem ents Seria lizable {
				22
				23		privat e static f inal long serialVers ionUID = 1 L;
				24
				25		@Id
				26		@Gener atedValue( strategy = Generatio nType.AUTO )
				27		@Basic (optional = false)
				28		@C olumn(name = "DESCRI PTOR_ID")
				29		privat e Long id;
				30
				31		@Basic (optional = false)
				32		@C olumn(name = "NAME")
				33		privat e String n ame;
				34
				35		@Basic (optional = false)
				36		@C olumn(name = "TEXT")
				37		privat e String t ext;
				38
				39		public Long getI d() {
				40		re turn id;
				41		}
				42
				43		public void setI d(Long id) {
				44		th is.id = id ;
				45		}
				46
				47		public String ge tName() {
				48		re turn name;
				49		}
				50
				51		public void setN ame(String name) {
				52		th is.name = name;
				53		}
				54
				55		public String ge tText() {
				56		re turn text;
				57		}
				58
				59		public void setT ext(String text) {
				60		th is.text = text;
				61		}
				62
				63		@Overr ide
				64		public int hashC ode() {
				65		in t hash = 0 ;
				66		ha sh += (id != null ? id.hashCod e() : 0);
				67		re turn hash;
				68		}
				69
				70		@Overr ide
				71		public boolean e quals(Obje ct object) {
				72		// TODO: War ning - thi s method w on't work in the cas e the id f ields are not set
				73		if (!(object instanceo f Descript or)) {
				74		return f alse;
				75		}
				76		De scriptor o ther = (De scriptor) object;
				77		if ((this.id == null & & other.id != null) \|\| (this.i d != null && !this.i d.equals(o ther.id))) {
				78		return f alse;
				79		}
				80		re turn true;
				81		}
				82
				83		@Overr ide
				84		public String to String() {
				85		re turn "gov. va.nvap.sv c.consentm gmt.stub.d ata.Descri ptor[ id=" + id + " ]";
				86		}
				87
				88		}