264. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 12/13/2018 10:35:27 AM 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.

264.1 Files compared

# Location File Last Modified
1 v12.5_iter_7_build 51.zip\TRM_Upgrade\src\main\java\gov\va\med\fw\mail FormattedObjectMailStyle.java Fri Dec 7 17:36:18 2018 UTC
2 v12.5_iter_7_build 51.zip\TRM_Upgrade\src\main\java\gov\va\med\fw\mail FormattedObjectMailStyle.java Wed Dec 12 22:26:42 2018 UTC

264.2 Comparison summary

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

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

264.4 Active regular expressions

No regular expressions were active.

264.5 Comparison detail

  1   /********* ********** ********** ********** ********** ********** *********
  2    * Copyrii ght 2005 V HA. All ri ghts reser ved
  3    ********* ********** ********** ********** ********** ********** *********/
  4  
  5   package go v.va.med.f w.mail;
  6  
  7   import org .apache.co mmons.lang .SystemUti ls;
  8   import org .apache.co mmons.lang .builder.T oStringSty le;
  9  
  10   /**
  11    * Combo o f Commons  Lang multi -line and  short-pref ix
  12    * 
  13    * Created  Feb 6, 20 06 11:15:2 2 AM
  14    * 
  15    * DNS
  16    */
  17   public cla ss Formatt edObjectMa ilStyle ex tends ToSt ringStyle  {
  18  
  19           /* *
  20            *  serialVer sionUID lo ng
  21            * /
  22           pr ivate stat ic final l ong serial VersionUID  = -574214 7181077084 985L;
  23  
  24           pu blic Forma ttedObject MailStyle( ) {
  25                    supe r();
  26                    this .setConten tStart("[" );
  27                    this .setFieldS eparator(S ystemUtils .LINE_SEPA RATOR + "   ");
  28                    this .setFieldS eparatorAt Start(true );
  29                    this .setUseSho rtClassNam e(true);
  30                    this .setUseIde ntityHashC ode(false) ;
  31                    this .setConten tEnd(Syste mUtils.LIN E_SEPARATO R + "]");
  32           }
  33  
  34           pr ivate Obje ct readRes olve() {
  35                    retu rn ToStrin gStyle.MUL TI_LINE_ST YLE;
  36           }
  37   }