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

784.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\ImagingDicomRouter\main\src\java\gov\va\med\imaging\dicom DicomRouter.java Thu Oct 11 13:30:20 2018 UTC
2 VIX_SIV_v3_0_patch_201_build_8.zip\v3.0_patch_201_build_8\VISA\Java\ImagingDicomRouter\main\src\java\gov\va\med\imaging\dicom DicomRouter.java Wed Oct 17 18:55:30 2018 UTC

784.2 Comparison summary

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

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

784.4 Active regular expressions

No regular expressions were active.

784.5 Comparison detail

  1   package go v.va.med.i maging.dic om;
  2  
  3   import jav a.util.Lis t;
  4   import jav a.util.Obs erver;
  5  
  6   import gov .va.med.Ro utingToken ;
  7   import gov .va.med.im aging.core .annotatio ns.routerf acade.Faca deRouterIn terface;
  8   import gov .va.med.im aging.core .annotatio ns.routerf acade.Faca deRouterIn terfaceCom mandTester ;
  9   import gov .va.med.im aging.core .annotatio ns.routerf acade.Faca deRouterMe thod;
  10   import gov .va.med.im aging.core .interface s.FacadeRo uter;
  11   import gov .va.med.im aging.core .interface s.exceptio ns.Connect ionExcepti on;
  12   import gov .va.med.im aging.core .interface s.exceptio ns.MethodE xception;
  13   import gov .va.med.im aging.dico m.common.D icomFileMe taInfo;
  14   import gov .va.med.im aging.dico m.common.i nterfaces. IDicomData Set;
  15   import gov .va.med.im aging.dico m.common.i nterfaces. IFindSCPRe sponseCall back;
  16   import gov .va.med.im aging.exch ange.busin ess.EmailM essage;
  17   import gov .va.med.im aging.exch ange.busin ess.dicom. CFindResul ts;
  18   import gov .va.med.im aging.exch ange.busin ess.dicom. CMoveResul ts;
  19   import gov .va.med.im aging.exch ange.busin ess.dicom. DGWEmailIn fo;
  20   import gov .va.med.im aging.exch ange.busin ess.dicom. DicomAE;
  21   import gov .va.med.im aging.exch ange.busin ess.dicom. DicomInsta nceSet;
  22   import gov .va.med.im aging.exch ange.busin ess.dicom. DicomReque stParamete rs;
  23   import gov .va.med.im aging.exch ange.busin ess.dicom. DicomStora geResults;
  24   import gov .va.med.im aging.exch ange.busin ess.dicom. InstanceSt orageInfo;
  25   import gov .va.med.im aging.exch ange.busin ess.dicom. Instrument Config;
  26   import gov .va.med.im aging.exch ange.busin ess.dicom. ModalityCo nfig;
  27   import gov .va.med.im aging.exch ange.busin ess.dicom. MoveComman dObserver;
  28   import gov .va.med.im aging.exch ange.busin ess.dicom. StorageCom mitWorkIte m;
  29   import gov .va.med.im aging.exch ange.busin ess.dicom. UIDActionC onfig;
  30   import gov .va.med.im aging.exch ange.busin ess.dicom. rdsr.Dose;
  31  
  32   /**
  33    * 
  34    * @author   PII
  35    *
  36    */
  37   @FacadeRou terInterfa ce
  38   @FacadeRou terInterfa ceCommandT ester
  39   public int erface Dic omRouter e xtends Fac adeRouter
  40   {
  41           @F acadeRoute rMethod(as ynchronous =false)
  42           pu blic CFind Results ge tCFindResu lts(DicomR equestPara meters req uest)
  43           th rows Metho dException , Connecti onExceptio n;
  44           
  45           @F acadeRoute rMethod(as ynchronous =false)
  46           pu blic Boole an process CFindResul ts(CFindRe sults resu lts, Dicom AE dicomAE , IFindSCP ResponseCa llback cFi ndCallback )
  47                             throws  MethodExc eption, Co nnectionEx ception;
  48           
  49           @D eprecated
  50           @F acadeRoute rMethod(as ynchronous =false)
  51           pu blic Strin g getStudy Details(St ring study Id) 
  52                    thro ws MethodE xception,  Connection Exception;
  53  
  54           @F acadeRoute rMethod(as ynchronous =false)
  55           pu blic MoveC ommandObse rver proce ssCMoveRes ults(Strin g storeAET itle, Dico mRequestPa rameters r equest, Ob server scp Listener)
  56           th rows Metho dException , Connecti onExceptio n;
  57           
  58           @F acadeRoute rMethod(as ynchronous =false)
  59           pu blic CMove Results ge tCMoveResu lts(DicomR equestPara meters req uest)
  60           th rows Metho dException , Connecti onExceptio n;
  61           
  62           @F acadeRoute rMethod(as ynchronous =true)
  63           pu blic void  postDicomI nstanceSet (String st oreAETitle , DicomIns tanceSet i nstances,  Observer s cpListener
  64                    Move CommandObs erver canc elMove) 
  65                    thro ws MethodE xception,  Connection Exception;     
  66           
  67           @F acadeRoute rMethod(as ynchronous =false)
  68           pu blic IDico mDataSet g etDicomDat aSet(Insta nceStorage Info insta nce) 
  69                             throws  MethodExc eption, Co nnectionEx ception;
  70           
  71           @D eprecated
  72           @F acadeRoute rMethod(as ynchronous =false)
  73           pu blic Strin g getImage Details(St ring image
  74                    thro ws MethodE xception,  Connection Exception;
  75           
  76           //
  77           //  Configura tion-relat ed router  methods
  78           //       
  79           @F acadeRoute rMethod(as ynchronous =false)
  80           pu blic Dicom AE getRemo teAE(Dicom AE.searchM ode findMo de, String  aeTitle,  String sit eNumber)
  81                    thro ws MethodE xception,  Connection Exception;
  82  
  83           @F acadeRoute rMethod(as ynchronous =false)
  84           pu blic Dicom AE getRemo teServiceA E(RoutingT oken routi ngToken, D icomAE.sea rchMode fi ndMode, St ring aeTit le, String  siteNumbe r)
  85                    thro ws MethodE xception,  Connection Exception;
  86  
  87           @F acadeRoute rMethod(as ynchronous =false)
  88           pu blic Boole an getModa lityDevice Authentica ted(String  manufactu rer, Strin g model, S tring soft wareVersio n)
  89                    thro ws MethodE xception,  Connection Exception;
  90           
  91           @F acadeRoute rMethod(as ynchronous =false)
  92           pu blic Boole an getDico mGatewayCo nfig() 
  93                    thro ws MethodE xception,  Connection Exception;
  94  
  95           @F acadeRoute rMethod(as ynchronous =false)
  96           pu blic List< Instrument Config> ge tDgwInstru mentList(S tring host Name) 
  97                    thro ws MethodE xception,  Connection Exception;
  98  
  99           @F acadeRoute rMethod(as ynchronous =false)
  100           pu blic List< ModalityCo nfig> getD gwModality List(Strin g hostName
  101                    thro ws MethodE xception,  Connection Exception;
  102  
  103   //      @F acadeRoute rMethod(as ynchronous =false)
  104   //      pu blic List< SourceAESe curityConf ig> getSou rceAESecur ityMatrix(
  105   //               thro ws MethodE xception,  Connection Exception;
  106   //
  107           @F acadeRoute rMethod(as ynchronous =false)
  108           pu blic DGWEm ailInfo ge tDgwEmailI nfo(String  hostName)  
  109                    thro ws MethodE xception,  Connection Exception;
  110  
  111           @F acadeRoute rMethod(as ynchronous =false)
  112           pu blic List< UIDActionC onfig> get DgwUIDActi onTable(St ring type,  String su bType, Str ing action
  113                    thro ws MethodE xception,  Connection Exception;
  114  
  115           //
  116           //  Storage
  117           //
  118           @F acadeRoute rMethod(as ynchronous =false)
  119           pu blic Dicom StorageRes ults postD icomInstan ce(
  120                             IDicom DataSet dd s, 
  121                             DicomA E dicomAE,  
  122                             Instru mentConfig  instrumen t, 
  123                             DicomF ileMetaInf o metaData
  124                             int io dValidatio nStatus) 
  125                    thro ws MethodE xception,  Connection Exception;
  126  
  127           //
  128           //  Storage C ommit
  129           //
  130           @F acadeRoute rMethod(as ynchronous =false)
  131           pu blic Integ er postDic omStorageC ommit(
  132                             Storag eCommitWor kItem sCWI ,
  133                             DicomA E dicomAE,  
  134                             Instru mentConfig  instrumen t) 
  135                    thro ws MethodE xception,  Connection Exception;
  136           
  137           @F acadeRoute rMethod(as ynchronous =false)
  138           pu blic Integ er postDic omStorageC ommitRespo nse(Storag eCommitWor kItem sCWI
  139                    thro ws MethodE xception,  Connection Exception;     
  140           
  141  
  142           //
  143           //  Email Que ueing
  144           //
  145           @F acadeRoute rMethod(as ynchronous =false)
  146           pu blic Boole an postToE mailQueue( EmailMessa ge email,  String scp Context)
  147                    thro ws MethodE xception,  Connection Exception;
  148           
  149           @F acadeRoute rMethod(as ynchronous =false)
  150           pu blic List< Dose> getR adiationDo seDetails( String pat ientDfn, S tring acce ssionNumbe r)
  151                             throws  MethodExc eption, Co nnectionEx ception;
  152  
  153           @F acadeRoute rMethod(as ynchronous =false, co mmandClass Name="GetA EListDataS ourceComma nd")
  154           pu blic abstr act List<D icomAE> ge tAEList(Ro utingToken  routingTo ken)
  155                    thro ws MethodE xception,  Connection Exception;
  156  
  157           @F acadeRoute rMethod(as ynchronous =true, com mandClassN ame="PostD icomObject FileComman d")
  158           pu blic abstr act void p ostDicomOb jectFile(R outingToke n routingT oken, Stri ng dicomFi leSpec);
  159  
  160           @F acadeRoute rMethod(as ynchronous =true, com mandClassN ame="PostD icomObject FilesToLis tedAEsComm and")
  161           pu blic abstr act void p ostDicomOb jectFilesT oListedAEs (RoutingTo ken routin gToken, Li st<String>  dicomFile s);
  162           
  163           @F acadeRoute rMethod(as ynchronous =false, co mmandClass Name="Post ToAEDataSo urceComman d")
  164           pu blic abstr act void p ostToAE(Ro utingToken  routingTo ken, Dicom AE aet, Li st<String>  dicomFile s)
  165                    thro ws MethodE xception,  Connection Exception;
  166  
  167  
  168  
  169   }