Produced by Araxis Merge on 6/5/2018 10:24:08 AM 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 | patch_205_build_9.zip\Java\DicomDataSet\war\DicomDataSet | hosted.html | Wed May 30 14:35:16 2018 UTC |
2 | patch_205_build_9.zip\Java\DicomDataSet\war\DicomDataSet | hosted.html | Fri Jun 1 19:31:47 2018 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 2 | 726 |
Changed | 1 | 2 |
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 | <html> | |
2 | <head><scr ipt> | |
3 | var $wnd = parent; | |
4 | var $doc = $wnd.docu ment; | |
5 | var $modul eName, $mo duleBase, $entry | |
6 | ,$stats = $wnd.__gwt StatsEvent ? functio n(a) {retu rn $wnd.__ gwtStatsEv ent(a);} : null | |
7 | ,$sessionI d = $wnd._ _gwtStatsS essionId ? $wnd.__gw tStatsSess ionId : nu ll; | |
8 | // Lightwe ight metri cs | |
9 | if ($stats ) { | |
10 | var modu leFuncName = locatio n.search.s ubstr(1); | |
11 | var modu leFunc = $ wnd[module FuncName]; | |
12 | var modu leName = m oduleFunc ? moduleFu nc.moduleN ame : "unk nown"; | |
13 | $stats({ moduleName :moduleNam e,sessionI d:$session Id,subSyst em:'startu p',evtGrou p:'moduleS tartup',mi llis:(new Date()).ge tTime(),ty pe:'module EvalStart' }); | |
14 | } | |
15 | var $hoste dHtmlVersi on="2.1"; | |
16 | ||
17 | var gwtOnL oad; | |
18 | var $hoste d = "local host: PORT "; | |
19 | ||
20 | function l oadIframe( url) { | |
21 | var topD oc = windo w.top.docu ment; | |
22 | ||
23 | // creat e an ifram e | |
24 | var ifra meDiv = to pDoc.creat eElement(" div"); | |
25 | iframeDi v.innerHTM L = "<ifra me scrolli ng=no fram eborder=0 src='" + u rl + "'>"; | |
26 | var ifra me = ifram eDiv.first Child; | |
27 | ||
28 | // mess with the i frame styl e a little | |
29 | var ifra meStyle = iframe.sty le; | |
30 | iframeSt yle.positi on = "abso lute"; | |
31 | iframeSt yle.border Width = "0 "; | |
32 | iframeSt yle.left = "0"; | |
33 | iframeSt yle.top = "0"; | |
34 | iframeSt yle.width = "100%"; | |
35 | iframeSt yle.backgr oundColor = "#ffffff "; | |
36 | iframeSt yle.zIndex = "1"; | |
37 | iframeSt yle.height = "100%"; | |
38 | ||
39 | // updat e the top window's d ocument's body's sty le | |
40 | var host BodyStyle = window.t op.documen t.body.sty le; | |
41 | hostBody Style.marg in = "0"; | |
42 | hostBody Style.heig ht = ifram eStyle.hei ght; | |
43 | hostBody Style.over flow = "hi dden"; | |
44 | ||
45 | // inser t the ifra me | |
46 | topDoc.b ody.insert Before(ifr ame, topDo c.body.fir stChild); | |
47 | } | |
48 | ||
49 | var ua = n avigator.u serAgent.t oLowerCase (); | |
50 | if (ua.ind exOf("geck o") != -1) { | |
51 | // insta ll eval wr apper on F F to avoid EvalError problem | |
52 | var __ev al = windo w.eval; | |
53 | window.e val = func tion(s) { | |
54 | return __eval(s) ; | |
55 | } | |
56 | } | |
57 | if (ua.ind exOf("chro me") != -1 ) { | |
58 | // work around __g wt_ObjectI d appearin g in JS ob jects | |
59 | var hop = Object.p rototype.h asOwnPrope rty; | |
60 | Object.p rototype.h asOwnPrope rty = func tion(prop) { | |
61 | return prop != " __gwt_Obje ctId" && h op.call(th is, prop); | |
62 | }; | |
63 | // do th e same in our parent as well - - see issu e 4486 | |
64 | // NOTE: this will have to b e changed when we su pport non- iframe-bas ed DevMode | |
65 | var hop2 = parent. Object.pro totype.has OwnPropert y; | |
66 | parent.O bject.prot otype.hasO wnProperty = functio n(prop) { | |
67 | return prop != " __gwt_Obje ctId" && h op2.call(t his, prop) ; | |
68 | }; | |
69 | } | |
70 | ||
71 | // wrapper to call J S methods, which we need both to be able to supply a | |
72 | // differe nt this fo r method l ookup and to get the exception back | |
73 | function _ _gwt_jsInv oke(thisOb j, methodN ame) { | |
74 | try { | |
75 | var ar gs = Array .prototype .slice.cal l(argument s, 2); | |
76 | return [0, windo w[methodNa me].apply( thisObj, a rgs)]; | |
77 | } catch (e) { | |
78 | return [1, e]; | |
79 | } | |
80 | } | |
81 | ||
82 | var __gwt_ javaInvoke s = []; | |
83 | function _ _gwt_makeJ avaInvoke( argCount) { | |
84 | return _ _gwt_javaI nvokes[arg Count] || __gwt_doMa keJavaInvo ke(argCoun t); | |
85 | } | |
86 | ||
87 | function _ _gwt_doMak eJavaInvok e(argCount ) { | |
88 | // IE6 w on't eval( ) anonymou s function s except a s r-values | |
89 | var argL ist = ""; | |
90 | for (var i = 0; i < argCount ; i++) { | |
91 | argLis t += ",p" + i; | |
92 | } | |
93 | var argL istNoComma = argList .substring (1); | |
94 | ||
95 | return e val( | |
96 | "__gwt _javaInvok es[" + arg Count + "] =\n" + | |
97 | " fun ction(this Obj, dispI d" + argLi st + ") {\ n" + | |
98 | " v ar result = __static (dispId, t hisObj" + argList + ");\n" + | |
99 | " i f (result[ 0]) {\n" + | |
100 | " throw res ult[1];\n" + | |
101 | " } else {\n" + | |
102 | " return re sult[1];\n " + | |
103 | " } \n" + | |
104 | " }\n " | |
105 | ); | |
106 | } | |
107 | ||
108 | /* | |
109 | * This is used to c reate tear -offs of J ava method s. Each f unction co rresponds | |
110 | * to exac tly one di spId, and also embed s the argu ment count . We get the "this" | |
111 | * value f rom the co ntext in w hich the f unction is being exe cuted. | |
112 | * Functio n-object i dentity is preserved by cachin g in a spa rse array. | |
113 | */ | |
114 | var __gwt_ tearOffs = []; | |
115 | var __gwt_ tearOffGen erators = []; | |
116 | function _ _gwt_makeT earOff(pro xy, dispId , argCount ) { | |
117 | return _ _gwt_tearO ffs[dispId ] || __gwt _doMakeTea rOff(dispI d, argCoun t); | |
118 | } | |
119 | ||
120 | function _ _gwt_doMak eTearOff(d ispId, arg Count) { | |
121 | return _ _gwt_tearO ffs[dispId ] = | |
122 | (__g wt_tearOff Generators [argCount] || __gwt_ doMakeTear OffGenerat or(argCoun t))(dispId ); | |
123 | } | |
124 | ||
125 | function _ _gwt_doMak eTearOffGe nerator(ar gCount) { | |
126 | // IE6 w on't eval( ) anonymou s function s except a s r-values | |
127 | var argL ist = ""; | |
128 | for (var i = 0; i < argCount ; i++) { | |
129 | argLis t += ",p" + i; | |
130 | } | |
131 | var argL istNoComma = argList .substring (1); | |
132 | ||
133 | return e val( | |
134 | "__gwt _tearOffGe nerators[" + argCoun t + "] =\n " + | |
135 | " fun ction(disp Id) {\n" + | |
136 | " r eturn func tion(" + a rgListNoCo mma + ") { \n" + | |
137 | " var resul t = __stat ic(dispId, this" + a rgList + " );\n" + | |
138 | " if (resul t[0]) {\n" + | |
139 | " throw r esult[1];\ n" + | |
140 | " } else {\ n" + | |
141 | " return result[1]; \n" + | |
142 | " }\n" + | |
143 | " } \n" + | |
144 | " }\n " | |
145 | ); | |
146 | } | |
147 | ||
148 | function _ _gwt_makeR esult(isEx ception, r esult) { | |
149 | return [ isExceptio n, result] ; | |
150 | } | |
151 | ||
152 | function _ _gwt_disco nnected() { | |
153 | // Preve nt double- invocation . | |
154 | window._ _gwt_disco nnected = new Functi on(); | |
155 | // Do it in a time out so we can be sur e we have a clean st ack. | |
156 | window.s etTimeout( __gwt_disc onnected_i mpl, 1); | |
157 | } | |
158 | ||
159 | function _ _gwt_disco nnected_im pl() { | |
160 | __gwt_di splayGlass Message('G WT Code Se rver Disco nnected', | |
161 | 'Mos t likely, you closed GWT Devel opment Mod e. Or, you might hav e lost ' | |
162 | + 'n etwork con nectivity. To fix th is, try re starting G WT Develop ment Mode and ' | |
163 | + '< a style="c olor: #FFF FFF; font- weight: bo ld;" href= "javascrip t:location .reload()" >' | |
164 | + 'R EFRESH</a> this page .'); | |
165 | } | |
166 | ||
167 | // Keep tr ack of z-i ndex to al low layeri ng of mult iple glass messages | |
168 | var __gwt_ glassMessa geZIndex = 214748364 7; | |
169 | ||
170 | // Note th is method is also us ed by Modu leSpace.ja va | |
171 | function _ _gwt_displ ayGlassMes sage(summa ry, detail s) { | |
172 | var topW in = windo w.top; | |
173 | var topD oc = topWi n.document ; | |
174 | var oute r = topDoc .createEle ment("div" ); | |
175 | // Do no t insert w hitespace or outer.f irstChild will get a text node . | |
176 | outer.in nerHTML = | |
177 | '<div style="pos ition:abso lute;z-ind ex:' + __g wt_glassMe ssageZInde x-- + | |
178 | ';left :50px;top: 50px;width :600px;col or:#FFF;fo nt-family: verdana;te xt-align:l eft;">' + | |
179 | '<div style="fon t-size:30p x;font-wei ght:bold;" >' + summa ry + '</di v>' + | |
180 | '<div style="fon t-size:15p x;">' + de tails + '< /div>' + | |
181 | '</div >' + | |
182 | '<div style="pos ition:abso lute;z-ind ex:' + __g wt_glassMe ssageZInde x-- + | |
183 | ';left :0px;top:0 px;right:0 px;bottom: 0px;filter :alpha(opa city=60);o pacity:0.6 ;backgroun d-color:#0 00;"></div >' | |
184 | ; | |
185 | topDoc.b ody.append Child(oute r); | |
186 | var glas s = outer. firstChild ; | |
187 | var glas sStyle = g lass.style ; | |
188 | ||
189 | // Scrol l to the t op and rem ove scroll bars. | |
190 | topWin.s crollTo(0, 0); | |
191 | if (topD oc.compatM ode == "Ba ckCompat") { | |
192 | topDoc .body.styl e["overflo w"] = "hid den"; | |
193 | } else { | |
194 | topDoc .documentE lement.sty le["overfl ow"] = "hi dden"; | |
195 | } | |
196 | ||
197 | // Steal focus. | |
198 | glass.fo cus(); | |
199 | ||
200 | if ((nav igator.use rAgent.ind exOf("MSIE ") >= 0) & & (topDoc. compatMode == "BackC ompat")) { | |
201 | // IE quirks mod e doesn't support ri ght/bottom , but does support t his. | |
202 | glassS tyle.width = "125%"; | |
203 | glassS tyle.heigh t = "100%" ; | |
204 | } else i f (navigat or.userAge nt.indexOf ("MSIE 6") >= 0) { | |
205 | // IE6 doesn't h ave a real standards mode, so we have to use hacks . | |
206 | glassS tyle.width = "125%"; // Get pa st scroll bar area. | |
207 | // Nas ty CSS; on resize wou ld be bett er but the outer win dow won't let us add a listene r IE. | |
208 | glassS tyle.setEx pression(" height", " document.d ocumentEle ment.clien tHeight"); | |
209 | } | |
210 | ||
211 | $doc.tit le = summa ry + " [" + $doc.tit le + "]"; | |
212 | } | |
213 | ||
214 | function f indPluginO bject() { | |
215 | try { | |
216 | return document. getElement ById('plug inObject') ; | |
217 | } catch (e) { | |
218 | return null; | |
219 | } | |
220 | } | |
221 | ||
222 | function f indPluginE mbed() { | |
223 | try { | |
224 | return document. getElement ById('plug inEmbed') | |
225 | } catch (e) { | |
226 | return null; | |
227 | } | |
228 | } | |
229 | ||
230 | function f indPluginX PCOM() { | |
231 | try { | |
232 | return __gwt_Hos tedModePlu gin; | |
233 | } catch (e) { | |
234 | return null; | |
235 | } | |
236 | } | |
237 | ||
238 | gwtOnLoad = function (errFn, mo dName, mod Base){ | |
239 | $moduleN ame = modN ame; | |
240 | $moduleB ase = modB ase; | |
241 | ||
242 | // Note that the o rder is im portant | |
243 | var plug inFinders = [ | |
244 | findPl uginXPCOM, | |
245 | findPl uginObject , | |
246 | findPl uginEmbed, | |
247 | ]; | |
248 | var topW in = windo w.top; | |
249 | var url = topWin.l ocation.hr ef; | |
250 | if (!top Win.__gwt_ SessionID) { | |
251 | var AS CII_EXCLAM ATION = 33 ; | |
252 | var AS CII_TILDE = 126; | |
253 | var ch ars = []; | |
254 | for (v ar i = 0; i < 16; ++ i) { | |
255 | char s.push(Mat h.floor(AS CII_EXCLAM ATION | |
256 | + Math.ran dom() * (A SCII_TILDE - ASCII_E XCLAMATION + 1))); | |
257 | } | |
258 | topWin .__gwt_Ses sionID = S tring.from CharCode.a pply(null, chars); | |
259 | } | |
260 | var plug in = null; | |
261 | for (var i = 0; i < pluginFi nders.leng th; ++i) { | |
262 | try { | |
263 | var maybePlugi n = plugin Finders[i] (); | |
264 | if ( maybePlugi n != null && maybePl ugin.init( window)) { | |
265 | pl ugin = may bePlugin; | |
266 | br eak; | |
267 | } | |
268 | } catc h (e) { | |
269 | } | |
270 | } | |
271 | if (!plu gin) { | |
272 | // try searching for a v1 plugin for backwards compatibi lity | |
273 | var fo und = fals e; | |
274 | for (v ar i = 0; i < plugin Finders.le ngth; ++i) { | |
275 | try { | |
276 | pl ugin = plu ginFinders [i](); | |
277 | if (plugin ! = null && plugin.con nect($host ed, $modul eName, win dow)) { | |
278 | return; | |
279 | } | |
280 | } ca tch (e) { | |
281 | } | |
282 | } | |
283 | loadIf rame("http ://gwt.goo gle.com/mi ssing-plug in"); | |
284 | } else { | |
285 | if (pl ugin.conne ct(url, to pWin.__gwt _SessionID , $hosted, $moduleNa me, | |
286 | $h ostedHtmlV ersion)) { | |
287 | wind ow.onUnloa d = functi on() { | |
288 | tr y { | |
289 | // wrap in try/catch since plu gins are n ot require d to suppl y this | |
290 | plugin.dis connect(); | |
291 | } catch (e) { | |
292 | } | |
293 | }; | |
294 | } else { | |
295 | if ( errFn) { | |
296 | er rFn(modNam e); | |
297 | } el se { | |
298 | __ gwt_displa yGlassMess age("Plugi n failed t o connect to Develop ment Mode server at " + | |
299 | simpleEs cape($host ed), | |
300 | "Follow the underl ying troub leshooting instructi ons"); | |
301 | lo adIframe(" http://cod e.google.c om/p/googl e-web-tool kit/wiki/T roubleshoo tingOOPHM" ); | |
302 | } | |
303 | } | |
304 | } | |
305 | } | |
306 | ||
307 | function s impleEscap e(original String) { | |
308 | return o riginalStr ing.replac e("&","&am p;") | |
309 | .repla ce("<","&l t;") | |
310 | .repla ce(">","&g t;") | |
311 | .repla ce("\"","& quot;"); | |
312 | } | |
313 | ||
314 | window.onu nload = fu nction() { | |
315 | }; | |
316 | ||
317 | // Lightwe ight metri cs | |
318 | window.fir eOnModuleL oadStart = function( className) { | |
319 | $stats & & $stats({ moduleName :$moduleNa me, sessio nId:$sessi onId, subS ystem:'sta rtup', evt Group:'mod uleStartup ', millis: (new Date( )).getTime (), type:' onModuleLo adStart', className: className} ); | |
320 | }; | |
321 | ||
322 | window.__g wt_module_ id = 0; | |
323 | </script>< /head> | |
324 | <body> | |
325 | <font face ='arial' s ize='-1'>T his html f ile is for Developme nt Mode su pport.</fo nt> | |
326 | <script><! -- | |
327 | // Lightwe ight metri cs | |
328 | $stats && $stats({mo duleName:$ moduleName , sessionI d:$session Id, subSys tem:'start up', evtGr oup:'modul eStartup', millis:(n ew Date()) .getTime() , type:'mo duleEvalEn d'}); | |
329 | ||
330 | // OOPHM c urrently o nly suppor ts IFrameL inker | |
331 | var query = parent.l ocation.se arch; | |
332 | if (!findP luginXPCOM ()) { | |
333 | document .write('<e mbed id="p luginEmbed " type="ap plication/ x-gwt-host ed-mode" w idth="10" height="10 ">'); | |
334 | document .write('</ embed>'); | |
335 | document .write('<o bject id=" pluginObje ct" CLASSI D="CLSID:1 D6156B6-00 2B-49E7-B5 CA-C138FB8 43B4E">'); | |
336 | document .write('</ object>'); | |
337 | } | |
338 | ||
339 | // look fo r the old query para meter if w e don't fi nd the new one | |
340 | var idx = query.inde xOf("gwt.c odesvr="); | |
341 | if (idx >= 0) { | |
342 | idx += 1 2; // "gw t.codesvr= ".length() == 12 | |
343 | } else { | |
344 | idx = qu ery.indexO f("gwt.hos ted="); | |
345 | if (idx >= 0) { | |
346 | idx += 11; // " gwt.hosted =".length( ) == 11 | |
347 | } | |
348 | } | |
349 | if (idx >= 0) { | |
350 | var amp = query.in dexOf("&", idx); | |
351 | if (amp >= 0) { | |
352 | $hoste d = query. substring( idx, amp); | |
353 | } else { | |
354 | $hoste d = query. substring( idx); | |
355 | } | |
356 | ||
357 | // Accor ding to RF C 3986, so me of this component 's charact ers (e.g., ':') | |
358 | // are r eserved an d *may* be escaped. | |
359 | $hosted = decodeUR IComponent ($hosted); | |
360 | } | |
361 | ||
362 | query = wi ndow.locat ion.search .substring (1); | |
363 | if (query && $wnd[qu ery]) setT imeout($wn d[query].o nScriptLoa d, 1); | |
364 | --></scrip t></body>< /html> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.