90. EPMO Open Source Coordination Office Redaction File Detail Report

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

90.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 CaptureUserResultType.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 CaptureUserResultType.java Tue Mar 19 12:04:14 2019 UTC

90.2 Comparison summary

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

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

90.4 Active regular expressions

No regular expressions were active.

90.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  12, 2018
  7    * @author   DNS     tjahjb
  8    *
  9    */
  10   @XmlRootEl ement(name ="captureU ser")
  11   public cla ss Capture UserResult Type
  12   {
  13           pr ivate Stri ng userId;
  14           pr ivate Stri ng userNam e;
  15           
  16           pu blic Captu reUserResu ltType()
  17           {
  18                    supe r();
  19           }
  20  
  21           pu blic Captu reUserResu ltType(
  22                    Stri ng userId,
  23                    Stri ng userNam e)
  24           {
  25                    supe r();
  26                    this .userId =  userId;
  27                    this .userName  = userName ;
  28           }
  29  
  30           /* *
  31            *  @return t he userId
  32            * /
  33           pu blic Strin g getUserI d()
  34           {
  35                    retu rn userId;
  36           }
  37  
  38           /* *
  39            *  @param us erId the u serId to s et
  40            * /
  41           pu blic void  setUserId( String use rId)
  42           {
  43                    this .userId =  userId;
  44           }
  45  
  46           /* *
  47            *  @return t he userNam e
  48            * /
  49           pu blic Strin g getUserN ame()
  50           {
  51                    retu rn userNam e;
  52           }
  53  
  54           /* *
  55            *  @param in stitutionN ame the in stitutionN ame to set
  56            * /
  57           pu blic void  setUserNam e(String u serName)
  58           {
  59                    this .userName  = userName ;
  60           }
  61  
  62  
  63   }