322. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 6/11/2019 10:54:16 AM 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.

322.1 Files compared

#	Location	File	Last Modified
1	HTRE_P3_v14.5_iter_4_build_14.zip\java\gov\va\med\fw\service	ServiceOptimisticLockException.java	Wed May 29 15:26:02 2019 UTC
2	HTRE_P3_v14.5_iter_4_build_14.zip\java\gov\va\med\fw\service	ServiceOptimisticLockException.java	Tue Jun 11 13:01:48 2019 UTC

322.2 Comparison summary

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

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

322.4 Active regular expressions

No regular expressions were active.

322.5 Comparison detail

	1	/*
	2	* Created on Apr 12 , 2005
	3	*
	4	* TODO To change th e template for this generated file go to
	5	* Window - Preferen ces - Java - Code St yle - Code Templates
	6	*/
	7	package go v.va.med.f w.service;
	8
	9	//Framewor k classes
	10	import gov .va.med.fw .model.Abs tractKeyed Entity;
	11
	12	/**
	13	* @author D N S
	14	*
	15	* TODO To c hange the template f or this ge nerated ty pe comment go to
	16	* Window - Preference s - Java - Code Styl e - Code T emplates
	17	*/
	18	public cla ss Service Optimistic LockExcept ion extend s ServiceE xception {
	19
	20	pr ivate stat ic final l ong serial VersionUID = 4458957 6077088471 32L;
	21
	22	pu blic stati c final St ring IDENT ITY_CHANGE D_ERROR = "IDENTITY_ CHANGED_ER ROR";
	23	pu blic stati c final St ring DATA_ CHANGED_ER ROR = "DAT A_CHANGED_ ERROR";
	24	pu blic stati c final St ring PATIE NT_DATA_CH ANGED_ERRO R = "PATIE NT_DATA_CH ANGED_ERRO R";
	25	pu blic stati c final St ring PATIE NT_RECONCI LE_DATA_CH ANGED_ERRO R = "PATIE NT_RECONCI LE_DATA_CH ANGED_ERRO R";
	26	pu blic stati c final St ring USER_ DATA_CHANG ED_ERROR = "USER_DAT A_CHANGED_ ERROR";
	27	pu blic stati c final St ring ROLE_ DATA_CHANG ED_ERROR = "ROLE_DAT A_CHANGED_ ERROR";
	28
	29	pr ivate Abst ractKeyedE ntity enti ty = null;
	30	pr ivate Stri ng errorTy pe;
	31
	32	/* *
	33	*
	34	* /
	35	pu blic Servi ceOptimist icLockExce ption() {
	36	supe r();
	37	// T ODO Auto-g enerated c onstructor stub
	38	}
	39
	40	/* *
	41	* Construct s an <code >ServiceEx ception</c ode> with the specif ied detail
	42	* message.
	43	*
	44	* @param ms g
	45	* the deta il message .
	46	* /
	47	pu blic Servi ceOptimist icLockExce ption(Stri ng msg) {
	48	supe r(msg);
	49	}
	50
	51	/* *
	52	* Construct s an <code >ServiceEx ception</c ode> with the specif ied detail
	53	* message c aused exce ption and the entity caused th e exceptio n
	54	*
	55	* @param ms g
	56	* the deta il message .
	57	* @param en ity
	58	* that cau sed the ex ception
	59	* /
	60	pu blic Servi ceOptimist icLockExce ption(Stri ng msg, Ab stractKeye dEntity en tity) {
	61	supe r(msg);
	62	this .entity = entity;
	63	}
	64
	65	/* *
	66	* Construct s an <code >ServiceEx ception</c ode> with the specif ied detail
	67	* message a nd a cause d exceptio n
	68	*
	69	* @param ms g
	70	* the deta il message .
	71	* @param ca use
	72	* the caus ed excepti on
	73	* /
	74	pu blic Servi ceOptimist icLockExce ption(Stri ng msg, Th rowable ca use) {
	75	supe r(msg, cau se);
	76	}
	77
	78	/* *
	79	* Construct s an <code >ServiceEx ception</c ode> with the specif ied detail
	80	* message c aused exce ption and the entity caused th e exceptio n
	81	*
	82	* @param ms g
	83	* the deta il message .
	84	* @param ca use
	85	* the caus ed excepti on
	86	* @param en ity
	87	* that cau sed the ex ception
	88	* /
	89	pu blic Servi ceOptimist icLockExce ption(Stri ng msg, Th rowable ca use, Abstr actKeyedEn tity entit y) {
	90	supe r(msg, cau se);
	91	this .entity = entity;
	92	}
	93
	94	pu blic Strin g getError Type() {
	95	retu rn errorTy pe;
	96	}
	97
	98	pu blic void setErrorTy pe(String errorType) {
	99	this .errorType = errorTy pe;
	100	}
	101
	102	/* *
	103	* returns t he entity that cause d the exce ption
	104	*
	105	* @return
	106	* /
	107	pu blic Abstr actKeyedEn tity getEn tity() {
	108	retu rn entity;
	109	}
	110
	111	/* *
	112	* Set the e ntity that caused th e exceptio n
	113	*
	114	* @param en tity
	115	* /
	116	pu blic void setEntity( AbstractKe yedEntity entity) {
	117	this .entity = entity;
	118	}
	119	}