4. EPMO Open Source Coordination Office Redaction File Detail Report

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

4.1 Files compared

# Location File Last Modified
1 C:\AraxisMergeCompare\Pri_un\IMAG_Source\VISA\Java\CacheImplJCIFS\main\src\java\gov\va\med\imaging\storage\cache\impl\jcifs SmbUtilities.java Mon Mar 18 20:39:17 2019 UTC
2 C:\AraxisMergeCompare\Pri_re\IMAG_Source\VISA\Java\CacheImplJCIFS\main\src\java\gov\va\med\imaging\storage\cache\impl\jcifs SmbUtilities.java Tue Mar 19 12:03:22 2019 UTC

4.2 Comparison summary

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

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

4.4 Active regular expressions

No regular expressions were active.

4.5 Comparison detail

  1   /**
  2    * 
  3    */
  4   package go v.va.med.i maging.sto rage.cache .impl.jcif s;
  5  
  6   import org .apache.lo gging.log4 j.LogManag er;
  7   import org .apache.lo gging.log4 j.Logger;
  8  
  9   import jci fs.smb.Smb Exception;
  10   import jci fs.smb.Smb File;
  11   import jci fs.smb.Smb FileFilter ;
  12  
  13   /**
  14    * @author   DN S      BECKEC
  15    *
  16    */
  17   public cla ss SmbUtil ities
  18   {
  19           /* *
  20            *  Get all o f the file s in our d irectory.
  21            *  All files  (not dire ctories) a re conside red child  instances  of this gr oup.
  22            *  
  23            *  @return
  24            * /
  25           pu blic SmbFi le[] getPe rsistentCh ildren(Smb File direc tory, bool ean includ eDirectori es, boolea n includeF iles)
  26           {
  27                    SmbF ile[] chil dFiles = n ull;
  28                    try
  29                    {
  30                             childF iles = dir ectory.lis tFiles( ne w SmbFileD irectoryFi lter(inclu deDirector ies, inclu deFiles) ) ;
  31                    } 
  32                    catc h (SmbExce ption x)
  33                    {
  34                             LogMan ager.getLo gger(SmbUt ilities.cl ass).error (x);
  35                    }
  36  
  37                    // r eturn an e mpty array  even if t he group d irectory d oes not ex ist
  38                    retu rn childFi les == nul l ? new Sm bFile[]{}  : childFil es;
  39           }
  40           
  41           pr ivate clas s SmbFileD irectoryFi lter
  42           im plements S mbFileFilt er
  43           {
  44                    priv ate boolea n includeD irectories ;
  45                    priv ate boolea n includeF iles;
  46                    
  47                    SmbF ileDirecto ryFilter(b oolean inc ludeDirect ories, boo lean inclu deFiles)
  48                    {
  49                             this.i ncludeDire ctories =  includeDir ectories;
  50                             this.i ncludeFile s = includ eFiles;
  51                    }
  52                    
  53                    publ ic boolean  accept(Sm bFile path name)
  54                    {
  55                             try
  56                             {
  57                                      return 
  58                                      (include Directorie s && pathn ame.isDire ctory()) |
  59                                      (include Files && !  pathname. isDirector y());
  60                             } 
  61                             catch  (SmbExcept ion x)
  62                             {
  63                                      LogManag er.getLogg er(SmbUtil ities.clas s).error(x );
  64                                      return f alse;
  65                             }
  66                    }
  67           }
  68  
  69   }