53. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 3/25/2019 8:58:03 AM Central 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.

53.1 Files compared

# Location File Last Modified
1 C:\AraxisMergeCompare\Pri_un\IMAG_Source\VISA\Java\StudyWebApp\main\src\java\gov\va\med\imaging\study\rest\types StudyFilterType.java Mon Mar 18 20:39:15 2019 UTC
2 C:\AraxisMergeCompare\Pri_re\IMAG_Source\VISA\Java\StudyWebApp\main\src\java\gov\va\med\imaging\study\rest\types StudyFilterType.java Tue Mar 19 12:04:04 2019 UTC

53.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 3 206
Changed 2 4
Inserted 0 0
Removed 0 0

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

53.4 Active regular expressions

No regular expressions were active.

53.5 Comparison detail

  1   /**
  2    * 
  3     Package:  MAG - Vis tA Imaging
  4     WARNING:  Per VHA D irective 2 004-038, t his routin e should n ot be modi fied.
  5     Date Cre ated: Mar  16, 2012
  6     Site Nam e:  Washin gton OI Fi eld Office , Silver S pring, MD
  7       Developer:     DN S      WERFEJ
  8     Descript ion: 
  9  
  10           ;;  +-------- ---------- ---------- ---------- ---------- ---------- ---------- +
  11           ;;  Property  of the US  Government .
  12           ;;  No permis sion to co py or redi stribute t his softwa re is give n.
  13           ;;  Use of un released v ersions of  this soft ware requi res the us er
  14           ;;   to execu te a writt en test ag reement wi th the Vis tA Imaging
  15           ;;   Developm ent Office  of the De partment o f Veterans  Affairs,
  16           ;;   telephon e (301) 73 4-0100.
  17           ;;
  18           ;;  The Food  and Drug A dministrat ion classi fies this  software a s
  19           ;;  a Class I I medical  device.  A s such, it  may not b e changed
  20           ;;  in any wa y.  Modifi cations to  this soft ware may r esult in a n
  21           ;;  adulterat ed medical  device un der 21CFR8 20, the us e of which
  22           ;;  is consid ered to be  a violati on of US F ederal Sta tutes.
  23           ;;  +-------- ---------- ---------- ---------- ---------- ---------- ---------- +
  24  
  25    */
  26   package go v.va.med.i maging.stu dy.rest.ty pes;
  27  
  28   import jav a.util.Dat e;
  29   import jav a.util.Lis t;
  30  
  31   import jav ax.xml.bin d.annotati on.XmlRoot Element;
  32   import jav ax.xml.bin d.annotati on.XmlType ;
  33  
  34   /**
  35    * @author   DN S      WERFEJ
  36    *
  37    */
  38   @XmlRootEl ement(name ="studyFil ter")
  39   @XmlType(p ropOrder={ "fromDate" , "toDate" , "resultT ype", "cpt Codes", "m odalityCod es", "stor edFilterId "})
  40   public cla ss StudyFi lterType
  41   {
  42       privat e Date fro mDate;
  43       privat e Date toD ate;
  44       privat e StudyFil terResultT ype result Type;
  45       privat e List<Str ing> cptCo des;
  46       privat e List<Str ing> modal ityCodes;
  47       privat e String s toredFilte rId;
  48       
  49       public  StudyFilt erType()
  50       {
  51           su per();
  52       }
  53       
  54           pu blic Date  getFromDat e() {
  55                    retu rn fromDat e;
  56           }
  57  
  58           pu blic void  setFromDat e(Date fro mDate) {
  59                    this .fromDate  = fromDate ;
  60           }
  61  
  62           pu blic Date  getToDate( ) {
  63                    retu rn toDate;
  64           }
  65  
  66           pu blic void  setToDate( Date toDat e) {
  67                    this .toDate =  toDate;
  68           }
  69  
  70           pu blic Study FilterResu ltType get ResultType ()
  71           {
  72                    retu rn resultT ype;
  73           }
  74  
  75           pu blic void  setResultT ype(StudyF ilterResul tType resu ltType)
  76           {
  77                    this .resultTyp e = result Type;
  78           }
  79  
  80           pu blic List< String> ge tCptCodes( ) {
  81                    retu rn cptCode s;
  82           }
  83  
  84           pu blic void  setCptCode s(List<Str ing> cptCo des) {
  85                    this .cptCodes  = cptCodes ;
  86           }
  87  
  88           pu blic List< String> ge tModalityC odes() {
  89                    retu rn modalit yCodes;
  90           }
  91  
  92           pu blic void  setModalit yCodes(Lis t<String>  modalityCo des) {
  93                    this .modalityC odes = mod alityCodes ;
  94           }
  95  
  96           pu blic Strin g getStore dFilterId( ) {
  97                    retu rn storedF ilterId;
  98           }
  99  
  100           pu blic void  setStoredF ilterId(St ring store dFilterId)  {
  101                    this .storedFil terId = st oredFilter Id;
  102           }
  103  
  104           
  105   }