10d40e9d0SAdam Hornáček<%-- 20d40e9d0SAdam HornáčekCDDL HEADER START 30d40e9d0SAdam Hornáček 40d40e9d0SAdam HornáčekThe contents of this file are subject to the terms of the 50d40e9d0SAdam HornáčekCommon Development and Distribution License (the "License"). 60d40e9d0SAdam HornáčekYou may not use this file except in compliance with the License. 70d40e9d0SAdam Hornáček 80d40e9d0SAdam HornáčekSee LICENSE.txt included in this distribution for the specific 90d40e9d0SAdam Hornáčeklanguage governing permissions and limitations under the License. 100d40e9d0SAdam Hornáček 110d40e9d0SAdam HornáčekWhen distributing Covered Code, include this CDDL HEADER in each 120d40e9d0SAdam Hornáčekfile and include the License file at LICENSE.txt. 130d40e9d0SAdam HornáčekIf applicable, add the following below this CDDL HEADER, with the 140d40e9d0SAdam Hornáčekfields enclosed by brackets "[]" replaced with your own identifying 150d40e9d0SAdam Hornáčekinformation: Portions Copyright [yyyy] [name of copyright owner] 160d40e9d0SAdam Hornáček 170d40e9d0SAdam HornáčekCDDL HEADER END 180d40e9d0SAdam Hornáček 190a7421eaSVladimir KotalCopyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved. 200d40e9d0SAdam HornáčekPortions Copyright 2011 Jens Elkner. 211c830032SChris FrairePortions Copyright (c) 2020, Chris Fraire <cfraire@me.com>. 221c830032SChris Fraire--%> 231c830032SChris Fraire<%@page errorPage="error.jsp" import=" 240d40e9d0SAdam Hornáčekjava.io.ByteArrayInputStream, 250d40e9d0SAdam Hornáčekjava.io.OutputStream, 260d40e9d0SAdam Hornáčekjava.io.InputStream, 27*8ae5e262SAdam Hornacekjava.nio.charset.StandardCharsets, 280d40e9d0SAdam Hornáček 29c5583a70SVladimir Kotalorg.suigeneris.jrcs.diff.delta.Chunk, 30c5583a70SVladimir Kotalorg.suigeneris.jrcs.diff.delta.Delta, 311c830032SChris Fraireorg.opengrok.indexer.analysis.AbstractAnalyzer, 32686556f2SAdam Hornáčekorg.opengrok.indexer.web.DiffData, 33686556f2SAdam Hornáčekorg.opengrok.indexer.web.DiffType" 3457eefa47SKryštof Tulinger%> 3557eefa47SKryštof Tulinger<%! 360d40e9d0SAdam Hornáčekprivate String getAnnotateRevision(DiffData data) { 370d40e9d0SAdam Hornáček if (data.type == DiffType.OLD || data.type == DiffType.NEW) { 380d40e9d0SAdam Hornáček String rev = data.rev[data.type == DiffType.NEW ? 1 : 0]; 390d40e9d0SAdam Hornáček return "<script type=\"text/javascript\">/* <![CDATA[ */ " 400d40e9d0SAdam Hornáček + "document.rev = function() { return " + Util.htmlize(Util.jsStringLiteral(rev)) 410d40e9d0SAdam Hornáček + "; } /* ]]> */</script>"; 420d40e9d0SAdam Hornáček } 430d40e9d0SAdam Hornáček return ""; 440d40e9d0SAdam Hornáček} 450d40e9d0SAdam Hornáček%> 460d40e9d0SAdam Hornáček<% 470d40e9d0SAdam Hornáček{ 480d40e9d0SAdam Hornáček PageConfig cfg = PageConfig.get(request); 490d40e9d0SAdam Hornáček cfg.addScript("diff"); 500d40e9d0SAdam Hornáček cfg.checkSourceRootExistence(); 510d40e9d0SAdam Hornáček /** 520d40e9d0SAdam Hornáček * This block must be the first block before any other output in the 530d40e9d0SAdam Hornáček * response. 540d40e9d0SAdam Hornáček * 550d40e9d0SAdam Hornáček * If there is already any output written into the response and we 560d40e9d0SAdam Hornáček * use the same response and reset the content and the headers then we have 570d40e9d0SAdam Hornáček * a collision with the response streams and the "getOutputStream() has 580d40e9d0SAdam Hornáček * already been called" exception occurs. 590d40e9d0SAdam Hornáček */ 600d40e9d0SAdam Hornáček DiffData data = cfg.getDiffData(); 610d40e9d0SAdam Hornáček request.setAttribute("diff.jsp-data", data); 620d40e9d0SAdam Hornáček if (data.type == DiffType.TEXT 630d40e9d0SAdam Hornáček && request.getParameter("action") != null 640d40e9d0SAdam Hornáček && request.getParameter("action").equals("download")) { 650d40e9d0SAdam Hornáček try (OutputStream o = response.getOutputStream()) { 660d40e9d0SAdam Hornáček for (int i = 0; i < data.revision.size(); i++) { 670d40e9d0SAdam Hornáček Delta d = data.revision.getDelta(i); 68*8ae5e262SAdam Hornacek try (InputStream in = new ByteArrayInputStream(d.toString().getBytes(StandardCharsets.UTF_8))) { 690d40e9d0SAdam Hornáček response.setHeader("content-disposition", "attachment; filename=" 700d40e9d0SAdam Hornáček + cfg.getResourceFile().getName() + "@" + data.rev[0] 710d40e9d0SAdam Hornáček + "-" + data.rev[1] + ".diff"); 720d40e9d0SAdam Hornáček byte[] buffer = new byte[8192]; 730d40e9d0SAdam Hornáček int nr; 740d40e9d0SAdam Hornáček while ((nr = in.read(buffer)) > 0) { 750d40e9d0SAdam Hornáček o.write(buffer, 0, nr); 760d40e9d0SAdam Hornáček } 770d40e9d0SAdam Hornáček } 780d40e9d0SAdam Hornáček } 790d40e9d0SAdam Hornáček o.flush(); 800d40e9d0SAdam Hornáček o.close(); 810d40e9d0SAdam Hornáček return; 820d40e9d0SAdam Hornáček } 830d40e9d0SAdam Hornáček } 840d40e9d0SAdam Hornáček} 850d40e9d0SAdam Hornáček%><%@ 860d40e9d0SAdam Hornáček 870d40e9d0SAdam Hornáčekinclude file="mast.jsp" 880d40e9d0SAdam Hornáček 890d40e9d0SAdam Hornáček%><% 900d40e9d0SAdam Hornáček/* ---------------------- diff.jsp start --------------------- */ 910d40e9d0SAdam Hornáček{ 920d40e9d0SAdam Hornáček PageConfig cfg = PageConfig.get(request); 930d40e9d0SAdam Hornáček DiffData data = (DiffData) request.getAttribute("diff.jsp-data"); 940d40e9d0SAdam Hornáček 950d40e9d0SAdam Hornáček // the data is never null as the getDiffData always return valid object 960d40e9d0SAdam Hornáček if (data.errorMsg != null) { 970d40e9d0SAdam Hornáček 980d40e9d0SAdam Hornáček%> 990d40e9d0SAdam Hornáček<div class="src"> 1000d40e9d0SAdam Hornáček <h3 class="error">Error:</h3> 1010d40e9d0SAdam Hornáček <p><%= data.errorMsg %></p> 1020d40e9d0SAdam Hornáček</div><% 10357eefa47SKryštof Tulinger } else if (data.genre == AbstractAnalyzer.Genre.IMAGE) { 1040d40e9d0SAdam Hornáček 1050d40e9d0SAdam Hornáček String link = request.getContextPath() + Prefix.DOWNLOAD_P 1060d40e9d0SAdam Hornáček + Util.htmlize(cfg.getPath()); 1070d40e9d0SAdam Hornáček%> 1080d40e9d0SAdam Hornáček<div id="difftable"> 1090d40e9d0SAdam Hornáček <table class="image"> 1100d40e9d0SAdam Hornáček <thead> 1110d40e9d0SAdam Hornáček <tr><th><%= data.filename %> (revision <%= data.rev[0] %>)</th> 1120d40e9d0SAdam Hornáček <th><%= data.filename %> (revision <%= data.rev[1] %>)</th> 1130d40e9d0SAdam Hornáček </tr> 1140d40e9d0SAdam Hornáček </thead> 1150d40e9d0SAdam Hornáček <tbody> 1161c830032SChris Fraire <tr><td><img src="<%= link %>?<%= QueryParameters.REVISION_PARAM_EQ %><%= data.rev[0] %>"/> 1171c830032SChris Fraire </td> 1181c830032SChris Fraire <td><img src="<%= link %>?<%= QueryParameters.REVISION_PARAM_EQ %><%= data.rev[1] %>"/> 1191c830032SChris Fraire </td> 1200d40e9d0SAdam Hornáček </tr> 1210d40e9d0SAdam Hornáček </tbody> 1220d40e9d0SAdam Hornáček </table> 1230d40e9d0SAdam Hornáček</div><% 1240d40e9d0SAdam Hornáček 12557eefa47SKryštof Tulinger } else if (data.genre != AbstractAnalyzer.Genre.PLAIN && data.genre != AbstractAnalyzer.Genre.HTML) { 1260d40e9d0SAdam Hornáček 1270d40e9d0SAdam Hornáček String link = request.getContextPath() + Prefix.DOWNLOAD_P 1280d40e9d0SAdam Hornáček + Util.htmlize(cfg.getPath()); 1290d40e9d0SAdam Hornáček%> 1300d40e9d0SAdam Hornáček<div id="src">Diffs for binary files cannot be displayed! Files are <a 1311c830032SChris Fraire href="<%= link %>?<%= QueryParameters.REVISION_PARAM_EQ %><%= data.rev[0] %>"><%= 1320d40e9d0SAdam Hornáček data.filename %>(revision <%= data.rev[0] %>)</a> and <a 1331c830032SChris Fraire href="<%= link %>?<%= QueryParameters.REVISION_PARAM_EQ %><%= data.rev[1] %>"><%= 1340d40e9d0SAdam Hornáček data.filename %>(revision <%= data.rev[1] %>)</a>. 1350d40e9d0SAdam Hornáček</div><% 1360d40e9d0SAdam Hornáček 1370d40e9d0SAdam Hornáček } else if (data.revision.size() == 0) { 1380d40e9d0SAdam Hornáček %> 1390d40e9d0SAdam Hornáček <%= getAnnotateRevision(data) %> 1400d40e9d0SAdam Hornáček <b>No differences found!</b><% 1410d40e9d0SAdam Hornáček 1420d40e9d0SAdam Hornáček } else { 1430d40e9d0SAdam Hornáček //-------- Do THE DIFFS ------------ 1440d40e9d0SAdam Hornáček int ln1 = 0; 1450d40e9d0SAdam Hornáček int ln2 = 0; 1460d40e9d0SAdam Hornáček String rp1 = data.param[0]; 1470d40e9d0SAdam Hornáček String rp2 = data.param[1]; 1480d40e9d0SAdam Hornáček String reqURI = request.getRequestURI(); 1490d40e9d0SAdam Hornáček String[] file1 = data.file[0]; 1500d40e9d0SAdam Hornáček String[] file2 = data.file[1]; 1510d40e9d0SAdam Hornáček 1520d40e9d0SAdam Hornáček DiffType type = data.type; 1530d40e9d0SAdam Hornáček boolean full = data.full; 1540d40e9d0SAdam Hornáček%> 1550d40e9d0SAdam Hornáček<%= getAnnotateRevision(data) %> 1560d40e9d0SAdam Hornáček<div id="diffbar"> 1570d40e9d0SAdam Hornáček <div class="legend"> 1580d40e9d0SAdam Hornáček <span class="d">Deleted</span> 1590d40e9d0SAdam Hornáček <span class="a">Added</span> 1600d40e9d0SAdam Hornáček </div> 1610d40e9d0SAdam Hornáček <div class="tabs"><% 1620d40e9d0SAdam Hornáček for (DiffType t : DiffType.values()) { 1630d40e9d0SAdam Hornáček if (type == t) { 1640d40e9d0SAdam Hornáček %> <span class="active"><%= t.toString() %><% 1650d40e9d0SAdam Hornáček if (t == DiffType.OLD) { 1660d40e9d0SAdam Hornáček %> ( <%= data.rev[0] %> )<% 1670d40e9d0SAdam Hornáček } else if (t == DiffType.NEW) { 1680d40e9d0SAdam Hornáček %> ( <%= data.rev[1] %> )<% 1690d40e9d0SAdam Hornáček } 1700d40e9d0SAdam Hornáček %></span><% 1710d40e9d0SAdam Hornáček } else { 1721c830032SChris Fraire %> <span><a href="<%= reqURI %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>& 1731c830032SChris Fraire<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>& 1741c830032SChris Fraire<%= QueryParameters.FORMAT_PARAM_EQ %><%= t.getAbbrev() %>& 1750a7421eaSVladimir Kotal<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %><%= full ? '1' : '0'%>"><%= t.toString() %> 1760a7421eaSVladimir Kotal <% 1770d40e9d0SAdam Hornáček if (t == DiffType.OLD) { 1780d40e9d0SAdam Hornáček %> ( <%= data.rev[0] %> )<% 1790d40e9d0SAdam Hornáček } else if (t == DiffType.NEW) { 1800d40e9d0SAdam Hornáček %> ( <%= data.rev[1] %> )<% 1810d40e9d0SAdam Hornáček } 1820d40e9d0SAdam Hornáček %></a></span><% 1830d40e9d0SAdam Hornáček } 1840d40e9d0SAdam Hornáček } 1850d40e9d0SAdam Hornáček %></div> 1860d40e9d0SAdam Hornáček <div class="ctype"><% 1870d40e9d0SAdam Hornáček if (!full) { 1880d40e9d0SAdam Hornáček %> 1891c830032SChris Fraire <span><a href="<%= reqURI %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>& 1901c830032SChris Fraire<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>& 1911c830032SChris Fraire<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>& 1921c830032SChris Fraire<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1">full</a></span> 1930d40e9d0SAdam Hornáček <span class="active">compact</span><% 1940d40e9d0SAdam Hornáček } else { 1950d40e9d0SAdam Hornáček %> 1960d40e9d0SAdam Hornáček <span class="active">full</span> 1971c830032SChris Fraire <span> <a href="<%= reqURI %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>& 1981c830032SChris Fraire<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>& 1991c830032SChris Fraire<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>& 2001c830032SChris Fraire<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>0">compact</a></span><% 2010d40e9d0SAdam Hornáček } 2020d40e9d0SAdam Hornáček %><span><a href="#" id="toggle-jumper">jumper</a></span> 2031c830032SChris Fraire <span><a href="<%= reqURI %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>& 2041c830032SChris Fraire<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>& 2051c830032SChris Fraire<%= QueryParameters.FORMAT_PARAM_EQ %><%= DiffType.TEXT %>& 2061c830032SChris Fraireaction=download">download diff</a></span><% 2070d40e9d0SAdam Hornáček %></div> 2080d40e9d0SAdam Hornáček</div> 2090d40e9d0SAdam Hornáček 2100d40e9d0SAdam Hornáček<div id="difftable"> 2110d40e9d0SAdam Hornáček <div class="pre"><% 2120d40e9d0SAdam Hornáček if (type == DiffType.SIDEBYSIDE || type == DiffType.UNIFIED) { 2130d40e9d0SAdam Hornáček %><table class="plain"><% 2140d40e9d0SAdam Hornáček if (type == DiffType.SIDEBYSIDE) { 2150d40e9d0SAdam Hornáček %> 2160d40e9d0SAdam Hornáček <thead><tr> 2170d40e9d0SAdam Hornáček <th><%= data.filename %> (<%= data.rev[0] %>)</th> 2180d40e9d0SAdam Hornáček <th><%= data.filename %> (<%= data.rev[1] %>)</th> 2190d40e9d0SAdam Hornáček </tr></thead><% 2200d40e9d0SAdam Hornáček } 2210d40e9d0SAdam Hornáček %> 2220d40e9d0SAdam Hornáček <tbody><% 2230d40e9d0SAdam Hornáček } 2240d40e9d0SAdam Hornáček 2250d40e9d0SAdam Hornáček for (int i=0; i < data.revision.size(); i++) { 2260d40e9d0SAdam Hornáček Delta d = data.revision.getDelta(i); 2270d40e9d0SAdam Hornáček if (type == DiffType.TEXT) { 2280d40e9d0SAdam Hornáček %><%= Util.htmlize(d.toString()) %><% 2290d40e9d0SAdam Hornáček } else { 2300d40e9d0SAdam Hornáček Chunk c1 = d.getOriginal(); 2310d40e9d0SAdam Hornáček Chunk c2 = d.getRevised(); 2320d40e9d0SAdam Hornáček int cn1 = c1.first(); 2330d40e9d0SAdam Hornáček int cl1 = c1.last(); 2340d40e9d0SAdam Hornáček int cn2 = c2.first(); 2350d40e9d0SAdam Hornáček int cl2 = c2.last(); 2360d40e9d0SAdam Hornáček 2370d40e9d0SAdam Hornáček int i1 = cn1, i2 = cn2; 2380d40e9d0SAdam Hornáček StringBuilder bl1 = new StringBuilder(80); 2390d40e9d0SAdam Hornáček StringBuilder bl2 = new StringBuilder(80); 2400d40e9d0SAdam Hornáček for (; i1 <= cl1 && i2 <= cl2; i1++, i2++) { 2410d40e9d0SAdam Hornáček String[] ss = Util.diffline( 2420d40e9d0SAdam Hornáček new StringBuilder(file1[i1]), 2430d40e9d0SAdam Hornáček new StringBuilder(file2[i2])); 2440d40e9d0SAdam Hornáček file1[i1] = ss[0]; 2450d40e9d0SAdam Hornáček file2[i2] = ss[1]; 2460d40e9d0SAdam Hornáček } 2470d40e9d0SAdam Hornáček // deleted 2480d40e9d0SAdam Hornáček for (; i1 <= cl1; i1++) { 2490d40e9d0SAdam Hornáček bl1.setLength(0); 2500d40e9d0SAdam Hornáček bl1.append("<span class=\"d\">"); 2510d40e9d0SAdam Hornáček Util.htmlize(file1[i1], bl1); 2520d40e9d0SAdam Hornáček file1[i1] = bl1.append("</span>").toString(); 2530d40e9d0SAdam Hornáček } 2540d40e9d0SAdam Hornáček // added 2550d40e9d0SAdam Hornáček for (; i2 <= cl2; i2++) { 2560d40e9d0SAdam Hornáček bl2.setLength(0); 2570d40e9d0SAdam Hornáček bl2.append("<span class=\"a\">"); 2580d40e9d0SAdam Hornáček Util.htmlize(file2[i2], bl2); 2590d40e9d0SAdam Hornáček file2[i2] = bl2.append("</span>").toString(); 2600d40e9d0SAdam Hornáček } 2610d40e9d0SAdam Hornáček 2620d40e9d0SAdam Hornáček if (type == DiffType.UNIFIED) { 2630d40e9d0SAdam Hornáček// UDIFF 2640d40e9d0SAdam Hornáček if (cn1 > ln1 || cn2 > ln2) { 2650d40e9d0SAdam Hornáček %> 2660d40e9d0SAdam Hornáček <tr class="k"><td><% 2670d40e9d0SAdam Hornáček if (full || (cn2 - ln2 < 20)) { 2680d40e9d0SAdam Hornáček for (int j = ln2; j < cn2; j++) { 2690d40e9d0SAdam Hornáček %><i><%= ++ln2 %></i><%= 2700d40e9d0SAdam Hornáček Util.htmlize(file2[j]) %><br/><% 2710d40e9d0SAdam Hornáček } 2720d40e9d0SAdam Hornáček } else { 2730d40e9d0SAdam Hornáček for (int j = ln2; j < ln2 + 8; j++) { 2740d40e9d0SAdam Hornáček %><i><%= j+1 %></i><%= 2750d40e9d0SAdam Hornáček Util.htmlize(file2[j]) %><br/><% 2760d40e9d0SAdam Hornáček } 2770d40e9d0SAdam Hornáček %><br/>--- <b><%= cn2 - ln2 - 16 2780d40e9d0SAdam Hornáček %> unchanged lines hidden</b> (<a href="<%= reqURI 2791c830032SChris Fraire%>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>& 2801c830032SChris Fraire<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>& 2811c830032SChris Fraire<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>& 2821c830032SChris Fraire<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1#<%= ln2 %>">view full</a>) 2831c830032SChris Fraire --- <br/><br/><% 2840d40e9d0SAdam Hornáček ln2 = cn2 - 8; 2850d40e9d0SAdam Hornáček for (int j = ln2; j < cn2; j++) { 2860d40e9d0SAdam Hornáček %><i><%= ++ln2 %></i><%= Util.htmlize(file2[j]) %><br/><% 2870d40e9d0SAdam Hornáček } 2880d40e9d0SAdam Hornáček } 2890d40e9d0SAdam Hornáček %></td> 2900d40e9d0SAdam Hornáček </tr><% 2910d40e9d0SAdam Hornáček ln1 = cn1; 2920d40e9d0SAdam Hornáček } 2930d40e9d0SAdam Hornáček if (cn1 <= cl1) { 2940d40e9d0SAdam Hornáček %> 2950d40e9d0SAdam Hornáček <tr class="chunk"><td><% 2960d40e9d0SAdam Hornáček for (int j = cn1; j <= cl1 ; j++) { 2970d40e9d0SAdam Hornáček %><del class="d"><%= ++ln1 %></del><%= file1[j] 2980d40e9d0SAdam Hornáček %><br/><% 2990d40e9d0SAdam Hornáček } 3000d40e9d0SAdam Hornáček %></td> 3010d40e9d0SAdam Hornáček </tr><% 3020d40e9d0SAdam Hornáček } 3030d40e9d0SAdam Hornáček if (cn2 <= cl2) { 3040d40e9d0SAdam Hornáček %> 3050d40e9d0SAdam Hornáček <tr class="k<% 3060d40e9d0SAdam Hornáček if (cn1 > cl1) { 3070d40e9d0SAdam Hornáček %> chunk<% 3080d40e9d0SAdam Hornáček } 3090d40e9d0SAdam Hornáček %>"><td><% 3100d40e9d0SAdam Hornáček for (int j = cn2; j < cl2; j++) { 3110d40e9d0SAdam Hornáček %><i class="a"><%= ++ln2 %></i><%= file2[j] 3120d40e9d0SAdam Hornáček %><br/><% 3130d40e9d0SAdam Hornáček } 3140d40e9d0SAdam Hornáček %><i class="a"><%= ++ln2 %></i><%= file2[cl2] %><% 3150d40e9d0SAdam Hornáček if(full) { 3160d40e9d0SAdam Hornáček %><a name="<%= ln2 %>" /><% 3170d40e9d0SAdam Hornáček } 3180d40e9d0SAdam Hornáček %></td> 3190d40e9d0SAdam Hornáček </tr><% 3200d40e9d0SAdam Hornáček } 3210d40e9d0SAdam Hornáček } else if (type == DiffType.SIDEBYSIDE) { 3220d40e9d0SAdam Hornáček// SDIFF 3230d40e9d0SAdam Hornáček if (cn1 > ln1 || cn2 > ln2) { 3240d40e9d0SAdam Hornáček %> 3250d40e9d0SAdam Hornáček <tr class="k"><td><% 3260d40e9d0SAdam Hornáček if (full || cn2 - ln2 < 20) { 3270d40e9d0SAdam Hornáček for (int j = ln1; j < cn1; j++) { 3280d40e9d0SAdam Hornáček %><i><%= ++ln1 %></i><%= 3290d40e9d0SAdam Hornáček Util.htmlize(file1[j]) %><br/><% 3300d40e9d0SAdam Hornáček } 3310d40e9d0SAdam Hornáček %></td><td><% 3320d40e9d0SAdam Hornáček for (int j = ln2; j < cn2 ; j++) { 3330d40e9d0SAdam Hornáček %><i><%= ++ln2 %></i><%= 3340d40e9d0SAdam Hornáček Util.htmlize(file2[j]) %><br/><% 3350d40e9d0SAdam Hornáček } 3360d40e9d0SAdam Hornáček } else { 3370d40e9d0SAdam Hornáček for (int j = ln1; j < ln1 + 8; j++) { 3380d40e9d0SAdam Hornáček %><i><%= j+1 %></i><%= 3390d40e9d0SAdam Hornáček Util.htmlize(file1[j]) %><br/><% 3400d40e9d0SAdam Hornáček } 3410d40e9d0SAdam Hornáček %><br/>--- <b><%= cn1 - ln1 - 16 3420d40e9d0SAdam Hornáček %> unchanged lines hidden</b> (<a href="<%= reqURI 3431c830032SChris Fraire%>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>& 3441c830032SChris Fraire<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>& 3451c830032SChris Fraire<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>& 3461c830032SChris Fraire<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1#<%= ln2 %>">view full</a>) 3471c830032SChris Fraire --- <br/><br/><% 3480d40e9d0SAdam Hornáček ln1 = cn1 - 8; 3490d40e9d0SAdam Hornáček for (int j = ln1; j < cn1; j++) { 3500d40e9d0SAdam Hornáček %><i><%= ++ln1 %></i><%= 3510d40e9d0SAdam Hornáček Util.htmlize(file1[j]) %><br/><% 3520d40e9d0SAdam Hornáček } 3530d40e9d0SAdam Hornáček %></td><td><% 3540d40e9d0SAdam Hornáček for (int j = ln2; j < ln2 + 8; j++) { 3550d40e9d0SAdam Hornáček %><i><%= j+1 %></i><%= 3560d40e9d0SAdam Hornáček Util.htmlize(file2[j]) %><br/><% 3570d40e9d0SAdam Hornáček } 3580d40e9d0SAdam Hornáček %><br/>--- <b><%= cn2 - ln2 - 16 3590d40e9d0SAdam Hornáček %> unchanged lines hidden</b> (<a href="<%= reqURI 3601c830032SChris Fraire%>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>& 3611c830032SChris Fraire<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>& 3621c830032SChris Fraire<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>& 3631c830032SChris Fraire<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1#<%= ln2 %>">view full</a>) 3641c830032SChris Fraire --- <br/><br/><% 3650d40e9d0SAdam Hornáček ln2 = cn2 - 8; 3660d40e9d0SAdam Hornáček for (int j = ln2; j < cn2; j++) { 3670d40e9d0SAdam Hornáček %><i><%= ++ln2 %></i><%= 3680d40e9d0SAdam Hornáček Util.htmlize(file2[j]) %><br/><% 3690d40e9d0SAdam Hornáček } 3700d40e9d0SAdam Hornáček } 3710d40e9d0SAdam Hornáček %></td> 3720d40e9d0SAdam Hornáček </tr><% 3730d40e9d0SAdam Hornáček } 3740d40e9d0SAdam Hornáček %> 3750d40e9d0SAdam Hornáček <tr class="k chunk"><td><% 3760d40e9d0SAdam Hornáček for (int j = cn1; j <= cl1; j++) { 3770d40e9d0SAdam Hornáček %><i><%= ++ln1 %></i><%= file1[j] %><br/><% 3780d40e9d0SAdam Hornáček } 3790d40e9d0SAdam Hornáček %></td><td><% 3800d40e9d0SAdam Hornáček for (int j = cn2; j <= cl2; j++) { 3810d40e9d0SAdam Hornáček %><i><%= ++ln2 %></i><a name="<%= ln2 %>"></a><%= 3820d40e9d0SAdam Hornáček file2[j] %><br/><% 3830d40e9d0SAdam Hornáček } 3840d40e9d0SAdam Hornáček %></td> 3850d40e9d0SAdam Hornáček </tr><% 3860d40e9d0SAdam Hornáček// OLD 3870d40e9d0SAdam Hornáček } else if (type == DiffType.OLD) { 3880d40e9d0SAdam Hornáček // OLD 3890d40e9d0SAdam Hornáček if (cn1 > ln1) { 3900d40e9d0SAdam Hornáček if (full || cn1 - ln1 < 20) { 3910d40e9d0SAdam Hornáček for (int j = ln1; j < cn1; j++) { 3920d40e9d0SAdam Hornáček %><i><%= ++ln1 %></i><%= 3930d40e9d0SAdam Hornáček Util.htmlize(file1[j]) %><br/><% 3940d40e9d0SAdam Hornáček } 3950d40e9d0SAdam Hornáček } else { 3960d40e9d0SAdam Hornáček for (int j = ln1; j < ln1 + 8; j++) { 3970d40e9d0SAdam Hornáček %><i><%= j+1 %></i><%= 3980d40e9d0SAdam Hornáček Util.htmlize(file1[j]) %><br/><% 3990d40e9d0SAdam Hornáček } 4000d40e9d0SAdam Hornáček %><br/>--- <b><%= cn1 - ln1 - 16 4010d40e9d0SAdam Hornáček %> unchanged lines hidden</b> (<a href="<%= reqURI 4021c830032SChris Fraire%>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>& 4031c830032SChris Fraire<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>& 4041c830032SChris Fraire<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>& 4051c830032SChris Fraire<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1#<%=ln1%>">view full</a>) --- <br/><br/><% 4060d40e9d0SAdam Hornáček ln1 = cn1 - 8; 4070d40e9d0SAdam Hornáček for (int j = ln1; j < cn1; j++) { 4080d40e9d0SAdam Hornáček %><i><%= ++ln1 %></i><%= 4090d40e9d0SAdam Hornáček Util.htmlize(file1[j]) %><br/><% 4100d40e9d0SAdam Hornáček } 4110d40e9d0SAdam Hornáček } 4120d40e9d0SAdam Hornáček } 4130d40e9d0SAdam Hornáček for (int j = cn1; j <= cl1 ; j++) { 4140d40e9d0SAdam Hornáček %><i><%= ++ln1 %></i><%= file1[j] %><br/><% 4150d40e9d0SAdam Hornáček } 4160d40e9d0SAdam Hornáček if (full) { 4170d40e9d0SAdam Hornáček %><a name="<%=ln1%>" ></a><% 4180d40e9d0SAdam Hornáček } 4190d40e9d0SAdam Hornáček// NEW 4200d40e9d0SAdam Hornáček } else if (type == DiffType.NEW) { 4210d40e9d0SAdam Hornáček if (cn2 > ln2) { 4220d40e9d0SAdam Hornáček if (full || cn2 - ln2 < 20) { 4230d40e9d0SAdam Hornáček for (int j = ln2; j < cn2 ; j++) { 4240d40e9d0SAdam Hornáček %><i><%= ++ln2 %></i><%= 4250d40e9d0SAdam Hornáček Util.htmlize(file2[j]) %><br/><% 4260d40e9d0SAdam Hornáček } 4270d40e9d0SAdam Hornáček } else { 4280d40e9d0SAdam Hornáček for (int j = ln2; j < ln2 + 8; j++) { 4290d40e9d0SAdam Hornáček %><i><%= j+1 %></i><%= 4300d40e9d0SAdam Hornáček Util.htmlize(file2[j]) %><br/><% 4310d40e9d0SAdam Hornáček } 4320d40e9d0SAdam Hornáček %><br/>--- <b><%= cn2 - ln2 - 16 4330d40e9d0SAdam Hornáček %> unchanged lines hidden</b> (<a href="<%= reqURI 4341c830032SChris Fraire%>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>& 4351c830032SChris Fraire<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>& 4361c830032SChris Fraire<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>& 4371c830032SChris Fraire<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1#<%= ln2 %>">view full</a>) --- <br/><br/><% 4380d40e9d0SAdam Hornáček ln2 = cn2 - 8; 4390d40e9d0SAdam Hornáček for (int j = ln2; j < cn2; j++) { 4400d40e9d0SAdam Hornáček %><i><%= ++ln2 %></i><%= 4410d40e9d0SAdam Hornáček Util.htmlize(file2[j]) %><br/><% 4420d40e9d0SAdam Hornáček } 4430d40e9d0SAdam Hornáček } 4440d40e9d0SAdam Hornáček } 4450d40e9d0SAdam Hornáček for (int j = cn2; j <= cl2 ; j++) { 4460d40e9d0SAdam Hornáček %><i><%= ++ln2 %></i><%= file2[j] %><br/><% 4470d40e9d0SAdam Hornáček } 4480d40e9d0SAdam Hornáček if (full) { 4490d40e9d0SAdam Hornáček %><a name="<%= ln2 %>"></a><% 4500d40e9d0SAdam Hornáček } 4510d40e9d0SAdam Hornáček } 4520d40e9d0SAdam Hornáček } // else 4530d40e9d0SAdam Hornáček } // for 4540d40e9d0SAdam Hornáček// deltas done, dump the remaining 4550d40e9d0SAdam Hornáček if (file1.length >= ln1) { 4560d40e9d0SAdam Hornáček if (type == DiffType.SIDEBYSIDE) { 4570d40e9d0SAdam Hornáček if (full || file1.length - ln1 < 20) { 4580d40e9d0SAdam Hornáček %> 4590d40e9d0SAdam Hornáček <tr><td><% 4600d40e9d0SAdam Hornáček for (int j = ln1; j < file1.length ; j++) { 4610d40e9d0SAdam Hornáček %><i><%= j+1 %></i><%= Util.htmlize(file1[j]) %><br/><% 4620d40e9d0SAdam Hornáček } 4630d40e9d0SAdam Hornáček %></td><td><% 4640d40e9d0SAdam Hornáček for (int j = ln2; j < file2.length ; j++) { 4650d40e9d0SAdam Hornáček %><i><%= j+1 %></i><%= Util.htmlize(file2[j]) %><br/><% 4660d40e9d0SAdam Hornáček } 4670d40e9d0SAdam Hornáček %></td> 4680d40e9d0SAdam Hornáček </tr> 4690d40e9d0SAdam Hornáček </tbody> 4700d40e9d0SAdam Hornáček </table><% 4710d40e9d0SAdam Hornáček } else { 4720d40e9d0SAdam Hornáček %> 4730d40e9d0SAdam Hornáček <tr><td><% 4740d40e9d0SAdam Hornáček for (int j = ln1; j < ln1 + 8 ; j++) { 4750d40e9d0SAdam Hornáček %><i><%= j+1 %></i><%= Util.htmlize(file1[j]) %><br/><% 4760d40e9d0SAdam Hornáček } 4770d40e9d0SAdam Hornáček %><br/> --- <b><%= file1.length - ln1 - 8 4780d40e9d0SAdam Hornáček %> unchanged lines hidden</b> --- </td><td><% 4790d40e9d0SAdam Hornáček for (int j = ln2; j < ln2 + 8 ; j++) { 4800d40e9d0SAdam Hornáček %><i><%= j+1 %></i><%= Util.htmlize(file2[j]) %><br/><% 4810d40e9d0SAdam Hornáček } 4820d40e9d0SAdam Hornáček %><br/>--- <b><%= file1.length - ln1 - 8 4830d40e9d0SAdam Hornáček %> unchanged lines hidden</b> ---</td> 4840d40e9d0SAdam Hornáček </tr> 4850d40e9d0SAdam Hornáček </tbody> 4860d40e9d0SAdam Hornáček </table><% 4870d40e9d0SAdam Hornáček } 4880d40e9d0SAdam Hornáček } else if (type == DiffType.UNIFIED) { 4890d40e9d0SAdam Hornáček if (full || file2.length - ln2 < 20) { 4900d40e9d0SAdam Hornáček %> 4910d40e9d0SAdam Hornáček <tr><td><% 4920d40e9d0SAdam Hornáček for (int j = ln2; j < file2.length ; j++) { 4930d40e9d0SAdam Hornáček %><i><%= j+1 %></i><%= Util.htmlize(file2[j]) %><br/><% 4940d40e9d0SAdam Hornáček } 4950d40e9d0SAdam Hornáček %></td> 4960d40e9d0SAdam Hornáček </tr> 4970d40e9d0SAdam Hornáček </tbody> 4980d40e9d0SAdam Hornáček </table><% 4990d40e9d0SAdam Hornáček } else { 5000d40e9d0SAdam Hornáček %> 5010d40e9d0SAdam Hornáček <tr><td><% 5020d40e9d0SAdam Hornáček for (int j = ln2; j < ln2 + 8 ; j++) { 5030d40e9d0SAdam Hornáček %><i><%= j+1 %></i><%= Util.htmlize(file2[j]) %><br/><% 5040d40e9d0SAdam Hornáček } 5050d40e9d0SAdam Hornáček %><br/>--- <b><%= file2.length - ln2 - 8 5060d40e9d0SAdam Hornáček %> unchanged lines hidden</b> ---</td> 5070d40e9d0SAdam Hornáček </tr> 5080d40e9d0SAdam Hornáček </tbody> 5090d40e9d0SAdam Hornáček </table><% 5100d40e9d0SAdam Hornáček } 5110d40e9d0SAdam Hornáček } else if (type == DiffType.OLD) { 5120d40e9d0SAdam Hornáček if (full || file1.length - ln1 < 20) { 5130d40e9d0SAdam Hornáček for (int j = ln1; j < file1.length ; j++) { 5140d40e9d0SAdam Hornáček %><i><%= j+1 %></i><%= Util.htmlize(file1[j]) %><br/><% 5150d40e9d0SAdam Hornáček } 5160d40e9d0SAdam Hornáček } else { 5170d40e9d0SAdam Hornáček for (int j = ln1; j < ln1 + 8 ; j++) { 5180d40e9d0SAdam Hornáček %><i><%= j+1 %></i><%= Util.htmlize(file1[j]) %><br/><% 5190d40e9d0SAdam Hornáček } 5200d40e9d0SAdam Hornáček %><br/> --- <b><%= file1.length - ln1 - 8 5210d40e9d0SAdam Hornáček %> unchanged lines hidden</b> ---<br/><% 5220d40e9d0SAdam Hornáček } 5230d40e9d0SAdam Hornáček } else if (type == DiffType.NEW) { 5240d40e9d0SAdam Hornáček if (full || file2.length - ln2 < 20) { 5250d40e9d0SAdam Hornáček for (int j = ln2; j < file2.length ; j++) { 5260d40e9d0SAdam Hornáček %><i><%= j+1 %></i><%=Util.htmlize(file2[j])%><br/><% 5270d40e9d0SAdam Hornáček } 5280d40e9d0SAdam Hornáček } else { 5290d40e9d0SAdam Hornáček for (int j = ln2; j < ln2 + 8 ; j++) { 5300d40e9d0SAdam Hornáček %><i><%= j+1 %></i><%= Util.htmlize(file2[j]) %><br/><% 5310d40e9d0SAdam Hornáček } 5320d40e9d0SAdam Hornáček %><br/> --- <b><%= file2.length - ln2 - 8 5330d40e9d0SAdam Hornáček %> unchanged lines hidden</b> ---<br/><% 5340d40e9d0SAdam Hornáček } 5350d40e9d0SAdam Hornáček } 5360d40e9d0SAdam Hornáček } 5370d40e9d0SAdam Hornáček 5380d40e9d0SAdam Hornáček//----DIFFS Done-------- 5390d40e9d0SAdam Hornáček %></div> 5400d40e9d0SAdam Hornáček</div><% 5410d40e9d0SAdam Hornáček } 5420d40e9d0SAdam Hornáček} 5430d40e9d0SAdam Hornáček/* ---------------------- diff.jsp end --------------------- */ 5440d40e9d0SAdam Hornáček%><%@ 5450d40e9d0SAdam Hornáček 5460d40e9d0SAdam Hornáčekinclude file="foot.jspf" 5470d40e9d0SAdam Hornáček 5480d40e9d0SAdam Hornáček%> 549