Produced by Araxis Merge on 12/5/2017 12:06:34 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.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | IV-eHMP_CIF.zip\IMAG_Source\VISA\Java\AwivClientWebApp\main\src\java\gov\va\med\imaging\awiv\server | AbstractAwivClientRemoteServiceServlet.java | Mon Dec 4 21:35:14 2017 UTC |
| 2 | IV-eHMP_CIF.zip\IMAG_Source\VISA\Java\AwivClientWebApp\main\src\java\gov\va\med\imaging\awiv\server | AbstractAwivClientRemoteServiceServlet.java | Mon Dec 4 21:56:55 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 288 |
| Changed | 2 | 4 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| 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 |
No regular expressions were active.
| 1 | /** | |
| 2 | * | |
| 3 | Package: MAG - Vis tA Imaging | |
| 4 | WARNING: Per VHA D irective 2 004-038, t his routin e should n ot be modi fied. | |
| 5 | Date Cre ated: Dec 23, 2011 | |
| 6 | Site Nam e: Washin gton OI Fi eld Office , Silver S pring, MD | |
| 7 | Developer:
|
|
| 8 | Descript ion: | |
| 9 | ||
| 10 | ;; +-------- ---------- ---------- ---------- ---------- ---------- ---------- + | |
| 11 | ;; Property of the US Government . | |
| 12 | ;; No permis sion to co py or redi stribute t his softwa re is give n. | |
| 13 | ;; Use of un released v ersions of this soft ware requi res the us er | |
| 14 | ;; to execu te a writt en test ag reement wi th the Vis tA Imaging | |
| 15 | ;; Developm ent Office of the De partment o f Veterans Affairs, | |
| 16 | ;; telephon e (301) 73 4-0100. | |
| 17 | ;; | |
| 18 | ;; The Food and Drug A dministrat ion classi fies this software a s | |
| 19 | ;; a Class I I medical device. A s such, it may not b e changed | |
| 20 | ;; in any wa y. Modifi cations to this soft ware may r esult in a n | |
| 21 | ;; adulterat ed medical device un der 21CFR8 20, the us e of which | |
| 22 | ;; is consid ered to be a violati on of US F ederal Sta tutes. | |
| 23 | ;; +-------- ---------- ---------- ---------- ---------- ---------- ---------- + | |
| 24 | ||
| 25 | */ | |
| 26 | package go v.va.med.i maging.awi v.server; | |
| 27 | ||
| 28 | import gov .va.med.im aging.arti factsource .ArtifactS ource; | |
| 29 | import gov .va.med.im aging.arti factsource .ResolvedA rtifactSou rce; | |
| 30 | import gov .va.med.im aging.awiv .web.UserD etails; | |
| 31 | import gov .va.med.im aging.exch ange.busin ess.Site; | |
| 32 | import gov .va.med.im aging.tomc at.vistare alm.VistaR ealmPrinci pal.Authen ticationCr edentialsT ype; | |
| 33 | import gov .va.med.im aging.tran sactioncon text.Clien tPrincipal ; | |
| 34 | import gov .va.med.im aging.tran sactioncon text.Trans actionCont ext; | |
| 35 | import gov .va.med.im aging.tran sactioncon text.Trans actionCont extFactory ; | |
| 36 | ||
| 37 | import jav a.util.Arr ayList; | |
| 38 | import jav a.util.Com parator; | |
| 39 | import jav a.util.Has hMap; | |
| 40 | import jav a.util.UUI D; | |
| 41 | ||
| 42 | import org .apache.lo gging.log4 j.LogManag er; | |
| 43 | import org .apache.lo gging.log4 j.Logger; | |
| 44 | ||
| 45 | import com .google.gw t.user.ser ver.rpc.Re moteServic eServlet; | |
| 46 | ||
| 47 | /** | |
| 48 | * @author
|
|
| 49 | * | |
| 50 | */ | |
| 51 | public abs tract clas s Abstract AwivClient RemoteServ iceServlet | |
| 52 | extends Re moteServic eServlet | |
| 53 | { | |
| 54 | pr ivate stat ic final l ong serial VersionUID = 8545988 3573675629 61L; | |
| 55 | pr ivate fina l static L ogger logg er = LogMa nager.getL ogger(Abst ractAwivCl ientRemote ServiceSer vlet.class ); | |
| 56 | ||
| 57 | pr otected Lo gger getLo gger() | |
| 58 | { | |
| 59 | retu rn logger; | |
| 60 | } | |
| 61 | ||
| 62 | pr otected vo id setTran sactionCon textProper ties(Strin g transact ionId, Str ing method Name) | |
| 63 | { | |
| 64 | setT ransaction ContextPro perties(tr ansactionI d, methodN ame, null, null); | |
| 65 | } | |
| 66 | ||
| 67 | pr otected vo id setTran sactionCon textProper ties(Strin g transact ionId, Str ing method Name, Stri ng patient Icn) | |
| 68 | { | |
| 69 | setT ransaction ContextPro perties(tr ansactionI d, methodN ame, patie ntIcn, nul l); | |
| 70 | } | |
| 71 | ||
| 72 | /* | |
| 73 | pr otected vo id setTran sactionCon textProper ties(Strin g methodNa me, String patientIc n, String urn) | |
| 74 | { | |
| 75 | setT ransaction ContextPro perties(nu ll, method Name, pati entIcn, nu ll); | |
| 76 | }* / | |
| 77 | ||
| 78 | pr otected vo id setTran sactionCon textProper ties(Strin g transact ionId, Str ing method Name, Stri ng patient Icn, Strin g urn) | |
| 79 | { | |
| 80 | Tran sactionCon text trans actionCont ext = Tran sactionCon textFactor y.get(); | |
| 81 | if(t ransaction Id == null ) | |
| 82 | transa ctionConte xt.setTran sactionId( UUID.rando mUUID().to String()); | |
| 83 | else | |
| 84 | transa ctionConte xt.setTran sactionId( transactio nId); | |
| 85 | tran sactionCon text.setRe questType( "AWIV Clie nt Web App " + metho dName); | |
| 86 | if(p atientIcn != null) | |
| 87 | transa ctionConte xt.setPati entID(pati entIcn); | |
| 88 | if(u rn != null ) | |
| 89 | transa ctionConte xt.setUrn( urn); | |
| 90 | } | |
| 91 | ||
| 92 | pr otected vo id setEntr iesReturne d(Integer entriesRet urned) | |
| 93 | { | |
| 94 | Tran sactionCon textFactor y.get().se tEntriesRe turned(ent riesReturn ed); | |
| 95 | } | |
| 96 | ||
| 97 | pr otected St ring getUs erSiteNumb er() | |
| 98 | { | |
| 99 | User Details us er = getUs erDetails( ); | |
| 100 | retu rn user.ge tSiteNumbe r(); | |
| 101 | } | |
| 102 | ||
| 103 | pr otected Us erDetails getUserDet ails() | |
| 104 | { | |
| 105 | //re turn new U serDetails (this.getT hreadLocal Request(). getSession (false)); | |
| 106 | ||
| 107 | // t he filter should hav e put the informatio n into pla ce | |
| 108 | retu rn new Use rDetails(T ransaction ContextFac tory.get() ); | |
| 109 | } | |
| 110 | ||
| 111 | pr otected vo id setUser Credential s(String s iteNumber, String us ername, St ring passw ord) | |
| 112 | { | |
| 113 | Clie ntPrincipa l principa l = new Cl ientPrinci pal( | |
| 114 | siteNumb er, true,A uthenticat ionCredent ialsType.P assword, | |
| 115 | username , password , | |
| 116 | null, nu ll, null, null, null , | |
| 117 | new Arra yList<Stri ng>(), | |
| 118 | new Hash Map<String , Object>( ) | |
| 119 | ); | |
| 120 | Tran sactionCon textFactor y.createCl ientTransa ctionConte xt(princip al); | |
| 121 | } | |
| 122 | ||
| 123 | pr otected cl ass Resolv edArtifact SourceComp arator | |
| 124 | im plements C omparator< ResolvedAr tifactSour ce> | |
| 125 | { | |
| 126 | ||
| 127 | /* ( non-Javado c) | |
| 128 | * @ see java.u til.Compar ator#compa re(java.la ng.Object, java.lang .Object) | |
| 129 | */ | |
| 130 | @Ove rride | |
| 131 | publ ic int com pare(Resol vedArtifac tSource so urce1, Res olvedArtif actSource source2) | |
| 132 | { | |
| 133 | Artifa ctSource a 1 = source 1.getArtif actSource( ); | |
| 134 | Artifa ctSource a 2 = source 2.getArtif actSource( ); | |
| 135 | if(a1 instanceof Site && a 2 instance of Site) | |
| 136 | { | |
| 137 | Site s1 = (Site)a1 ; | |
| 138 | Site s2 = (Site)a2 ; | |
| 139 | return s 1.getSiteN ame().comp areToIgnor eCase(s2.g etSiteName ()); | |
| 140 | } | |
| 141 | return 0; | |
| 142 | } | |
| 143 | ||
| 144 | } | |
| 145 | ||
| 146 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.