10. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 11/28/2017 4:44:48 PM 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.

10.1 Files compared

# Location File Last Modified
1 admin_portal_reeng_2018.1.0.0.zip\admin portal reeng\mhv_source\mhv_admin\mhv-admin-main\src\main\java\gov\va\med\mhv\admin\registry Address.java Wed Aug 23 04:11:24 2017 UTC
2 admin_portal_reeng_2018.1.0.0.zip\admin portal reeng\mhv_source\mhv_admin\mhv-admin-main\src\main\java\gov\va\med\mhv\admin\registry Address.java Tue Nov 28 20:41:39 2017 UTC

10.2 Comparison summary

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

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

10.4 Active regular expressions

No regular expressions were active.

10.5 Comparison detail

  1   /**
  2    * 
  3    */
  4   package go v.va.med.m hv.admin.r egistry;
  5  
  6   import gov .va.med.mh v.admin.en ums.Indica tor;
  7  
  8  
  9   /**
  10    * @author  
P
I I
  11    *
  12    */
  13   public cla ss Address  extends M odelObject  {
  14       
  15       privat e String s treetAddre ss1 = null ;
  16       privat e String s treetAddre ss2 = null ;
  17       privat e String s treetAddre ss3 = null ;
  18       privat e String c ity = null ;
  19       privat e String s tateProven ce = null;
  20       privat e String z ipPostalCo de = null;
  21       privat e String c ountyCode  = null;
  22       privat e String c ountryCode  = null;
  23       privat e Indicato r badAddre ssIndicato r = null;
  24       
  25       
  26       /**
  27        * @re turn Retur ns the cit y.
  28        */
  29       public  String ge tCity() {
  30           re turn city;
  31       }
  32  
  33       /**
  34        * @pa ram city T he city to  set.
  35        */
  36       public  void setC ity(String  city) {
  37           th is.city =  city;
  38       }
  39  
  40       /**
  41        * @re turn Retur ns the cou ntryCode.
  42        */
  43       public  String ge tCountryCo de() {
  44           re turn count ryCode;
  45       }
  46  
  47       /**
  48        * @pa ram countr yCode The  countryCod e to set.
  49        */
  50       public  void setC ountryCode (String co untryCode)  {
  51           th is.country Code = cou ntryCode;
  52       }
  53  
  54       /**
  55        * @re turn Retur ns the cou ntyCode.
  56        */
  57       public  String ge tCountyCod e() {
  58           re turn count yCode;
  59       }
  60  
  61       /**
  62        * @pa ram county Code The c ountyCode  to set.
  63        */
  64       public  void setC ountyCode( String cou ntyCode) {
  65           th is.countyC ode = coun tyCode;
  66       }
  67  
  68       /**
  69        * @re turn Retur ns the sta teProvence .
  70        */
  71       public  String ge tStateProv ence() {
  72           re turn state Provence;
  73       }
  74  
  75       /**
  76        * @pa ram stateP rovence Th e statePro vence to s et.
  77        */
  78       public  void setS tateProven ce(String  stateProve nce) {
  79           th is.statePr ovence = s tateProven ce;
  80       }
  81  
  82       /**
  83        * @re turn Retur ns the str eetAddress 1.
  84        */
  85       public  String ge tStreetAdd ress1() {
  86           re turn stree tAddress1;
  87       }
  88  
  89       /**
  90        * @pa ram street Address1 T he streetA ddress1 to  set.
  91        */
  92       public  void setS treetAddre ss1(String  streetAdd ress1) {
  93           th is.streetA ddress1 =  streetAddr ess1;
  94       }
  95  
  96       /**
  97        * @re turn Retur ns the str eetAddress 2.
  98        */
  99       public  String ge tStreetAdd ress2() {
  100           re turn stree tAddress2;
  101       }
  102  
  103       /**
  104        * @pa ram street Address2 T he streetA ddress2 to  set.
  105        */
  106       public  void setS treetAddre ss2(String  streetAdd ress2) {
  107           th is.streetA ddress2 =  streetAddr ess2;
  108       }
  109  
  110       /**
  111        * @re turn Retur ns the str eetAddress 3.
  112        */
  113       public  String ge tStreetAdd ress3() {
  114           re turn stree tAddress3;
  115       }
  116  
  117       /**
  118        * @pa ram street Address3 T he streetA ddress3 to  set.
  119        */
  120       public  void setS treetAddre ss3(String  streetAdd ress3) {
  121           th is.streetA ddress3 =  streetAddr ess3;
  122       }
  123  
  124       /**
  125        * @re turn Retur ns the zip PostalCode .
  126        */
  127       public  String ge tZipPostal Code() {
  128           re turn zipPo stalCode;
  129       }
  130  
  131       /**
  132        * @pa ram zipPos talCode Th e zipPosta lCode to s et.
  133        */
  134       public  void setZ ipPostalCo de(String  zipPostalC ode) {
  135           th is.zipPost alCode = z ipPostalCo de;
  136       }
  137  
  138       
  139       /**
  140        * @re turn Retur ns the bad AddressInd icator.
  141        */
  142       public  Indicator  getBadAdd ressIndica tor() {
  143           re turn badAd dressIndic ator;
  144       }
  145  
  146       /**
  147        * @pa ram badAdd ressIndica tor The ba dAddressIn dicator to  set.
  148        */
  149       public  void setB adAddressI ndicator(I ndicator b adAddressI ndicator)  {
  150           th is.badAddr essIndicat or = badAd dressIndic ator;
  151       }
  152  
  153       @Overr ide
  154       public  int hashC ode() {
  155           Ob ject[] fie lds = { st reetAddres s1, city,  zipPostalC ode };
  156           re turn hashC ode(fields );
  157       }
  158       
  159       @Overr ide
  160       public  boolean e quals(Obje ct obj) {
  161           if  (this ==  obj) {
  162                return t rue;
  163           }
  164           if  (obj == n ull) {
  165                return f alse;
  166           }
  167           if  (getClass () != obj. getClass() ) {
  168                return f alse;
  169           }
  170           fi nal Addres s other =  (Address)  obj;
  171           re turn areEq ual(street Address1,  other.stre etAddress1 )
  172                && areEq ual(street Address2,  other.stre etAddress2 )
  173                && areEq ual(street Address3,  other.stre etAddress3 )
  174                && areEq ual(city,  other.city )
  175                && areEq ual(stateP rovence, o ther.state Provence)
  176                && areEq ual(zipPos talCode, o ther.zipPo stalCode)
  177                && areEq ual(county Code, othe r.countyCo de)
  178                && areEq ual(countr yCode, oth er.country Code)
  179                && areEq ual(badAdd ressIndica tor, other .badAddres sIndicator );
  180       }
  181   }