Produced by Araxis Merge on 7/10/2017 1:01:43 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.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | C:\AraxisMergeCompare\Pri_un\IV-ehmp_cif\CoreValueObjects\main\src\java\gov\va\med\imaging\monitorederrors | MonitoredErrors.java | Thu Jun 29 17:22:21 2017 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\IV-ehmp_cif\CoreValueObjects\main\src\java\gov\va\med\imaging\monitorederrors | MonitoredErrors.java | Thu Jul 6 15:00:13 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 254 |
| 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: Jan 28, 2013 | |
| 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.mon itorederro rs; | |
| 27 | ||
| 28 | import jav a.util.Arr ayList; | |
| 29 | import jav a.util.Lis t; | |
| 30 | ||
| 31 | /** | |
| 32 | * @author
|
|
| 33 | * | |
| 34 | */ | |
| 35 | public cla ss Monitor edErrors | |
| 36 | { | |
| 37 | pr ivate List <Monitored Error> mon itoredErro rs = | |
| 38 | new Ar rayList<Mo nitoredErr or>(); | |
| 39 | pr ivate bool ean enable d; | |
| 40 | ||
| 41 | pr ivate Moni toredError s() | |
| 42 | { | |
| 43 | supe r(); | |
| 44 | } | |
| 45 | ||
| 46 | pr ivate stat ic Monitor edErrors s ingleton = null; | |
| 47 | ||
| 48 | pr ivate sync hronized s tatic Moni toredError s getSingl eton() | |
| 49 | { | |
| 50 | if(s ingleton = = null) | |
| 51 | { | |
| 52 | single ton = new MonitoredE rrors(); | |
| 53 | single ton.loadFr omConfigur ationFile( ); | |
| 54 | } | |
| 55 | retu rn singlet on; | |
| 56 | } | |
| 57 | ||
| 58 | pu blic synch ronized st atic List< MonitoredE rror> getM onitoredEr rors() | |
| 59 | { | |
| 60 | retu rn getSing leton().mo nitoredErr ors; | |
| 61 | } | |
| 62 | ||
| 63 | /* * | |
| 64 | * This meth od updates the monit ored error s based on the confi guration f ile. This does not r emove old monitored errors tha t are no l onger moni tored but they will not be col lected any more | |
| 65 | * / | |
| 66 | pr ivate void loadFromC onfigurati onFile() | |
| 67 | { | |
| 68 | Moni toredError Configurat ion config = Monitor edErrorCon figuration .getMonito redConfigu ration(); | |
| 69 | this .enabled = config.is Enabled(); | |
| 70 | for( String mon itoredErro r : config .getMonito redErrors( )) | |
| 71 | { | |
| 72 | addMon itoredErro rOrSetActi ve(monitor edError); | |
| 73 | } | |
| 74 | } | |
| 75 | ||
| 76 | /* * | |
| 77 | * This meth od updates the monit ored error s based on the confi guration f ile. This does not r emove old monitored errors tha t are no l onger moni tored but they will not be col lected any more | |
| 78 | * / | |
| 79 | pu blic synch ronized st atic void reloadFrom Configurat ion() | |
| 80 | { | |
| 81 | Moni toredError s monitore dErrors = getSinglet on(); | |
| 82 | moni toredError s.setAllMo nitoredErr orsInactiv e(); | |
| 83 | moni toredError s.loadFrom Configurat ionFile(); | |
| 84 | } | |
| 85 | ||
| 86 | pr ivate void setAllMon itoredErro rsInactive () | |
| 87 | { | |
| 88 | for( MonitoredE rror me : monitoredE rrors) | |
| 89 | { | |
| 90 | me.set Active(fal se); | |
| 91 | } | |
| 92 | } | |
| 93 | ||
| 94 | pr ivate void addMonito redErrorOr SetActive( String err orMsg) | |
| 95 | { | |
| 96 | for( MonitoredE rror monit oredError : monitore dErrors) | |
| 97 | { | |
| 98 | if(mon itoredErro r.isErrorM sgMonitore d(errorMsg )) | |
| 99 | { | |
| 100 | monitore dError.set Active(tru e); | |
| 101 | return; | |
| 102 | } | |
| 103 | } | |
| 104 | // t his error message is not alrea dy monitor ed, add it | |
| 105 | this .monitored Errors.add (new Monit oredError( errorMsg, true)); | |
| 106 | } | |
| 107 | ||
| 108 | /* * | |
| 109 | * Increment the count for an er ror messag e if enabl ed and thi s error me ssage is m onitored | |
| 110 | * @param er rorMsg | |
| 111 | * / | |
| 112 | pu blic synch ronized st atic void addIfMonit ored(Strin g errorMsg ) | |
| 113 | { | |
| 114 | Moni toredError s monitore dErrors = getSinglet on(); | |
| 115 | ||
| 116 | if(m onitoredEr rors.enabl ed && erro rMsg != nu ll && erro rMsg.lengt h() > 0) | |
| 117 | { | |
| 118 | for(Mo nitoredErr or monitor edError : monitoredE rrors.moni toredError s) | |
| 119 | { | |
| 120 | if(monit oredError. isActive() && monito redError.i sErrorMsgM onitored(e rrorMsg)) | |
| 121 | { | |
| 122 | monitoredE rror.incre mentErrorC ount(); | |
| 123 | break; | |
| 124 | } | |
| 125 | } | |
| 126 | } | |
| 127 | } | |
| 128 | ||
| 129 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.