Produced by Araxis Merge on 12/5/2017 12:06:51 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\VixGuiImageDisplayApplet\main\src\java\gov\va\med\imaging\dicomviewer | ViewerApplication.java | Mon Dec 4 21:34:38 2017 UTC |
| 2 | IV-eHMP_CIF.zip\IMAG_Source\VISA\Java\VixGuiImageDisplayApplet\main\src\java\gov\va\med\imaging\dicomviewer | ViewerApplication.java | Mon Dec 4 22:07:24 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 226 |
| 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 | * Package : MAG - Vi stA Imagin g | |
| 3 | * WARNING : Per VHA Directive 2004-038, this routi ne should not be mod ified. | |
| 4 | * Date Cr eated: Aug 15, 2008 | |
| 5 | * Site Na me: Washi ngton OI F ield Offic e, Silver Spring, MD | |
| 6 | * @author
|
|
| 7 | * @versio n 1.0 | |
| 8 | * | |
| 9 | * ------- ---------- ---------- ---------- ---------- ---------- ------- | |
| 10 | * Propert y of the U S Governme nt. | |
| 11 | * No perm ission to copy or re distribute this soft ware is gi ven. | |
| 12 | * Use of unreleased versions of this so ftware req uires the user | |
| 13 | * to exec ute a writ ten test a greement w ith the Vi stA Imagin g | |
| 14 | * Develop ment Offic e of the D epartment of Veteran s Affairs, | |
| 15 | * telepho ne (301) 7 34-0100. | |
| 16 | * | |
| 17 | * The Foo d and Drug Administr ation clas sifies thi s software as | |
| 18 | * a Class II medica l device. As such, it may not be change d | |
| 19 | * in any way. Modi fications to this so ftware may result in an | |
| 20 | * adulter ated medic al device under 21CF R820, the use of whi ch | |
| 21 | * is cons idered to be a viola tion of US Federal S tatutes. | |
| 22 | * ------- ---------- ---------- ---------- ---------- ---------- ------- | |
| 23 | */ | |
| 24 | package go v.va.med.i maging.dic omviewer; | |
| 25 | ||
| 26 | import jav a.awt.Grap hicsDevice ; | |
| 27 | import jav a.awt.Grap hicsEnviro nment; | |
| 28 | import jav a.text.Dat eFormat; | |
| 29 | import jav a.text.Sim pleDateFor mat; | |
| 30 | import jav a.util.Dat e; | |
| 31 | import jav a.util.log ging.*; | |
| 32 | ||
| 33 | ||
| 34 | /** | |
| 35 | * @author
|
|
| 36 | * | |
| 37 | */ | |
| 38 | public cla ss ViewerA pplication | |
| 39 | { | |
| 40 | pr ivate stat ic ViewerF rame frame ; | |
| 41 | pr ivate stat ic Graphic sEnvironme nt gv; | |
| 42 | pr ivate stat ic Graphic sDevice de faultDevic e; | |
| 43 | ||
| 44 | /* * | |
| 45 | * @param ar gs | |
| 46 | * / | |
| 47 | pu blic stati c void mai n(String[] args) | |
| 48 | { | |
| 49 | Handler handler = new Consol eHandler() ; | |
| 50 | handler. setLevel ( Level.WARN ING); | |
| 51 | handler. setFormatt er( new Si mpleTextFo rmatter() ); | |
| 52 | ||
| 53 | Logger l ogger = Lo gger.getLo gger("gov. va.med"); | |
| 54 | ||
| 55 | logg er.addHand ler (handl er); | |
| 56 | logg er.setLeve l (Level.W ARNING); | |
| 57 | ||
| 58 | gv = Gra phicsEnvir onment.get LocalGraph icsEnviron ment(); | |
| 59 | defa ultDevice = gv.getDe faultScree nDevice(); | |
| 60 | ||
| 61 | fram e = new Vi ewerFrame( false); | |
| 62 | //fr ame.setIgn oreRepaint (true); | |
| 63 | //fr ame.setUnd ecorated(t rue); | |
| 64 | //fr ame.setRes izable(fal se); | |
| 65 | fram e.addWindo wListener( new java.a wt.event.W indowAdapt er() { | |
| 66 | public void wind owClosing( java.awt.e vent.Windo wEvent e) | |
| 67 | { | |
| 68 | System.e xit(0); | |
| 69 | } | |
| 70 | }); | |
| 71 | ||
| 72 | try | |
| 73 | { | |
| 74 | java.a wt.EventQu eue.invoke Later(new Runnable() { | |
| 75 | public v oid run() | |
| 76 | { | |
| 77 | //defaultD evice.setF ullScreenW indow(fram e); | |
| 78 | frame.setV isible(tru e); | |
| 79 | } | |
| 80 | }); | |
| 81 | } | |
| 82 | fina lly | |
| 83 | { | |
| 84 | defaul tDevice.se tFullScree nWindow(nu ll); | |
| 85 | } | |
| 86 | } | |
| 87 | ||
| 88 | static class Sim pleTextFor matter ext ends Forma tter | |
| 89 | { | |
| 90 | pr ivate Date Format df = new Simp leDateForm at("hh:mm: ss"); | |
| 91 | ||
| 92 | @Ove rride | |
| 93 | pu blic Strin g format(L ogRecord r ecord) | |
| 94 | { | |
| 95 | String Buffer sb = new Stri ngBuffer() ; | |
| 96 | ||
| 97 | sb.app end("[Thre ad-"); | |
| 98 | sb.app end(record .getThread ID()); | |
| 99 | sb.app end(']'); | |
| 100 | sb.app end( df.fo rmat(new D ate(record .getMillis ())) ); | |
| 101 | sb.app end(' '); | |
| 102 | sb.app end(record .getSource ClassName( )); | |
| 103 | sb.app end('.'); | |
| 104 | sb.app end(record .getSource MethodName ()); | |
| 105 | sb.app end(" \"") ; | |
| 106 | sb.app end(record .getMessag e()); | |
| 107 | sb.app end('\"'); | |
| 108 | sb.app end(System .getProper ty("line.s eparator") ); | |
| 109 | ||
| 110 | return sb.toStri ng(); | |
| 111 | } | |
| 112 | ||
| 113 | } | |
| 114 | ||
| 115 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.