390. EPMO Open Source Coordination Office Redaction File Detail Report

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

390.1 Files compared

#	Location	File	Last Modified
1	v12.5_iter_7_build 51.zip\TRM_Upgrade\src\main\java\gov\va\med\fw\security	Permission.java	Fri Dec 7 17:36:20 2018 UTC
2	v12.5_iter_7_build 51.zip\TRM_Upgrade\src\main\java\gov\va\med\fw\security	Permission.java	Wed Dec 12 22:33:40 2018 UTC

390.2 Comparison summary

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

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

390.4 Active regular expressions

No regular expressions were active.

390.5 Comparison detail

	1	/******* ****** ****** ****** ****** ****** *******
	2	* Copyrii ght 2008 V HA. All ri ghts reser ved
	3	******* ****** ****** ****** ****** ****** *******/
	4	package go v.va.med.f w.security ;
	5
	6	import jav ax.persist ence.Colum n;
	7	import jav ax.persist ence.Entit y;
	8	import jav ax.persist ence.Id;
	9	import jav ax.persist ence.Table ;
	10	import jav ax.persist ence.Trans ient;
	11
	12	import gov .va.med.cc ht.model.C CHTAuditFi elds;
	13
	14	/**
	15	* Generic permissio n class de fine User Permission
	16	*
	17	* CISS ci ss_framewo rk Jun 26, 2008
	18	*
	19	* @author DNS
	20	*/
	21	@Entity
	22	@Table(sch ema="ht", name="PERM ISSION")
	23	public cla ss Permiss ion extend s CCHTAudi tFields {
	24
	25	pr ivate Long id;
	26	// Attribute s
	27	pr ivate Stri ng name;
	28	pr ivate Stri ng descrip tion;
	29
	30	@I d
	31	@C olumn(name ="PERMISSI ON_ID")
	32	pu blic Long getId() {
	33	retu rn id;
	34	}
	35
	36	pu blic void setId(Long id) {
	37	this .id = id;
	38	}
	39
	40	/* *
	41	* @return t he descrip tion
	42	* /
	43	@C olumn(name ="DESCRIPT ION")
	44	pu blic Strin g getDescr iption() {
	45	retu rn descrip tion;
	46	}
	47
	48	/* *
	49	* @param de scription
	50	* the desc ription to set
	51	* /
	52	pu blic void setDescrip tion(Strin g descript ion) {
	53	this .descripti on = descr iption;
	54	}
	55
	56	/* *
	57	* @return t he name
	58	* /
	59	@C olumn(name ="PERMISSI ON_NAME")
	60	pu blic Strin g getName( ) {
	61	retu rn name;
	62	}
	63
	64	/* *
	65	* @param na me
	66	* the name to set
	67	* /
	68	pu blic void setName(St ring name) {
	69	this .name = na me;
	70	}
	71
	72	/*
	73	* (non-Java doc)
	74	*
	75	* @see java .lang.Obje ct#hashCod e()
	76	* /
	77	@O verride
	78	pu blic int h ashCode() {
	79	fina l int PRIM E = 31;
	80	int result = s uper.hashC ode();
	81	resu lt = PRIME * result + ((name = = null) ? 0 : name.h ashCode()) ;
	82	retu rn result;
	83	}
	84
	85	/*
	86	* (non-Java doc)
	87	*
	88	* @see java .lang.Obje ct#equals( java.lang. Object)
	89	* /
	90	@O verride
	91	pu blic boole an equals( Object obj ) {
	92	if ( this == ob j)
	93	return true;
	94	if ( !super.equ als(obj))
	95	return false;
	96	if ( getClass() != obj.ge tClass())
	97	return false;
	98	fina l Permissi on other = (Permissi on) obj;
	99	if ( name == nu ll) {
	100	if (ot her.name ! = null)
	101	return f alse;
	102	} el se if (!na me.equals( other.name ))
	103	return false;
	104	retu rn true;
	105	}
	106
	107	pu blic Strin g toString () {
	108	retu rn name;
	109	}
	110	}