95. EPMO Open Source Coordination Office Redaction File Detail Report

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

95.1 Files compared

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

95.2 Comparison summary

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

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

95.4 Active regular expressions

No regular expressions were active.

95.5 Comparison detail

  1   package go v.va.med.i maging.vie wer.rest.t ypes;
  2  
  3   import jav ax.xml.bin d.annotati on.XmlRoot Element;
  4  
  5   /**
  6    * Date Cr eated: Apr  23, 2018
  7    * @author   DNS     tjahjb
  8    *
  9    */
  10   @XmlRootEl ement(name ="imageFil ter")
  11   public cla ss ImageFi lterResult Type
  12   {
  13           pr ivate Stri ng filterI EN;
  14           pr ivate Stri ng filterN ame;
  15           pr ivate Stri ng userId;
  16           
  17           pu blic Image FilterResu ltType()
  18           {
  19                    supe r();
  20           }
  21  
  22           pu blic Image FilterResu ltType(
  23                    Stri ng filterI EN,
  24                    Stri ng filterN ame,
  25                    Stri ng userId)
  26           {
  27                    supe r();
  28                    this .filterIEN  = filterI EN;
  29                    this .filterNam e = filter Name;
  30                    this .userId =  userId;
  31           }
  32  
  33           /* *
  34            *  @return t he filterI EN
  35            * /
  36           pu blic Strin g getFilte rIEN()
  37           {
  38                    retu rn filterI EN;
  39           }
  40  
  41           /* *
  42            *  @param fi lterIEN th e filterIE N to set
  43            * /
  44           pu blic void  setFilterI EN(String  filterIEN)
  45           {
  46                    this .filterIEN  = filterI EN;
  47           }
  48  
  49           /* *
  50            *  @return t he filterN ame
  51            * /
  52           pu blic Strin g getFilte rName()
  53           {
  54                    retu rn filterN ame;
  55           }
  56  
  57           /* *
  58            *  @param fi lterName t he filterN ame to set
  59            * /
  60           pu blic void  setFilterN ame(String  filterNam e)
  61           {
  62                    this .filterNam e = filter Name;
  63           }
  64  
  65           /* *
  66            *  @return t he userId
  67            * /
  68           pu blic Strin g getUserI d()
  69           {
  70                    retu rn userId;
  71           }
  72  
  73           /* *
  74            *  @param us erId the u serId to s et
  75            * /
  76           pu blic void  setUserId( String use rId)
  77           {
  78                    this .userId =  userId;
  79           }
  80  
  81  
  82  
  83   }