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