414. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 12/5/2017 12:06:51 PM Central 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.

414.1 Files compared

# Location File Last Modified
1 IV-eHMP_CIF.zip\IMAG_Source\VISA\Java\VixCacheWebApp\main\src\gov\va\med\imaging\cache RegionVO.java Mon Dec 4 21:34:28 2017 UTC
2 IV-eHMP_CIF.zip\IMAG_Source\VISA\Java\VixCacheWebApp\main\src\gov\va\med\imaging\cache RegionVO.java Mon Dec 4 22:07:20 2017 UTC

414.2 Comparison summary

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

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

414.4 Active regular expressions

No regular expressions were active.

414.5 Comparison detail

  1   /**
  2    * 
  3    */
  4   package go v.va.med.i maging.cac he;
  5  
  6   import jav a.io.Seria lizable;
  7   import jav a.util.Sor tedSet;
  8  
  9   /**
  10    * @author         
BECKEC
  11    *
  12    */
  13   public cla ss RegionV O
  14   extends Ab stractGrou pParent
  15   implements  Serializa ble
  16   {
  17           pr ivate stat ic final l ong        serialVers ionUID         = 1L;
  18           pr ivate Cach eRegionMet adata meta data = nul l;
  19           pr ivate Cach eItemPath  path = nul l;
  20           
  21           pu blic Regio nVO(){}
  22           
  23           /* *
  24            *  
  25            *  @param na me - must  NOT be nul l
  26            *  @param me tadata - m ay be null
  27            * /
  28           pu blic Regio nVO(String  name, Cac heRegionMe tadata met adata)
  29           {
  30                    supe r(name);
  31                    this .metadata  = metadata ;
  32           }
  33           
  34           /* *
  35            *  
  36            *  @param na me - must  NOT be nul l
  37            *  @param me tadata - m ay be null
  38            *  @param pa th - may b e null
  39            * /
  40           pu blic Regio nVO(String  name, Cac heRegionMe tadata met adata, Cac heItemPath  path)
  41           {
  42                    supe r(name);
  43                    this .metadata  = metadata ;
  44                    this .path = pa th;
  45           }
  46  
  47           pu blic Cache RegionMeta data getMe tadata() {
  48                    retu rn metadat a;
  49           }
  50  
  51           pu blic void  setMetadat a(CacheReg ionMetadat a metadata ) {
  52                    this .metadata  = metadata ;
  53           }
  54  
  55           @O verride
  56           pu blic void  merge(Abst ractNamedV O other) 
  57           th rows Merge Exception
  58           {
  59                    if(o ther insta nceof Regi onVO)
  60                    {
  61                             super. merge(othe r);
  62                             if(thi s.getMetad ata() == n ull && ((R egionVO)ot her).getMe tadata() ! = null)
  63                                      this.set Metadata(( (RegionVO) other).get Metadata() );
  64                    }
  65                    else
  66                    {
  67                             String  msg = "Re gionVO is  unable to  merge '" +  other.toS tring() +  "'";
  68                             logger .error(msg );
  69                             throw  new MergeE xception(m sg);
  70                    }
  71           }
  72           
  73           @O verride
  74           pu blic Cache ItemPath g etPath()
  75           {
  76                    if ( path != nu ll)
  77                             return  path;
  78                    else  if( getPa rent() !=  null )
  79                    {
  80                             CacheI temPath pa rentPath =  getParent ().getPath ();
  81                             path =  parentPat h.createCh ildPath(th is.getName (), false) ;
  82                             return  path;
  83                    }
  84                    else
  85                    {
  86                             logger .error( "R egionVO.ge tParent()  returns nu ll." );
  87                             return  null;
  88                    }
  89           }
  90           
  91           @O verride
  92           pu blic int g etChildCou nt(){retur n getGroup Count();}
  93           
  94           @O verride
  95           pu blic Abstr actNamedVO  childWith Name(Strin g name)
  96           {
  97                    retu rn this.se archChildC ollection( getGroups( ), name);
  98           }
  99           
  100           @S uppressWar nings("unc hecked")
  101           @O verride
  102           pu blic Sorte dSet<Group VO> getChi ldren()
  103           {
  104                    retu rn getGrou ps();
  105           }
  106           
  107           @O verride
  108           pu blic boole an removeC hild(Abstr actNamedVO  child){re turn remov e((GroupVO )child);}
  109   }