336. EPMO Open Source Coordination Office Redaction File Detail Report

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

336.1 Files compared

#	Location	File	Last Modified
1	v12.5_iter_7_build 51.zip\TRM_Upgrade\src\main\java\gov\va\med\fw\report	ReportExportedType.java	Fri Dec 7 17:36:22 2018 UTC
2	v12.5_iter_7_build 51.zip\TRM_Upgrade\src\main\java\gov\va\med\fw\report	ReportExportedType.java	Wed Dec 12 19:46:45 2018 UTC

336.2 Comparison summary

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

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

336.4 Active regular expressions

No regular expressions were active.

336.5 Comparison detail

	1	/******* ****** ****** ****** ****** ****** *******
	2	* Copyrii ght 2004 V HA. All ri ghts reser ved
	3	******* ****** ****** ****** ****** ****** *******/
	4	// Package
	5	package go v.va.med.f w.report;
	6
	7	import jav a.io.Seria lizable;
	8	import jav a.util.Com parator;
	9
	10	import jav ax.persist ence.Entit y;
	11	import jav ax.persist ence.Table ;
	12
	13	import gov .va.med.fw .model.loo kup.Abstra ctCode;
	14	import gov .va.med.fw .model.loo kup.Abstra ctLookup;
	15
	16	/**
	17	*
	18	*
	19	* Project : Framewor k</br> Cre ated on: 1 0:42:15 AM </br>
	20	*
	21	* @author DN S
	22	*/
	23	@Entity
	24	@Table(sch ema="HT", name="RPT_ OUTPUT_FIL E_TYPE")
	25	public cla ss ReportE xportedTyp e extends AbstractLo okup {
	26
	27	/* *
	28	* An instan ce of seri alVersionU ID
	29	* /
	30	pr ivate stat ic final l ong serial VersionUID = 4475659 8329309355 35L;
	31	pu blic stati c final Co de PDF = n ew Code("1 ", "PDF"); // TEMP fi x
	32	pu blic stati c final Co de CSV = n ew Code("2 ", "CSV"); // Revert to 1 and 2
	33	// after sds update
	34	pu blic stati c final Co de XLS = n ew Code("3 ", "XLS");
	35	pu blic stati c final Co de RTF = n ew Code("4 ", "RTF");
	36	pu blic stati c final Co de HTML = new Code(" 5", "HTML" );
	37
	38	pr ivate stat ic Compara tor nameCo mparator = new Repor tExportedT ypeNameCom parator();
	39
	40	pu blic stati c Comparat or getName Comparator () {
	41	retu rn nameCom parator;
	42	}
	43
	44	pu blic stati c class Co de extends AbstractC ode {
	45
	46	/**
	47	* A n instance of serial VersionUID
	48	*/
	49	priv ate static final lon g serialVe rsionUID = -59072273 1971683450 3L;
	50
	51	prot ected Code (String co de) {
	52	super( code);
	53	}
	54
	55	prot ected Code (String co de, String alias) {
	56	super( code, alia s);
	57	}
	58
	59	publ ic static Code getBy Code(Strin g code) {
	60	return (Code) ge tCode(Code .class, co de);
	61	}
	62
	63	}
	64	}
	65
	66	class Repo rtExported TypeNameCo mparator i mplements Comparator , Serializ able {
	67
	68	pr ivate stat ic final l ong serial VersionUID = 6562479 9375478129 59L;
	69
	70	pu blic int c ompare(Obj ect pObjec t1, Object pObject2) {
	71	Stri ng name1 = (pObject1 != null & & pObject1 instanceo f ReportEx portedType ) ? ((Repo rtExported Type) pObj ect1)
	72	.getName ()
	73	: null;
	74	Stri ng name2 = (pObject2 != null & & pObject2 instanceo f ReportEx portedType ) ? ((Repo rtExported Type) pObj ect2)
	75	.getName ()
	76	: null;
	77	retu rn (name1 != null && name2 != null) ? na me1.compar eTo(name2) : 0;
	78	}
	79	}