785. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 10/18/2018 2:02:20 PM 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.

785.1 Files compared

# Location File Last Modified
1 VIX_SIV_v3_0_patch_201_build_8.zip\v3.0_patch_201_build_8\VISA\Java\ImagingDicomSCU\src\java\gov\va\med\imaging\dicom\scu\storagescu\impl StoreCommitSCUControlImpl.java Thu Oct 11 13:30:10 2018 UTC
2 VIX_SIV_v3_0_patch_201_build_8.zip\v3.0_patch_201_build_8\VISA\Java\ImagingDicomSCU\src\java\gov\va\med\imaging\dicom\scu\storagescu\impl StoreCommitSCUControlImpl.java Wed Oct 17 18:56:02 2018 UTC

785.2 Comparison summary

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

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

785.4 Active regular expressions

No regular expressions were active.

785.5 Comparison detail

  1   /*
  2    * Created  on Sep 19 , 2005
  3   // Per VHA  Directive  2004-038,  this rout ine should  not be mo dified.
  4   //+------- ---------- ---------- ---------- ---------- ---------- ------+
  5   //| Proper ty of the  US Governm ent.                                   |
  6   //| No per mission to  copy or r edistribut e this sof tware is g iven. |
  7   //| Use of  unrelease d versions  of this s oftware re quires the  user |
  8   //| to exe cute a wri tten test  agreement  with the V istA Imagi ng    |
  9   //| Develo pment Offi ce of the  Department  of Vetera ns Affairs ,     |
  10   //| teleph one (301)  734-0100.                                         |
  11   //|                                                                     |
  12   //| The Fo od and Dru g Administ ration cla ssifies th is softwar e as  |
  13   //| a medi cal device .  As such , it may n ot be chan ged in any  way. |
  14   //| Modifi cations to  this soft ware may r esult in a n adultera ted   |
  15   //| medica l device u nder 21CFR 820, the u se of whic h is consi dered |
  16   //| to be  a violatio n of US Fe deral Stat utes.                       |
  17   //+------- ---------- ---------- ---------- ---------- ---------- ------+
  18    */
  19   package go v.va.med.i maging.dic om.scu.sto ragescu.im pl;
  20  
  21   import gov .va.med.im aging.dico m.common.s pring.Spri ngContext;
  22   import gov .va.med.im aging.dico m.dcftoolk it.common. exceptions .DicomAsso ciationAbo rtExceptio n;
  23   import gov .va.med.im aging.dico m.dcftoolk it.common. exceptions .DicomAsso ciationGen eralExcept ion;
  24   import gov .va.med.im aging.dico m.dcftoolk it.common. exceptions .DicomAsso ciationRej ectExcepti on;
  25   import gov .va.med.im aging.dico m.dcftoolk it.scu.exc eptions.Di comStoreSC UInstanceE xception;
  26   import gov .va.med.im aging.dico m.dcftoolk it.scu.sto ragescu.in terfaces.I DicomStore CommitSCU;
  27   import gov .va.med.im aging.dico m.scu.exce ptions.Ass ociationAb ortExcepti on;
  28   import gov .va.med.im aging.dico m.scu.exce ptions.Ass ociationIn itializati onExceptio n;
  29   import gov .va.med.im aging.dico m.scu.exce ptions.Ass ociationRe jectExcept ion;
  30   import gov .va.med.im aging.dico m.scu.exce ptions.Sen dInstanceE xception;
  31   import gov .va.med.im aging.dico m.scu.stor agescu.int erfaces.IS toreCommit SCUControl ;
  32   import gov .va.med.im aging.exch ange.busin ess.dicom. DicomAE;
  33   import gov .va.med.im aging.exch ange.busin ess.dicom. StorageCom mitWorkIte m;
  34  
  35   import org .apache.lo gging.log4 j.LogManag er;
  36   import org .apache.lo gging.log4 j.Logger;
  37  
  38   /**
  39    *
  40    * This cl ass implem ents the I StoreCommi tSCUContro l Interfac e.  This c lass works  in the Di com 
  41    * Generic  Layer.  I t calls th e Dicom To olkit Laye r to imple ment Toolk it specifi c tasks.
  42    *
  43    *
  44    * @author   PII
  45    *
  46    */
  47   public cla ss StoreCo mmitSCUCon trolImpl i mplements  IStoreComm itSCUContr ol {
  48       
  49      /*
  50        * Cre ate an ISt oreCommitS CU instanc e.  This l ives in th e Dicom To olkit Laye r.
  51        */
  52       privat e IDicomSt oreCommitS CU storeCo mmitSCU =  null;
  53       
  54       privat e static f inal Logge r logger =  LogManage r.getLogge r (StoreCo mmitSCUCon trolImpl.c lass);
  55  
  56  
  57       /**
  58        * Con structor
  59        */
  60       public  StoreComm itSCUContr olImpl() {
  61           su per();
  62       }    
  63       
  64       
  65           @O verride
  66           pu blic void  openStoreC ommitAssoc iation(Dic omAE remot eAE, Strin g callingA ETitle)
  67           th rows Assoc iationReje ctExceptio n, Associa tionInitia lizationEx ception {
  68  
  69                    //In voke metho d in DICOM  Toolkit L ayer.
  70                    try{
  71                             this.s toreCommit SCU = (IDi comStoreCo mmitSCU)Sp ringContex t.getConte xt().getBe an("DicomS toreCommit SCU");
  72                             storeC ommitSCU.o penStoreCo mmitAssoci ation(remo teAE, call ingAETitle );
  73                    } 
  74                    catc h (DicomAs sociationR ejectExcep tion darX)  {
  75                logger.e rror(darX. getMessage ());
  76                logger.e rror(this. getClass() .getName() +": Except ion thrown  attemptin g to open  DICOM Asso ciation.   " +
  77                             "Assoc iation Rej ected.");
  78                throw ne w Associat ionRejectE xception(d arX);
  79                    } 
  80                    catc h (DicomAs sociationG eneralExce ption dagX ) {
  81                logger.e rror(dagX. getMessage ());
  82                logger.e rror(this. getClass() .getName() +": Except ion thrown  attemptin g to open  DICOM Asso ciation.   " +
  83                             "Assoc iation fai led.");          
  84                throw ne w Associat ionInitial izationExc eption(dag X);
  85                    }
  86           }
  87       
  88  
  89       /* (no n-Javadoc)
  90        * @se e gov.va.m ed.imaging .dicom.scu .storagesc u.interfac es.IStoreS CUControl# sendObject (gov.va.me d.imaging. dicom.comm on.interfa ces.IBusin essDataSet )
  91        */
  92           @O verride
  93       public  int sendN ERResponse (DicomAE r emoteAE, S torageComm itWorkItem  scWI)
  94       throws  SendInsta nceExcepti on, Associ ationAbort Exception{
  95           
  96                    int  result;
  97           // call metho d in Store SCU object  to proces s sending  of object.
  98           tr y{
  99                    resu lt = store CommitSCU. sendNERRes ponse(remo teAE, scWI );
  100           }
  101           ca tch(DicomA ssociation AbortExcep tion abort ){
  102                throw ne w Associat ionAbortEx ception(ab ort);
  103           }
  104           ca tch(DicomS toreSCUIns tanceExcep tion dsscu iX){
  105                throw ne w SendInst anceExcept ion(dsscui X);
  106           }
  107           re turn resul t;
  108       }
  109           
  110  
  111       /* (no n-Javadoc)
  112        * @se e gov.va.m ed.imaging .dicom.scu .storagesc u.interfac es.IStoreS CUControl# closeStore Associatio n(int)
  113        */
  114           @O verride
  115       public  void clos eStoreComm itAssociat ion()
  116                throws A ssociation AbortExcep tion {
  117           
  118           tr y{
  119                    stor eCommitSCU .closeStor eCommitAss ociation() ;
  120           }
  121           ca tch(DicomA ssociation AbortExcep tion abort ){
  122                logger.e rror(abort .getMessag e());
  123                logger.e rror(this. getClass() .getName() +": " +
  124                         "\nExcepti on thrown  while clos ing Associ ation.");
  125                throw ne w Associat ionAbortEx ception(ab ort);
  126           }
  127       }
  128  
  129  
  130   }