xref: /OpenGrok/opengrok-web/src/main/webapp/diff.jsp (revision 1c8300324787f10049c22d6d461bf16903e3cde1)
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
1956f072caSAdam HornáčekCopyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
200d40e9d0SAdam HornáčekPortions Copyright 2011 Jens Elkner.
21*1c830032SChris FrairePortions Copyright (c) 2020, Chris Fraire <cfraire@me.com>.
22*1c830032SChris Fraire--%>
23*1c830032SChris Fraire<%@page errorPage="error.jsp" import="
240d40e9d0SAdam Hornáčekjava.io.ByteArrayInputStream,
250d40e9d0SAdam Hornáčekjava.io.OutputStream,
260d40e9d0SAdam Hornáčekjava.io.InputStream,
270d40e9d0SAdam Hornáček
28c5583a70SVladimir Kotalorg.suigeneris.jrcs.diff.delta.Chunk,
29c5583a70SVladimir Kotalorg.suigeneris.jrcs.diff.delta.Delta,
30*1c830032SChris Fraireorg.opengrok.indexer.analysis.AbstractAnalyzer,
31686556f2SAdam Hornáčekorg.opengrok.indexer.web.DiffData,
32686556f2SAdam Hornáčekorg.opengrok.indexer.web.DiffType"
3357eefa47SKryštof Tulinger%>
3457eefa47SKryštof Tulinger<%!
350d40e9d0SAdam Hornáčekprivate String getAnnotateRevision(DiffData data) {
360d40e9d0SAdam Hornáček    if (data.type == DiffType.OLD || data.type == DiffType.NEW) {
370d40e9d0SAdam Hornáček        String rev = data.rev[data.type == DiffType.NEW ? 1 : 0];
380d40e9d0SAdam Hornáček        return "<script type=\"text/javascript\">/* <![CDATA[ */ "
390d40e9d0SAdam Hornáček            + "document.rev = function() { return " + Util.htmlize(Util.jsStringLiteral(rev))
400d40e9d0SAdam Hornáček            + "; } /* ]]> */</script>";
410d40e9d0SAdam Hornáček    }
420d40e9d0SAdam Hornáček    return "";
430d40e9d0SAdam Hornáček}
440d40e9d0SAdam Hornáček%>
450d40e9d0SAdam Hornáček<%
460d40e9d0SAdam Hornáček{
470d40e9d0SAdam Hornáček    PageConfig cfg = PageConfig.get(request);
480d40e9d0SAdam Hornáček    cfg.addScript("diff");
490d40e9d0SAdam Hornáček    cfg.checkSourceRootExistence();
500d40e9d0SAdam Hornáček    /**
510d40e9d0SAdam Hornáček     * This block must be the first block before any other output in the
520d40e9d0SAdam Hornáček     * response.
530d40e9d0SAdam Hornáček     *
540d40e9d0SAdam Hornáček     * If there is already any output written into the response and we
550d40e9d0SAdam Hornáček     * use the same response and reset the content and the headers then we have
560d40e9d0SAdam Hornáček     * a collision with the response streams and the "getOutputStream() has
570d40e9d0SAdam Hornáček     * already been called" exception occurs.
580d40e9d0SAdam Hornáček     */
590d40e9d0SAdam Hornáček    DiffData data = cfg.getDiffData();
600d40e9d0SAdam Hornáček    request.setAttribute("diff.jsp-data", data);
610d40e9d0SAdam Hornáček    if (data.type == DiffType.TEXT
620d40e9d0SAdam Hornáček            && request.getParameter("action") != null
630d40e9d0SAdam Hornáček            && request.getParameter("action").equals("download")) {
640d40e9d0SAdam Hornáček        try (OutputStream o = response.getOutputStream()) {
650d40e9d0SAdam Hornáček            for (int i = 0; i < data.revision.size(); i++) {
660d40e9d0SAdam Hornáček                Delta d = data.revision.getDelta(i);
670d40e9d0SAdam Hornáček                try (InputStream in = new ByteArrayInputStream(d.toString().getBytes("UTF-8"))) {
680d40e9d0SAdam Hornáček                    response.setHeader("content-disposition", "attachment; filename="
690d40e9d0SAdam Hornáček                            + cfg.getResourceFile().getName() + "@" + data.rev[0]
700d40e9d0SAdam Hornáček                            + "-" + data.rev[1] + ".diff");
710d40e9d0SAdam Hornáček                    byte[] buffer = new byte[8192];
720d40e9d0SAdam Hornáček                    int nr;
730d40e9d0SAdam Hornáček                    while ((nr = in.read(buffer)) > 0) {
740d40e9d0SAdam Hornáček                        o.write(buffer, 0, nr);
750d40e9d0SAdam Hornáček                    }
760d40e9d0SAdam Hornáček                }
770d40e9d0SAdam Hornáček            }
780d40e9d0SAdam Hornáček            o.flush();
790d40e9d0SAdam Hornáček            o.close();
800d40e9d0SAdam Hornáček            return;
810d40e9d0SAdam Hornáček        }
820d40e9d0SAdam Hornáček    }
830d40e9d0SAdam Hornáček}
840d40e9d0SAdam Hornáček%><%@
850d40e9d0SAdam Hornáček
860d40e9d0SAdam Hornáčekinclude file="mast.jsp"
870d40e9d0SAdam Hornáček
880d40e9d0SAdam Hornáček%><%
890d40e9d0SAdam Hornáček/* ---------------------- diff.jsp start --------------------- */
900d40e9d0SAdam Hornáček{
910d40e9d0SAdam Hornáček    PageConfig cfg = PageConfig.get(request);
920d40e9d0SAdam Hornáček    DiffData data = (DiffData) request.getAttribute("diff.jsp-data");
930d40e9d0SAdam Hornáček
940d40e9d0SAdam Hornáček    // the data is never null as the getDiffData always return valid object
950d40e9d0SAdam Hornáček    if (data.errorMsg != null)  {
960d40e9d0SAdam Hornáček
970d40e9d0SAdam Hornáček%>
980d40e9d0SAdam Hornáček<div class="src">
990d40e9d0SAdam Hornáček    <h3 class="error">Error:</h3>
1000d40e9d0SAdam Hornáček    <p><%= data.errorMsg %></p>
1010d40e9d0SAdam Hornáček</div><%
10257eefa47SKryštof Tulinger    } else if (data.genre == AbstractAnalyzer.Genre.IMAGE) {
1030d40e9d0SAdam Hornáček
1040d40e9d0SAdam Hornáček        String link = request.getContextPath() + Prefix.DOWNLOAD_P
1050d40e9d0SAdam Hornáček            + Util.htmlize(cfg.getPath());
1060d40e9d0SAdam Hornáček%>
1070d40e9d0SAdam Hornáček<div id="difftable">
1080d40e9d0SAdam Hornáček    <table class="image">
1090d40e9d0SAdam Hornáček        <thead>
1100d40e9d0SAdam Hornáček        <tr><th><%= data.filename %> (revision <%= data.rev[0] %>)</th>
1110d40e9d0SAdam Hornáček            <th><%= data.filename %> (revision <%= data.rev[1] %>)</th>
1120d40e9d0SAdam Hornáček        </tr>
1130d40e9d0SAdam Hornáček        </thead>
1140d40e9d0SAdam Hornáček        <tbody>
115*1c830032SChris Fraire        <tr><td><img src="<%= link %>?<%= QueryParameters.REVISION_PARAM_EQ %><%= data.rev[0] %>"/>
116*1c830032SChris Fraire            </td>
117*1c830032SChris Fraire            <td><img src="<%= link %>?<%= QueryParameters.REVISION_PARAM_EQ %><%= data.rev[1] %>"/>
118*1c830032SChris Fraire            </td>
1190d40e9d0SAdam Hornáček        </tr>
1200d40e9d0SAdam Hornáček        </tbody>
1210d40e9d0SAdam Hornáček    </table>
1220d40e9d0SAdam Hornáček</div><%
1230d40e9d0SAdam Hornáček
12457eefa47SKryštof Tulinger    } else if (data.genre != AbstractAnalyzer.Genre.PLAIN && data.genre != AbstractAnalyzer.Genre.HTML) {
1250d40e9d0SAdam Hornáček
1260d40e9d0SAdam Hornáček        String link = request.getContextPath() + Prefix.DOWNLOAD_P
1270d40e9d0SAdam Hornáček            + Util.htmlize(cfg.getPath());
1280d40e9d0SAdam Hornáček%>
1290d40e9d0SAdam Hornáček<div id="src">Diffs for binary files cannot be displayed! Files are <a
130*1c830032SChris Fraire    href="<%= link %>?<%= QueryParameters.REVISION_PARAM_EQ %><%= data.rev[0] %>"><%=
1310d40e9d0SAdam Hornáček        data.filename %>(revision <%= data.rev[0] %>)</a> and <a
132*1c830032SChris Fraire    href="<%= link %>?<%= QueryParameters.REVISION_PARAM_EQ %><%= data.rev[1] %>"><%=
1330d40e9d0SAdam Hornáček        data.filename %>(revision <%= data.rev[1] %>)</a>.
1340d40e9d0SAdam Hornáček</div><%
1350d40e9d0SAdam Hornáček
1360d40e9d0SAdam Hornáček    } else if (data.revision.size() == 0) {
1370d40e9d0SAdam Hornáček        %>
1380d40e9d0SAdam Hornáček        <%= getAnnotateRevision(data) %>
1390d40e9d0SAdam Hornáček        <b>No differences found!</b><%
1400d40e9d0SAdam Hornáček
1410d40e9d0SAdam Hornáček    } else {
1420d40e9d0SAdam Hornáček        //-------- Do THE DIFFS ------------
1430d40e9d0SAdam Hornáček        int ln1 = 0;
1440d40e9d0SAdam Hornáček        int ln2 = 0;
1450d40e9d0SAdam Hornáček        String rp1 = data.param[0];
1460d40e9d0SAdam Hornáček        String rp2 = data.param[1];
1470d40e9d0SAdam Hornáček        String reqURI = request.getRequestURI();
1480d40e9d0SAdam Hornáček        String[] file1 = data.file[0];
1490d40e9d0SAdam Hornáček        String[] file2 = data.file[1];
1500d40e9d0SAdam Hornáček
1510d40e9d0SAdam Hornáček        DiffType type = data.type;
1520d40e9d0SAdam Hornáček        boolean full = data.full;
1530d40e9d0SAdam Hornáček%>
1540d40e9d0SAdam Hornáček<%= getAnnotateRevision(data) %>
1550d40e9d0SAdam Hornáček<div id="diffbar">
1560d40e9d0SAdam Hornáček    <div class="legend">
1570d40e9d0SAdam Hornáček        <span class="d">Deleted</span>
1580d40e9d0SAdam Hornáček        <span class="a">Added</span>
1590d40e9d0SAdam Hornáček    </div>
1600d40e9d0SAdam Hornáček    <div class="tabs"><%
1610d40e9d0SAdam Hornáček        for (DiffType t : DiffType.values()) {
1620d40e9d0SAdam Hornáček            if (type == t) {
1630d40e9d0SAdam Hornáček        %> <span class="active"><%= t.toString() %><%
1640d40e9d0SAdam Hornáček                if (t == DiffType.OLD) {
1650d40e9d0SAdam Hornáček            %>  ( <%= data.rev[0] %> )<%
1660d40e9d0SAdam Hornáček                } else if (t == DiffType.NEW) {
1670d40e9d0SAdam Hornáček            %>  ( <%= data.rev[1] %> )<%
1680d40e9d0SAdam Hornáček                }
1690d40e9d0SAdam Hornáček            %></span><%
1700d40e9d0SAdam Hornáček            } else {
171*1c830032SChris Fraire        %> <span><a href="<%= reqURI %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
172*1c830032SChris Fraire            <%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
173*1c830032SChris Fraire                <%= QueryParameters.FORMAT_PARAM_EQ %><%= t.getAbbrev() %>&amp;
174*1c830032SChris Fraire                <%= QueryParameters.DIFF_LEVEL_PARAM_EQ %><%= full ? '1' : '0'
1750d40e9d0SAdam Hornáček            %>"><%= t.toString() %><%
1760d40e9d0SAdam Hornáček                if (t == DiffType.OLD) {
1770d40e9d0SAdam Hornáček            %>  ( <%= data.rev[0] %> )<%
1780d40e9d0SAdam Hornáček                } else if (t == DiffType.NEW) {
1790d40e9d0SAdam Hornáček            %>  ( <%= data.rev[1] %> )<%
1800d40e9d0SAdam Hornáček                }
1810d40e9d0SAdam Hornáček            %></a></span><%
1820d40e9d0SAdam Hornáček            }
1830d40e9d0SAdam Hornáček        }
1840d40e9d0SAdam Hornáček    %></div>
1850d40e9d0SAdam Hornáček    <div class="ctype"><%
1860d40e9d0SAdam Hornáček        if (!full) {
1870d40e9d0SAdam Hornáček        %>
188*1c830032SChris Fraire        <span><a href="<%= reqURI %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
189*1c830032SChris Fraire            <%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
190*1c830032SChris Fraire            <%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
191*1c830032SChris Fraire            <%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1">full</a></span>
1920d40e9d0SAdam Hornáček        <span class="active">compact</span><%
1930d40e9d0SAdam Hornáček        } else {
1940d40e9d0SAdam Hornáček        %>
1950d40e9d0SAdam Hornáček        <span class="active">full</span>
196*1c830032SChris Fraire        <span> <a href="<%= reqURI %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
197*1c830032SChris Fraire            <%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
198*1c830032SChris Fraire            <%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
199*1c830032SChris Fraire            <%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>0">compact</a></span><%
2000d40e9d0SAdam Hornáček        }
2010d40e9d0SAdam Hornáček        %><span><a href="#" id="toggle-jumper">jumper</a></span>
202*1c830032SChris Fraire        <span><a href="<%= reqURI %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
203*1c830032SChris Fraire            <%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
204*1c830032SChris Fraire            <%= QueryParameters.FORMAT_PARAM_EQ %><%= DiffType.TEXT %>&amp;
205*1c830032SChris Fraire            action=download">download diff</a></span><%
2060d40e9d0SAdam Hornáček    %></div>
2070d40e9d0SAdam Hornáček</div>
2080d40e9d0SAdam Hornáček
2090d40e9d0SAdam Hornáček<div id="difftable">
2100d40e9d0SAdam Hornáček    <div class="pre"><%
2110d40e9d0SAdam Hornáček        if (type == DiffType.SIDEBYSIDE || type == DiffType.UNIFIED) {
2120d40e9d0SAdam Hornáček        %><table class="plain"><%
2130d40e9d0SAdam Hornáček            if (type == DiffType.SIDEBYSIDE) {
2140d40e9d0SAdam Hornáček            %>
2150d40e9d0SAdam Hornáček            <thead><tr>
2160d40e9d0SAdam Hornáček                <th><%= data.filename %> (<%= data.rev[0] %>)</th>
2170d40e9d0SAdam Hornáček                <th><%= data.filename %> (<%= data.rev[1] %>)</th>
2180d40e9d0SAdam Hornáček            </tr></thead><%
2190d40e9d0SAdam Hornáček            }
2200d40e9d0SAdam Hornáček            %>
2210d40e9d0SAdam Hornáček            <tbody><%
2220d40e9d0SAdam Hornáček        }
2230d40e9d0SAdam Hornáček
2240d40e9d0SAdam Hornáček        for (int i=0; i < data.revision.size(); i++) {
2250d40e9d0SAdam Hornáček            Delta d = data.revision.getDelta(i);
2260d40e9d0SAdam Hornáček            if (type == DiffType.TEXT) {
2270d40e9d0SAdam Hornáček        %><%= Util.htmlize(d.toString()) %><%
2280d40e9d0SAdam Hornáček            } else {
2290d40e9d0SAdam Hornáček                Chunk c1 = d.getOriginal();
2300d40e9d0SAdam Hornáček                Chunk c2 = d.getRevised();
2310d40e9d0SAdam Hornáček                int cn1 = c1.first();
2320d40e9d0SAdam Hornáček                int cl1 = c1.last();
2330d40e9d0SAdam Hornáček                int cn2 = c2.first();
2340d40e9d0SAdam Hornáček                int cl2 = c2.last();
2350d40e9d0SAdam Hornáček
2360d40e9d0SAdam Hornáček                int i1 = cn1, i2 = cn2;
2370d40e9d0SAdam Hornáček                StringBuilder bl1 = new StringBuilder(80);
2380d40e9d0SAdam Hornáček                StringBuilder bl2 = new StringBuilder(80);
2390d40e9d0SAdam Hornáček                for (; i1 <= cl1 && i2 <= cl2; i1++, i2++) {
2400d40e9d0SAdam Hornáček                    String[] ss = Util.diffline(
2410d40e9d0SAdam Hornáček                            new StringBuilder(file1[i1]),
2420d40e9d0SAdam Hornáček                            new StringBuilder(file2[i2]));
2430d40e9d0SAdam Hornáček                    file1[i1] = ss[0];
2440d40e9d0SAdam Hornáček                    file2[i2] = ss[1];
2450d40e9d0SAdam Hornáček                }
2460d40e9d0SAdam Hornáček                // deleted
2470d40e9d0SAdam Hornáček                for (; i1 <= cl1; i1++) {
2480d40e9d0SAdam Hornáček                    bl1.setLength(0);
2490d40e9d0SAdam Hornáček                    bl1.append("<span class=\"d\">");
2500d40e9d0SAdam Hornáček                    Util.htmlize(file1[i1], bl1);
2510d40e9d0SAdam Hornáček                    file1[i1] = bl1.append("</span>").toString();
2520d40e9d0SAdam Hornáček                }
2530d40e9d0SAdam Hornáček                // added
2540d40e9d0SAdam Hornáček                for (; i2 <= cl2; i2++) {
2550d40e9d0SAdam Hornáček                    bl2.setLength(0);
2560d40e9d0SAdam Hornáček                    bl2.append("<span class=\"a\">");
2570d40e9d0SAdam Hornáček                    Util.htmlize(file2[i2], bl2);
2580d40e9d0SAdam Hornáček                    file2[i2] = bl2.append("</span>").toString();
2590d40e9d0SAdam Hornáček                }
2600d40e9d0SAdam Hornáček
2610d40e9d0SAdam Hornáček                if (type == DiffType.UNIFIED) {
2620d40e9d0SAdam Hornáček// UDIFF
2630d40e9d0SAdam Hornáček                    if (cn1 > ln1 || cn2 > ln2) {
2640d40e9d0SAdam Hornáček            %>
2650d40e9d0SAdam Hornáček            <tr class="k"><td><%
2660d40e9d0SAdam Hornáček                        if (full || (cn2 - ln2 < 20)) {
2670d40e9d0SAdam Hornáček                            for (int j = ln2; j < cn2; j++) {
2680d40e9d0SAdam Hornáček                %><i><%= ++ln2 %></i><%=
2690d40e9d0SAdam Hornáček                    Util.htmlize(file2[j]) %><br/><%
2700d40e9d0SAdam Hornáček                            }
2710d40e9d0SAdam Hornáček                        } else {
2720d40e9d0SAdam Hornáček                            for (int j = ln2; j < ln2 + 8; j++) {
2730d40e9d0SAdam Hornáček                %><i><%= j+1 %></i><%=
2740d40e9d0SAdam Hornáček                    Util.htmlize(file2[j]) %><br/><%
2750d40e9d0SAdam Hornáček                            }
2760d40e9d0SAdam Hornáček                %><br/>--- <b><%= cn2 - ln2 - 16
2770d40e9d0SAdam Hornáček                    %> unchanged lines hidden</b> (<a href="<%= reqURI
278*1c830032SChris Fraire                    %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
279*1c830032SChris Fraire                    <%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
280*1c830032SChris Fraire                    <%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
281*1c830032SChris Fraire                    <%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1#<%= ln2 %>">view full</a>)
282*1c830032SChris Fraire                    --- <br/><br/><%
2830d40e9d0SAdam Hornáček                            ln2 = cn2 - 8;
2840d40e9d0SAdam Hornáček                            for (int j = ln2; j < cn2; j++) {
2850d40e9d0SAdam Hornáček                %><i><%= ++ln2 %></i><%= Util.htmlize(file2[j]) %><br/><%
2860d40e9d0SAdam Hornáček                            }
2870d40e9d0SAdam Hornáček                        }
2880d40e9d0SAdam Hornáček                %></td>
2890d40e9d0SAdam Hornáček            </tr><%
2900d40e9d0SAdam Hornáček                        ln1 = cn1;
2910d40e9d0SAdam Hornáček                    }
2920d40e9d0SAdam Hornáček                    if (cn1 <= cl1) {
2930d40e9d0SAdam Hornáček            %>
2940d40e9d0SAdam Hornáček            <tr class="chunk"><td><%
2950d40e9d0SAdam Hornáček                        for (int j = cn1; j  <= cl1 ; j++) {
2960d40e9d0SAdam Hornáček                %><del class="d"><%= ++ln1 %></del><%= file1[j]
2970d40e9d0SAdam Hornáček                %><br/><%
2980d40e9d0SAdam Hornáček                        }
2990d40e9d0SAdam Hornáček                %></td>
3000d40e9d0SAdam Hornáček            </tr><%
3010d40e9d0SAdam Hornáček                    }
3020d40e9d0SAdam Hornáček                    if (cn2 <= cl2) {
3030d40e9d0SAdam Hornáček            %>
3040d40e9d0SAdam Hornáček            <tr class="k<%
3050d40e9d0SAdam Hornáček                    if (cn1 > cl1) {
3060d40e9d0SAdam Hornáček                        %> chunk<%
3070d40e9d0SAdam Hornáček                    }
3080d40e9d0SAdam Hornáček                %>"><td><%
3090d40e9d0SAdam Hornáček                        for (int j = cn2; j  < cl2; j++) {
3100d40e9d0SAdam Hornáček                %><i class="a"><%= ++ln2 %></i><%= file2[j]
3110d40e9d0SAdam Hornáček                %><br/><%
3120d40e9d0SAdam Hornáček                        }
3130d40e9d0SAdam Hornáček                %><i class="a"><%= ++ln2 %></i><%= file2[cl2] %><%
3140d40e9d0SAdam Hornáček                        if(full) {
3150d40e9d0SAdam Hornáček                %><a name="<%= ln2 %>" /><%
3160d40e9d0SAdam Hornáček                        }
3170d40e9d0SAdam Hornáček                %></td>
3180d40e9d0SAdam Hornáček            </tr><%
3190d40e9d0SAdam Hornáček                    }
3200d40e9d0SAdam Hornáček                } else if (type == DiffType.SIDEBYSIDE) {
3210d40e9d0SAdam Hornáček// SDIFF
3220d40e9d0SAdam Hornáček                    if (cn1 > ln1 || cn2 > ln2) {
3230d40e9d0SAdam Hornáček            %>
3240d40e9d0SAdam Hornáček            <tr class="k"><td><%
3250d40e9d0SAdam Hornáček                        if (full || cn2 - ln2 < 20) {
3260d40e9d0SAdam Hornáček                            for (int j = ln1; j < cn1; j++) {
3270d40e9d0SAdam Hornáček                %><i><%= ++ln1 %></i><%=
3280d40e9d0SAdam Hornáček                    Util.htmlize(file1[j]) %><br/><%
3290d40e9d0SAdam Hornáček                            }
3300d40e9d0SAdam Hornáček                %></td><td><%
3310d40e9d0SAdam Hornáček                            for (int j = ln2; j  < cn2 ; j++) {
3320d40e9d0SAdam Hornáček                %><i><%= ++ln2 %></i><%=
3330d40e9d0SAdam Hornáček                    Util.htmlize(file2[j]) %><br/><%
3340d40e9d0SAdam Hornáček                            }
3350d40e9d0SAdam Hornáček                        } else {
3360d40e9d0SAdam Hornáček                            for (int j = ln1; j < ln1 + 8; j++) {
3370d40e9d0SAdam Hornáček                %><i><%= j+1 %></i><%=
3380d40e9d0SAdam Hornáček                    Util.htmlize(file1[j]) %><br/><%
3390d40e9d0SAdam Hornáček                            }
3400d40e9d0SAdam Hornáček                %><br/>--- <b><%= cn1 - ln1 - 16
3410d40e9d0SAdam Hornáček                    %> unchanged lines hidden</b> (<a href="<%= reqURI
342*1c830032SChris Fraire                    %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
343*1c830032SChris Fraire                    <%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
344*1c830032SChris Fraire                    <%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
345*1c830032SChris Fraire                    <%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1#<%= ln2 %>">view full</a>)
346*1c830032SChris Fraire                    --- <br/><br/><%
3470d40e9d0SAdam Hornáček                            ln1 = cn1 - 8;
3480d40e9d0SAdam Hornáček                            for (int j = ln1; j < cn1; j++) {
3490d40e9d0SAdam Hornáček                %><i><%= ++ln1 %></i><%=
3500d40e9d0SAdam Hornáček                    Util.htmlize(file1[j]) %><br/><%
3510d40e9d0SAdam Hornáček                            }
3520d40e9d0SAdam Hornáček                %></td><td><%
3530d40e9d0SAdam Hornáček                            for (int j = ln2; j < ln2 + 8; j++) {
3540d40e9d0SAdam Hornáček                %><i><%= j+1 %></i><%=
3550d40e9d0SAdam Hornáček                    Util.htmlize(file2[j]) %><br/><%
3560d40e9d0SAdam Hornáček                            }
3570d40e9d0SAdam Hornáček                %><br/>--- <b><%= cn2 - ln2 - 16
3580d40e9d0SAdam Hornáček                    %> unchanged lines hidden</b> (<a href="<%= reqURI
359*1c830032SChris Fraire                    %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
360*1c830032SChris Fraire                    <%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
361*1c830032SChris Fraire                    <%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
362*1c830032SChris Fraire                    <%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1#<%= ln2 %>">view full</a>)
363*1c830032SChris Fraire                    --- <br/><br/><%
3640d40e9d0SAdam Hornáček                            ln2 = cn2 - 8;
3650d40e9d0SAdam Hornáček                            for (int j = ln2; j < cn2; j++) {
3660d40e9d0SAdam Hornáček                %><i><%= ++ln2 %></i><%=
3670d40e9d0SAdam Hornáček                    Util.htmlize(file2[j]) %><br/><%
3680d40e9d0SAdam Hornáček                            }
3690d40e9d0SAdam Hornáček                        }
3700d40e9d0SAdam Hornáček                %></td>
3710d40e9d0SAdam Hornáček            </tr><%
3720d40e9d0SAdam Hornáček                    }
3730d40e9d0SAdam Hornáček            %>
3740d40e9d0SAdam Hornáček            <tr class="k chunk"><td><%
3750d40e9d0SAdam Hornáček                    for (int j = cn1; j  <= cl1; j++) {
3760d40e9d0SAdam Hornáček                %><i><%= ++ln1 %></i><%= file1[j] %><br/><%
3770d40e9d0SAdam Hornáček                    }
3780d40e9d0SAdam Hornáček                %></td><td><%
3790d40e9d0SAdam Hornáček                    for (int j = cn2; j  <= cl2; j++) {
3800d40e9d0SAdam Hornáček                %><i><%= ++ln2 %></i><a name="<%= ln2 %>"></a><%=
3810d40e9d0SAdam Hornáček                    file2[j] %><br/><%
3820d40e9d0SAdam Hornáček                    }
3830d40e9d0SAdam Hornáček                %></td>
3840d40e9d0SAdam Hornáček            </tr><%
3850d40e9d0SAdam Hornáček// OLD
3860d40e9d0SAdam Hornáček                } else if (type == DiffType.OLD) {
3870d40e9d0SAdam Hornáček                    // OLD
3880d40e9d0SAdam Hornáček                    if (cn1 > ln1) {
3890d40e9d0SAdam Hornáček                        if (full || cn1 - ln1 < 20) {
3900d40e9d0SAdam Hornáček                            for (int j = ln1; j < cn1; j++) {
3910d40e9d0SAdam Hornáček        %><i><%= ++ln1 %></i><%=
3920d40e9d0SAdam Hornáček            Util.htmlize(file1[j]) %><br/><%
3930d40e9d0SAdam Hornáček                            }
3940d40e9d0SAdam Hornáček                        } else {
3950d40e9d0SAdam Hornáček                            for (int j = ln1; j < ln1 + 8; j++) {
3960d40e9d0SAdam Hornáček        %><i><%= j+1 %></i><%=
3970d40e9d0SAdam Hornáček            Util.htmlize(file1[j]) %><br/><%
3980d40e9d0SAdam Hornáček                            }
3990d40e9d0SAdam Hornáček        %><br/>--- <b><%= cn1 - ln1 - 16
4000d40e9d0SAdam Hornáček            %> unchanged lines hidden</b> (<a href="<%= reqURI
401*1c830032SChris Fraire            %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
402*1c830032SChris Fraire            <%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
403*1c830032SChris Fraire            <%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
404*1c830032SChris Fraire            <%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1#<%=ln1%>">view full</a>) --- <br/><br/><%
4050d40e9d0SAdam Hornáček                            ln1 = cn1 - 8;
4060d40e9d0SAdam Hornáček                            for (int j = ln1; j < cn1; j++) {
4070d40e9d0SAdam Hornáček        %><i><%= ++ln1 %></i><%=
4080d40e9d0SAdam Hornáček            Util.htmlize(file1[j]) %><br/><%
4090d40e9d0SAdam Hornáček                            }
4100d40e9d0SAdam Hornáček                        }
4110d40e9d0SAdam Hornáček                    }
4120d40e9d0SAdam Hornáček                    for (int j = cn1; j  <= cl1 ; j++) {
4130d40e9d0SAdam Hornáček        %><i><%= ++ln1 %></i><%= file1[j] %><br/><%
4140d40e9d0SAdam Hornáček                    }
4150d40e9d0SAdam Hornáček                    if (full) {
4160d40e9d0SAdam Hornáček        %><a name="<%=ln1%>" ></a><%
4170d40e9d0SAdam Hornáček                    }
4180d40e9d0SAdam Hornáček// NEW
4190d40e9d0SAdam Hornáček                } else if (type == DiffType.NEW) {
4200d40e9d0SAdam Hornáček                    if (cn2 > ln2) {
4210d40e9d0SAdam Hornáček                        if (full || cn2 - ln2 < 20) {
4220d40e9d0SAdam Hornáček                            for (int j = ln2; j  < cn2 ; j++) {
4230d40e9d0SAdam Hornáček        %><i><%= ++ln2 %></i><%=
4240d40e9d0SAdam Hornáček            Util.htmlize(file2[j]) %><br/><%
4250d40e9d0SAdam Hornáček                            }
4260d40e9d0SAdam Hornáček                        } else {
4270d40e9d0SAdam Hornáček                            for (int j = ln2; j < ln2 + 8; j++) {
4280d40e9d0SAdam Hornáček        %><i><%= j+1 %></i><%=
4290d40e9d0SAdam Hornáček            Util.htmlize(file2[j]) %><br/><%
4300d40e9d0SAdam Hornáček                            }
4310d40e9d0SAdam Hornáček        %><br/>--- <b><%= cn2 - ln2 - 16
4320d40e9d0SAdam Hornáček            %> unchanged lines hidden</b> (<a href="<%= reqURI
433*1c830032SChris Fraire            %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
434*1c830032SChris Fraire            <%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
435*1c830032SChris Fraire            <%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
436*1c830032SChris Fraire            <%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1#<%= ln2 %>">view full</a>) --- <br/><br/><%
4370d40e9d0SAdam Hornáček                            ln2 = cn2 - 8;
4380d40e9d0SAdam Hornáček                            for (int j = ln2; j < cn2; j++) {
4390d40e9d0SAdam Hornáček            %><i><%= ++ln2 %></i><%=
4400d40e9d0SAdam Hornáček                Util.htmlize(file2[j]) %><br/><%
4410d40e9d0SAdam Hornáček                            }
4420d40e9d0SAdam Hornáček                        }
4430d40e9d0SAdam Hornáček                    }
4440d40e9d0SAdam Hornáček                    for (int j = cn2; j  <= cl2 ; j++) {
4450d40e9d0SAdam Hornáček        %><i><%= ++ln2 %></i><%= file2[j] %><br/><%
4460d40e9d0SAdam Hornáček                    }
4470d40e9d0SAdam Hornáček                    if (full) {
4480d40e9d0SAdam Hornáček        %><a name="<%= ln2 %>"></a><%
4490d40e9d0SAdam Hornáček                    }
4500d40e9d0SAdam Hornáček                }
4510d40e9d0SAdam Hornáček            } // else
4520d40e9d0SAdam Hornáček        } // for
4530d40e9d0SAdam Hornáček// deltas done, dump the remaining
4540d40e9d0SAdam Hornáček        if (file1.length >= ln1) {
4550d40e9d0SAdam Hornáček            if (type == DiffType.SIDEBYSIDE) {
4560d40e9d0SAdam Hornáček                if (full || file1.length - ln1 < 20) {
4570d40e9d0SAdam Hornáček            %>
4580d40e9d0SAdam Hornáček            <tr><td><%
4590d40e9d0SAdam Hornáček                    for (int j = ln1; j < file1.length ; j++) {
4600d40e9d0SAdam Hornáček                %><i><%= j+1 %></i><%= Util.htmlize(file1[j]) %><br/><%
4610d40e9d0SAdam Hornáček                    }
4620d40e9d0SAdam Hornáček                %></td><td><%
4630d40e9d0SAdam Hornáček                    for (int j = ln2; j < file2.length ; j++) {
4640d40e9d0SAdam Hornáček                %><i><%= j+1 %></i><%= Util.htmlize(file2[j]) %><br/><%
4650d40e9d0SAdam Hornáček                    }
4660d40e9d0SAdam Hornáček                %></td>
4670d40e9d0SAdam Hornáček            </tr>
4680d40e9d0SAdam Hornáček            </tbody>
4690d40e9d0SAdam Hornáček        </table><%
4700d40e9d0SAdam Hornáček                } else {
4710d40e9d0SAdam Hornáček            %>
4720d40e9d0SAdam Hornáček            <tr><td><%
4730d40e9d0SAdam Hornáček                    for (int j = ln1; j < ln1 + 8 ; j++) {
4740d40e9d0SAdam Hornáček                %><i><%= j+1 %></i><%= Util.htmlize(file1[j]) %><br/><%
4750d40e9d0SAdam Hornáček                    }
4760d40e9d0SAdam Hornáček                %><br/> --- <b><%= file1.length - ln1 - 8
4770d40e9d0SAdam Hornáček                %> unchanged lines hidden</b> --- </td><td><%
4780d40e9d0SAdam Hornáček                    for (int j = ln2; j < ln2 + 8 ; j++) {
4790d40e9d0SAdam Hornáček                %><i><%= j+1 %></i><%= Util.htmlize(file2[j]) %><br/><%
4800d40e9d0SAdam Hornáček                    }
4810d40e9d0SAdam Hornáček                %><br/>--- <b><%= file1.length - ln1 - 8
4820d40e9d0SAdam Hornáček                %> unchanged lines hidden</b> ---</td>
4830d40e9d0SAdam Hornáček            </tr>
4840d40e9d0SAdam Hornáček            </tbody>
4850d40e9d0SAdam Hornáček        </table><%
4860d40e9d0SAdam Hornáček                }
4870d40e9d0SAdam Hornáček            } else if (type == DiffType.UNIFIED) {
4880d40e9d0SAdam Hornáček                if (full || file2.length - ln2 < 20) {
4890d40e9d0SAdam Hornáček            %>
4900d40e9d0SAdam Hornáček            <tr><td><%
4910d40e9d0SAdam Hornáček                    for (int j = ln2; j < file2.length ; j++) {
4920d40e9d0SAdam Hornáček                %><i><%= j+1 %></i><%= Util.htmlize(file2[j]) %><br/><%
4930d40e9d0SAdam Hornáček                    }
4940d40e9d0SAdam Hornáček                %></td>
4950d40e9d0SAdam Hornáček            </tr>
4960d40e9d0SAdam Hornáček            </tbody>
4970d40e9d0SAdam Hornáček        </table><%
4980d40e9d0SAdam Hornáček                } else {
4990d40e9d0SAdam Hornáček            %>
5000d40e9d0SAdam Hornáček            <tr><td><%
5010d40e9d0SAdam Hornáček                    for (int j = ln2; j < ln2 + 8 ; j++) {
5020d40e9d0SAdam Hornáček                %><i><%= j+1 %></i><%= Util.htmlize(file2[j]) %><br/><%
5030d40e9d0SAdam Hornáček                    }
5040d40e9d0SAdam Hornáček                %><br/>--- <b><%= file2.length - ln2 - 8
5050d40e9d0SAdam Hornáček                %> unchanged lines hidden</b> ---</td>
5060d40e9d0SAdam Hornáček            </tr>
5070d40e9d0SAdam Hornáček            </tbody>
5080d40e9d0SAdam Hornáček        </table><%
5090d40e9d0SAdam Hornáček                }
5100d40e9d0SAdam Hornáček            } else if (type == DiffType.OLD) {
5110d40e9d0SAdam Hornáček                if (full || file1.length - ln1 < 20) {
5120d40e9d0SAdam Hornáček                    for (int j = ln1; j < file1.length ; j++) {
5130d40e9d0SAdam Hornáček        %><i><%= j+1 %></i><%= Util.htmlize(file1[j]) %><br/><%
5140d40e9d0SAdam Hornáček                    }
5150d40e9d0SAdam Hornáček                } else {
5160d40e9d0SAdam Hornáček                    for (int j = ln1; j < ln1 + 8 ; j++) {
5170d40e9d0SAdam Hornáček        %><i><%= j+1 %></i><%= Util.htmlize(file1[j]) %><br/><%
5180d40e9d0SAdam Hornáček                    }
5190d40e9d0SAdam Hornáček        %><br/> --- <b><%= file1.length - ln1 - 8
5200d40e9d0SAdam Hornáček        %> unchanged lines hidden</b> ---<br/><%
5210d40e9d0SAdam Hornáček                }
5220d40e9d0SAdam Hornáček            } else if (type == DiffType.NEW) {
5230d40e9d0SAdam Hornáček                if (full || file2.length - ln2 < 20) {
5240d40e9d0SAdam Hornáček                    for (int j = ln2; j < file2.length ; j++) {
5250d40e9d0SAdam Hornáček        %><i><%= j+1 %></i><%=Util.htmlize(file2[j])%><br/><%
5260d40e9d0SAdam Hornáček                    }
5270d40e9d0SAdam Hornáček                } else {
5280d40e9d0SAdam Hornáček                    for (int j = ln2; j < ln2 + 8 ; j++) {
5290d40e9d0SAdam Hornáček        %><i><%= j+1 %></i><%= Util.htmlize(file2[j]) %><br/><%
5300d40e9d0SAdam Hornáček                    }
5310d40e9d0SAdam Hornáček        %><br/> --- <b><%= file2.length - ln2 - 8
5320d40e9d0SAdam Hornáček        %> unchanged lines hidden</b> ---<br/><%
5330d40e9d0SAdam Hornáček                }
5340d40e9d0SAdam Hornáček            }
5350d40e9d0SAdam Hornáček        }
5360d40e9d0SAdam Hornáček
5370d40e9d0SAdam Hornáček//----DIFFS Done--------
5380d40e9d0SAdam Hornáček    %></div>
5390d40e9d0SAdam Hornáček</div><%
5400d40e9d0SAdam Hornáček    }
5410d40e9d0SAdam Hornáček}
5420d40e9d0SAdam Hornáček/* ---------------------- diff.jsp end --------------------- */
5430d40e9d0SAdam Hornáček%><%@
5440d40e9d0SAdam Hornáček
5450d40e9d0SAdam Hornáčekinclude file="foot.jspf"
5460d40e9d0SAdam Hornáček
5470d40e9d0SAdam Hornáček%>
548