Produced by Araxis Merge on 12/13/2018 10:35:24 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.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | v12.5_iter_7_build 51.zip\TRM_Upgrade\src\main\java\gov\va\med\ccht\service\report | ReportFilterSearchQueryInfo.java | Fri Dec 7 17:36:30 2018 UTC |
| 2 | v12.5_iter_7_build 51.zip\TRM_Upgrade\src\main\java\gov\va\med\ccht\service\report | ReportFilterSearchQueryInfo.java | Wed Dec 12 22:33:39 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 174 |
| Changed | 1 | 2 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| 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 |
No regular expressions were active.
| 1 | // Package | |
| 2 | package go v.va.med.c cht.servic e.report; | |
| 3 | ||
| 4 | // Java Cl asses | |
| 5 | import jav a.io.Seria lizable; | |
| 6 | import jav a.util.Dat e; | |
| 7 | ||
| 8 | import org .apache.co mmons.lang 3.builder. ToStringBu ilder; | |
| 9 | ||
| 10 | import gov .va.med.cc ht.model.t erminology .ReportTyp e; | |
| 11 | import gov .va.med.cc ht.model.t erminology .StandardR eport; | |
| 12 | import gov .va.med.fw .report.Re portExport edType; | |
| 13 | import gov .va.med.fw .security. UserPrinci pal; | |
| 14 | ||
| 15 | /** | |
| 16 | * | |
| 17 | * @author DNS | |
| 18 | * | |
| 19 | */ | |
| 20 | public cla ss ReportF ilterSearc hQueryInfo implement s Serializ able { | |
| 21 | pr ivate stat ic final l ong serial VersionUID = 3965263 4617836391 60L; | |
| 22 | pr ivate Repo rtType rep ortType = null; | |
| 23 | pr ivate Stan dardReport standardR eport = nu ll; | |
| 24 | pr ivate Repo rtExported Type repor tExportedT ype = null ; | |
| 25 | pr ivate Date dateFrom = null; | |
| 26 | pr ivate Date dateTo = null; | |
| 27 | pr ivate User Principal user = nul l; | |
| 28 | ||
| 29 | pu blic Repor tType getR eportType( ) { | |
| 30 | retu rn reportT ype; | |
| 31 | } | |
| 32 | ||
| 33 | pu blic void setReportT ype(Report Type repor tType) { | |
| 34 | this .reportTyp e = report Type; | |
| 35 | } | |
| 36 | ||
| 37 | pu blic Stand ardReport getStandar dReport() { | |
| 38 | retu rn standar dReport; | |
| 39 | } | |
| 40 | ||
| 41 | pu blic void setStandar dReport(St andardRepo rt standar dReport) { | |
| 42 | this .standardR eport = st andardRepo rt; | |
| 43 | } | |
| 44 | ||
| 45 | pu blic Repor tExportedT ype getRep ortExporte dType() { | |
| 46 | retu rn reportE xportedTyp e; | |
| 47 | } | |
| 48 | ||
| 49 | pu blic void setReportE xportedTyp e(ReportEx portedType reportExp ortedType) { | |
| 50 | this .reportExp ortedType = reportEx portedType ; | |
| 51 | } | |
| 52 | ||
| 53 | pu blic UserP rincipal g etUser() { | |
| 54 | retu rn user; | |
| 55 | } | |
| 56 | ||
| 57 | pu blic void setUser(Us erPrincipa l user) { | |
| 58 | this .user = us er; | |
| 59 | } | |
| 60 | ||
| 61 | pu blic Date getDateFro m() { | |
| 62 | retu rn dateFro m; | |
| 63 | } | |
| 64 | ||
| 65 | pu blic void setDateFro m(Date dat eFrom) { | |
| 66 | this .dateFrom = dateFrom ; | |
| 67 | } | |
| 68 | ||
| 69 | pu blic Date getDateTo( ) { | |
| 70 | retu rn dateTo; | |
| 71 | } | |
| 72 | ||
| 73 | pu blic void setDateTo( Date dateT o) { | |
| 74 | this .dateTo = dateTo; | |
| 75 | } | |
| 76 | ||
| 77 | /* * | |
| 78 | * @see gov. va.med.fw. model.Abst ractEntity #buildToSt ring(org.a pache.comm ons.lang.b uilder.ToS tringBuild er) | |
| 79 | * / | |
| 80 | pr otected vo id buildTo String(ToS tringBuild er builder ) { | |
| 81 | buil der.append ("reportTy pe", getRe portType() ); | |
| 82 | buil der.append ("standard Report", g etStandard Report()); | |
| 83 | buil der.append ("reportEx portedType ", getRepo rtExported Type()); | |
| 84 | buil der.append ("dateFrom ", getDate From()); | |
| 85 | buil der.append ("dateTo", getDateTo ()); | |
| 86 | buil der.append ("user", g etUser()); | |
| 87 | } | |
| 88 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.