2. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 3/24/2017 5:17:17 PM Eastern 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.

2.1 Files compared

# Location File Last Modified
1 MHV_2017.2.0.0 Code In Flight.zip\Admin Portal Redesign\mhv_admin\mhv-admin-portlet\src\main\java\gov\va\med\mhv\admin\web\formbean ManagedStaffMember.java Fri Feb 10 18:05:28 2017 UTC
2 MHV_2017.2.0.0 Code In Flight.zip\Admin Portal Redesign\mhv_admin\mhv-admin-portlet\src\main\java\gov\va\med\mhv\admin\web\formbean ManagedStaffMember.java Fri Mar 24 17:57:39 2017 UTC

2.2 Comparison summary

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

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

2.4 Active regular expressions

No regular expressions were active.

2.5 Comparison detail

  1   package go v.va.med.m hv.admin.w eb.formbea n;
  2  
  3   import gov .va.med.mh v.admin.dt o.Employee DTO;
  4   import gov .va.med.mh v.admin.dt o.Employee OrgRoleHis toryDTO;
  5   import gov .va.med.mh v.admin.dt o.Employee SearchResu lt;
  6  
  7   import jav a.io.Seria lizable;
  8   import jav a.util.Col lection;
  9   import jav a.util.Lis t;
  10  
  11   /**
  12    * This be an was cre ated to ho ld everyth ing about  the employ ee current ly under 
  13    * managem ent. Only  1 can be l oaded at a  time. Thi s class en sures that  no
  14    * lingeri ng parts o f one empl oyee can b e associat ed with an other empl oyee.
  15    * 
  16    * @author   DN S      HODGEJ
  17    *
  18    */
  19   public cla ss Managed StaffMembe r implemen ts Seriali zable {
  20  
  21           pr ivate stat ic final l ong serial VersionUID  = 3462746 6086029505 12L;
  22  
  23           pr ivate Empl oyeeDTO ma nagedEmplo yee = null ;
  24           pr ivate Coll ection<Emp loyeeSearc hResult> e mployeeSea rchResults List = nul l;
  25           pr ivate Empl oyeeSearch Result emp loyeeToMan age = null ;
  26           pr ivate List <EmployeeO rgRoleHist oryDTO> ro leHistorie sForEmploy ee;
  27           pr ivate Stri ng employe eLastLogin  = "";
  28  
  29           pu blic Colle ction<Empl oyeeSearch Result> ge tEmployeeS earchResul tsList() {
  30                    retu rn employe eSearchRes ultsList;
  31           }
  32  
  33           pu blic void  setEmploye eSearchRes ultsList(
  34                             Collec tion<Emplo yeeSearchR esult> emp loyeeSearc hResultsLi st) {
  35                    this .employeeS earchResul tsList = e mployeeSea rchResults List;
  36           }
  37  
  38           pu blic Emplo yeeSearchR esult getE mployeeToM anage() {
  39                    retu rn employe eToManage;
  40           }
  41  
  42           pu blic void  setEmploye eToManage( EmployeeSe archResult  employeeT oManage) {
  43                    this .employeeT oManage =  employeeTo Manage;
  44           }
  45  
  46           pu blic Strin g getEmplo yeeLastLog in() {
  47                    retu rn employe eLastLogin ;
  48           }
  49  
  50           pu blic void  setEmploye eLastLogin (String em ployeeLast Login) {
  51                    this .employeeL astLogin =  employeeL astLogin;
  52           }
  53  
  54           pu blic List< EmployeeOr gRoleHisto ryDTO> get RoleHistor iesForEmpl oyee() {
  55                    retu rn roleHis toriesForE mployee;
  56           }
  57  
  58           pu blic void  setRoleHis toriesForE mployee(
  59                             List<E mployeeOrg RoleHistor yDTO> role HistoriesF orEmployee ) {
  60                    this .roleHisto riesForEmp loyee = ro leHistorie sForEmploy ee;
  61           }
  62  
  63           pu blic Emplo yeeDTO get ManagedEmp loyee() {
  64                    retu rn managed Employee;
  65           }
  66  
  67           pu blic void  setManaged Employee(E mployeeDTO  managedEm ployee) {
  68                    this .managedEm ployee = m anagedEmpl oyee;
  69           }
  70  
  71   }