opengrok/web/diff.jsp

	diff.jsp revision 17b343cecb69da82215b124f39fed80167a6f2bd
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte<%--
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn ForteCDDL HEADER START
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn ForteThe contents of this file are subject to the terms of the
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn ForteCommon Development and Distribution License (the "License").
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn ForteYou may not use this file except in compliance with the License.
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn ForteSee LICENSE.txt included in this distribution for the specific
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Fortelanguage governing permissions and limitations under the License.
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn ForteWhen distributing Covered Code, include this CDDL HEADER in each
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Fortefile and include the License file at LICENSE.txt.
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn ForteIf applicable, add the following below this CDDL HEADER, with the
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Fortefields enclosed by brackets "[]" replaced with your own identifying
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forteinformation: Portions Copyright [yyyy] [name of copyright owner]
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn ForteCDDL HEADER END
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn ForteCopyright 2009 Sun Microsystems, Inc.  All rights reserved.
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn ForteUse is subject to license terms.
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forteident   "@(#)diff.jsp 1.2     05/12/01 SMI"
30e7468f8f41aa30ada067b2c1d5d284046514daPeter Dunlap
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte--%><%@ page import = "javax.servlet.*,
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Fortejava.lang.*,
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Fortejavax.servlet.http.*,
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Fortejava.util.*,
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Fortejava.io.*,
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Fortejava.text.*,
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Fortejava.net.URLDecoder,
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forteorg.opensolaris.opengrok.analysis.*,
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forteorg.opensolaris.opengrok.analysis.FileAnalyzer.Genre,
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forteorg.opensolaris.opengrok.web.*,
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forteorg.opensolaris.opengrok.history.*,
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forteorg.apache.commons.jrcs.diff.*"
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte%><%@include file="mast.jsp"%><%!
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn ForteString readableLine(int n) {
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte    if (n < 10) {
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte        return " " + n;
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte    } else {
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte        return String.valueOf(n);
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte    }
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte}
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte%><%
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forteif (valid) {
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte    final String rp1 = request.getParameter("r1");
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte    final String rp2 = request.getParameter("r2");
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte    String srcRoot = environment.getSourceRootFile().getAbsolutePath();
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte    String r1 = null;
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte    String r2 = null;
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte    File rpath1 = null;
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte    File rpath2 = null;
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte    String[] tmp=null;
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte    try {
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte        if (rp1!=null) tmp = rp1.split("@");
d4b0f84707225327c617c6838361d3cfb7762b34Jack Meng        if (tmp != null && tmp.length == 2) {
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte        rpath1 = new File(srcRoot+URLDecoder.decode(tmp[0], "UTF-8"));
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte        r1 = URLDecoder.decode(tmp[1], "UTF-8");
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte    }
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte    } catch (UnsupportedEncodingException e) {
0f1702c5201310f0529cd5abb77652e5e9b241b6Yu Xiangning    }
30e7468f8f41aa30ada067b2c1d5d284046514daPeter Dunlap
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte    try {
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte        if (rp2!=null) tmp = rp2.split("@");
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte        if (tmp != null && tmp.length == 2) {
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte        if (tmp != null && tmp.length == 2) {
7014882c6a3672fd0e5d60200af8643ae53c5928Richard Lowe        rpath2 = new File(srcRoot+URLDecoder.decode(tmp[0], "UTF-8"));
7014882c6a3672fd0e5d60200af8643ae53c5928Richard Lowe        r2 = URLDecoder.decode(tmp[1], "UTF-8");
7014882c6a3672fd0e5d60200af8643ae53c5928Richard Lowe        }
7014882c6a3672fd0e5d60200af8643ae53c5928Richard Lowe    }
7014882c6a3672fd0e5d60200af8643ae53c5928Richard Lowe    } catch (UnsupportedEncodingException e) {
7014882c6a3672fd0e5d60200af8643ae53c5928Richard Lowe    }
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte    if (r1 == null || r2 == null || r1.equals("") || r2.equals("") || r1.equals(r2)) {
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte%><div class="src"><h3 class="error">Error:</h3>
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte    Please pick two revisions to compare the changed from the <a href="<%=context+Constants.histL+path%>">history</a>
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte</div><%
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte// Error message ask to choose two versions from History log page with link to it
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte    } else {
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte        Genre g = AnalyzerGuru.getGenre(basename);
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte        if (g == Genre.PLAIN || g == null || g == Genre.DATA || g == Genre.HTML) {
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte            InputStream in1 = null;
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte            InputStream in2 = null;
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte            try{
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte                in1 = HistoryGuru.getInstance().getRevision(rpath1.getParent(), rpath1.getName(), r1);
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte                in2 = HistoryGuru.getInstance().getRevision(rpath2.getParent(), rpath2.getName(), r2);
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte            } catch (Exception e) {
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte        %> <h3 class="error">Error opening revisions!</h3> <%
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte            }
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte            try {
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte                if (in1 != null && in2 != null) {
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte                    g = AnalyzerGuru.getGenre(basename);
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte                    if (g == null) {
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte                        g = AnalyzerGuru.getGenre(in1);
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte                    }
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte                    if (g == Genre.IMAGE) {
fcf3ce441efd61da9bb2884968af01cb7c1452ccJohn Forte                %> <div id="difftable">
                <table rules="cols" cellpadding="5"><tr><th><%=basename%> (revision <%=r1%>)</th><th><%=basename%> (revision <%=r2%>)</th></tr>
                <tr><td><img src="<%=context+Constants.rawP+path%>?r=<%=r1%>"/></td><td><img src="<%=context+Constants.rawP+path%>?r=<%=r2%>"/></td></tr></table></div><%
                    } else if (g == Genre.PLAIN || g == Genre.HTML) {
//--------Do THE DIFFS------------
                        ArrayList<String> l1 = new ArrayList<String>();
                        String line;
                        BufferedReader reader1 = new BufferedReader(new InputStreamReader(in1));
                        BufferedReader reader2 = new BufferedReader(new InputStreamReader(in2));

                        while ((line = reader1.readLine()) != null) {
                            l1.add(line);
                        }

                        ArrayList<String> l2 = new ArrayList<String>();
                        while ((line = reader2.readLine()) != null) {
                            l2.add(line);
                        }
                        Object[] file1 = l1.toArray();
                        Object[] file2 = l2.toArray();

                        Revision rev = Diff.diff(file1, file2);

                        if(rev.size() == 0) {
    %><b>No differences found!</b><%
                        } else {

                            int ln1 = 0;
                            int ln2 = 0;

                            String format = request.getParameter("format");
                            if(format == null || (!format.equals("o") && !format.equals("n") && !format.equals("u") && !format.equals("t")))
                                format = "s";
                            String pfull = request.getParameter("full");
                            boolean full = pfull != null && pfull.equals("1");
                            pfull = full ? "1" : "0";


%><div id="difftable"><div id="diffbar"><span class="tabsel">&nbsp;<span class="d"> Deleted </span>&nbsp;<span class="a">&nbsp;Added&nbsp;</span>&nbsp;</span> | <%

if(format.equals("s")) {
    %><span class="tabsel"><b>sdiff</b></span> <%
} else {
    %><span class="tab"><a href="<%=reqURI%>?r1=<%=rp1%>&r2=<%=rp2%>&format=s&full=<%=pfull%>">sdiff</a></span> <%
}

                            if(format.equals("u")) {
    %><span class="tabsel"><b>udiff</b></span> <%
                                } else {
    %><span class="tab"><a href="<%=reqURI%>?r1=<%=rp1%>&r2=<%=rp2%>&format=u&full=<%=pfull%>">udiff</a></span> <%
                                }

                            if(format.equals("t")) {
    %><span class="tabsel"><b>text</b></span> <%
                                } else {
    %><span class="tab"><a href="<%=reqURI%>?r1=<%=rp1%>&r2=<%=rp2%>&format=t&full=<%=pfull%>">text</a></span> <%
                                }

                            if(format.equals("o")) {
    %><span class="tabsel"><b>old (<%=r1%>)</b></span> <%
                                } else {
    %><span class="tab"><a href="<%=reqURI%>?r1=<%=rp1%>&r2=<%=rp2%>&format=o&full=<%=pfull%>">old (<%=r1%>)</a></span> <%
                                }

                            if(format.equals("n")) {
    %><span class="tabsel"><b>new (<%=r2%>)</b></span>&nbsp;|&nbsp;<%
                                } else {
    %><span class="tab"><a href="<%=reqURI%>?r1=<%=rp1%>&r2=<%=rp2%>&format=n&full=<%=pfull%>">new (<%=r2%>)</a></span>&nbsp;|&nbsp;<%
                                }

                            if(!full) {
    %><span class="tab"><a href="<%=reqURI%>?r1=<%=rp1%>&r2=<%=rp2%>&format=<%=format%>&full=1">&nbsp; &nbsp; full &nbsp; &nbsp;</a></span> <span class="tabsel"><b>compact</b></span><%
                                } else {
    %><span class="tabsel"><b>&nbsp; &nbsp; full &nbsp; &nbsp;</b> </span> <span class="tab"> <a href="<%=reqURI%>?r1=<%=rp1%>&r2=<%=rp2%>&format=<%=format%>&full=0">compact</a></span><%
                                }

                            if(format.equals("s") || format.equals("u")) {
    %></div><pre wrap><table cellpadding="2" cellspacing="1" border="0"  rules="cols"><%
        if(format.equals("s")) {
        %><tr><th><%=basename%> (<%=r1%>)</th><th><%=basename%> (<%=r2%>)</th></tr><%
        }
                                } else {
    %></div><pre wrap><%
                                }

                            for (int i=0; i < rev.size(); i++) {
                                Delta d = rev.getDelta(i);
                                if(format.equals("t")) {
    %><%=Util.htmlize(d.toString())%><%
                                    } else {
                                        Chunk c1 = d.getOriginal();
                                        Chunk c2 = d.getRevised();
                                        int cn1 = c1.first();
                                        int cl1 = c1.last();
                                        int cn2 = c2.first();
                                        int cl2 = c2.last();

                                        int i1 = cn1, i2 = cn2;
                                        for (; i1 <= cl1 && i2 <= cl2; i1++, i2++) {
                                            String[] ss = Util.diffline(Util.htmlize((String)file1[i1]), Util.htmlize((String)file2[i2]));
                                            file1[i1] = ss[0];
                                            file2[i2] = ss[1];
                                        }
                                        if(i1 <= cl1) {
                                            for(int h=i1; h<= cl1; h++) {
                                                file1[h] = Util.htmlize((String)file1[h]);
                                            }
                                            file1[i1] = "<span class=\"d\">" + file1[i1];
                                            file1[cl1] = file1[cl1] + "</span>";
                                        }
                                        if(i2 <= cl2) {
                                            for(int h=i2; h<= cl2; h++) {
                                                file2[h] = Util.htmlize((String)file2[h]);
                                            }
                                            file2[i2] = "<span class=\"a\">" + file2[i2];
                                            file2[cl2] = file2[cl2] + "</span>";
                                        }

                                        if (format.equals("u")) {
// UDIFF
                                            if (cn1 > ln1 || cn2 > ln2) {
      %><tr class="k"><td><%
          if (full || (cn2 - ln2 < 20)) {
              for (int j = ln2; j < cn2; j++) {
            %><i><%=readableLine(++ln2)%></i><%=Util.htmlize((String)file2[j])%><br/><%
              }
          } else {
              for (int j = ln2; j < ln2+8; j++) {
            %><i><%=readableLine(j+1)%></i><%=Util.htmlize((String)file2[j])%><br/><%
              }
        %><br/>--- <b><%=cn2 - ln2 - 16%> unchanged lines hidden</b> (<a href="<%=reqURI%>?r1=<%=rp1%>&r2=<%=rp2%>&format=<%=format%>&full=1#<%=ln2%>">view full</a>) --- <br/><br/><%
                ln2 = cn2-8;
                for (int j = cn2 - 8; j < cn2; j++) {
            %><i><%=readableLine(++ln2)%></i><%=Util.htmlize((String)file2[j])%><br/><%
                }
          }
      %></td></tr><%
          ln1 = cn1;
                                            }
                                            if(cn1 <= cl1) {
        %><tr><td class="d"><%
                for(int j = cn1; j  <= cl1 ; j++) {
            %><strike class="d"><%=readableLine(++ln1)%></strike><%=file1[j]%><br/><%
                }
        %></td></tr><%
                                            }
                                            if(cn2 <= cl2) {
        %><tr class="k"><td><%
                for(int j = cn2; j  < cl2; j++) {
            %><i class="a"><%=readableLine(++ln2)%></i><%=file2[j]%><br/><%
                }
        %><i class="a"><%=readableLine(++ln2)%></i><%=file2[cl2]%><%
                if(full) {
            %><a name="<%=ln2%>" /><%
                }
        %></td></tr><%
                                            }
// SDIFF by default
                                        } else if(format.equals("s")) {

                                            if (cn1 > ln1 || cn2 > ln2) {
        %><tr class="k"><td><%
            if(full || cn2 - ln2 < 20) {
                for(int j = ln1; j < cn1; j++) {
            %><i><%=readableLine(++ln1)%></i><%=Util.htmlize((String)file1[j])%><br/><%
                }
        %></td><td><%
                for(int j = ln2; j  < cn2 ; j++) {
            %><i><%=readableLine(++ln2)%></i><%=Util.htmlize((String)file2[j])%><br/><%
                }
            } else {
                for(int j = ln1; j < ln1+8; j++) {
            %><i><%=readableLine(j+1)%></i><%=Util.htmlize((String)file1[j])%><br/><%
                }
        %><br/>--- <b><%=cn1 - ln1 - 16%> unchanged lines hidden</b> (<a href="<%=reqURI%>?r1=<%=rp1%>&r2=<%=rp2%>&format=<%=format%>&full=1#<%=ln2%>">view full</a>) --- <br/><br/><%
                ln1 = cn1-8;
                for (int j = cn1 - 8; j < cn1; j++) {
            %><i><%=readableLine(++ln1)%></i><%=Util.htmlize((String)file1[j])%><br/><%
                }
         %></td><td><%
             for (int j = ln2; j < ln2+8; j++) {
            %><i><%=readableLine(j+1)%></i><%=Util.htmlize((String)file2[j])%><br/><%
             }
        %><br/>--- <b><%=cn2 - ln2 - 16%> unchanged lines hidden</b> (<a href="<%=reqURI%>?r1=<%=rp1%>&r2=<%=rp2%>&format=<%=format%>&full=1#<%=ln2%>">view full</a>) --- <br/><br/><%
                ln2 = cn2-8;
                for (int j = cn2 - 8; j < cn2; j++) {
            %><i><%=readableLine(++ln2)%></i><%=Util.htmlize((String)file2[j])%><br/><%
                }
            }
        %></td></tr><%
                                            }

    %><tr  valign="top" class="k"><td><%
        for(int j = cn1; j  <= cl1; j++) {
        %><i><%=readableLine(++ln1)%></i><%=file1[j]%><br/><%
        }
    %></td><td><%
        for(int j = cn2; j  <= cl2; j++) {
        %><i><%=readableLine(++ln2)%></i><a name="<%=ln2%>"></a><%=file2[j]%><br/><%
        }
    %></td></tr><%

// OLD -----
                                        } else if ( format.equals("o")) {
                                            if (cn1 > ln1) {
                                                if(full || cn1 - ln1 < 20) {
                                                    for(int j = ln1; j < cn1; j++) {
            %><i><%=readableLine(++ln1)%></i><%=Util.htmlize((String)file1[j])%><br/><%
                                                    }
                                                } else {
                                                    for(int j = ln1; j < ln1+8; j++) {
            %><i><%=readableLine(j+1)%></i><%=Util.htmlize((String)file1[j])%><br/><%
                                                    }
        %><br/>--- <b><%=cn1 - ln1 - 16%> unchanged lines hidden</b> (<a href="<%=reqURI%>?r1=<%=rp1%>&r2=<%=rp2%>&format=<%=format%>&full=1#<%=ln1%>">view full</a>) --- <br/><br/><%
                ln1 = cn1-8;
                for (int j = cn1 - 8; j < cn1; j++) {
            %><i><%=readableLine(++ln1)%></i><%=Util.htmlize((String)file1[j])%><br/><%
                }
                                                }
                                            }
                                            for(int j = cn1; j  <= cl1 ; j++) {
        %><i><%=readableLine(++ln1)%></i><%=file1[j]%><br/><%
                                            }
                                            if(full) {
            %><a name="<%=ln1%>" ></a><%
                                            }

// NEW -----------
                                        } else if ( format.equals("n")) {

                                            if (cn2 > ln2) {
                                                if(full || cn2 - ln2 < 20) {
                                                    for(int j = ln2; j  < cn2 ; j++) {
            %><i><%=readableLine(++ln2)%></i><%=Util.htmlize((String)file2[j])%><br/><%
                                                    }
                                                } else {
                                                    for (int j = ln2; j < ln2+8; j++) {
                %><i><%=readableLine(j+1)%></i><%=Util.htmlize((String)file2[j])%><br/><%
                                                    }
            %><br/>--- <b><%=cn2 - ln2 - 16%> unchanged lines hidden</b> (<a href="<%=reqURI%>?r1=<%=rp1%>&r2=<%=rp2%>&format=<%=format%>&full=1#<%=ln2%>">view full</a>) --- <br/><br/><%
                        ln2 = cn2-8;
                        for (int j = cn2 - 8; j < cn2; j++) {
                %><i><%=readableLine(++ln2)%></i><%=Util.htmlize((String)file2[j])%><br/><%
                        }
                                                }
                                            }
                                            for(int j = cn2; j  <= cl2 ; j++) {
        %><i><%=readableLine(++ln2)%></i><%=file2[j]%><br/><%
                                            }
                                            if(full) {
            %><a name="<%=ln2%>"></a><%
                                            }

            }
                                    }
                            }


                            if (file1.length >= ln1) {
// dump the remaining
                                if (format.equals("s")) {
                                    if (full || file1.length - ln1 < 20) {
        %><tr><td><%
                for (int j = ln1; j < file1.length ; j++) {
            %><i><%=(j+1)%></i><%=Util.htmlize((String)file1[j])%><br/><%
                }
        %></td><td><%
                for (int j = ln2; j < file2.length ; j++) {
            %><i><%=(j+1)%></i><%=Util.htmlize((String)file2[j])%><br/><%
                }
        %></td></tr></table><%
                                        } else {
        %><tr><td><%
                for (int j = ln1; j < ln1 + 8 ; j++) {
            %><i><%=(j+1)%></i><%=Util.htmlize((String)file1[j])%><br/><%
                }

        %><br/> --- <b><%=file1.length - ln1 - 8%> unchanged lines hidden</b> --- </td><td><%
                for (int j = ln2; j < ln2 + 8 ; j++) {
            %><i><%=(j+1)%></i><%=Util.htmlize((String)file2[j])%><br/><%
                }
        %><br/>--- <b><%=file1.length - ln1 - 8%> unchanged lines hidden</b> ---</td></tr></table><%
                                        }
                                    } else if (format.equals("u")) {
                                        if (full || file2.length - ln2 < 20) {
        %><tr><td><%
                for (int j = ln2; j < file2.length ; j++) {
            %><i><%=(j+1)%></i><%=Util.htmlize((String)file2[j])%><br/><%
                }
        %></td></tr></table><%
                                        } else {
        %><tr><td><%
                for (int j = ln2; j < ln2 + 8 ; j++) {
            %><i><%=(j+1)%></i><%=Util.htmlize((String)file2[j])%><br/><%
                }
        %><br/>--- <b><%=file2.length - ln2 - 8%> unchanged lines hidden</b> ---</td></tr></table><%
                                        }
                                    } else if (format.equals("o")) {
                                    if (full || file1.length - ln1 < 20) {
                                        for (int j = ln1; j < file1.length ; j++) {
            %><i><%=(j+1)%></i><%=Util.htmlize((String)file1[j])%><br/><%
                                            }
                                        } else {
                                            for (int j = ln1; j < ln1 + 8 ; j++) {
            %><i><%=(j+1)%></i><%=Util.htmlize((String)file1[j])%><br/><%
                                            }

        %><br/> --- <b><%=file1.length - ln1 - 8%> unchanged lines hidden</b> ---<br/><%
                                        }
                                    } else if (format.equals("n")) {
                                    if (full || file2.length - ln2 < 20) {
                                        for (int j = ln2; j < file2.length ; j++) {
            %><i><%=(j+1)%></i><%=Util.htmlize((String)file2[j])%><br/><%
                                            }
                                        } else {
                                            for (int j = ln2; j < ln2 + 8 ; j++) {
            %><i><%=(j+1)%></i><%=Util.htmlize((String)file2[j])%><br/><%
                                            }
        %><br/> --- <b><%=file2.length - ln2 - 8%> unchanged lines hidden</b> ---<br/><%
                                        }
                                    }

                            }

//----DIFFS Done--------
%></pre></div><%
                        }
                    } else {
                %> <div id="src">Diffs for binary files cannot be displayed! Files are <a href="<%=context+Constants.rawP+path%>?r=<%=r1%>"><%=basename%>(revision <%=r1%>)</a> and
                                    <a href="<%=context+Constants.rawP+path%>?r=<%=r2%>"><%=basename%>(revision <%=r2%>)</a>.
                </div><%
                    }
                }
            } catch (FileNotFoundException e) {
         %><div class="src"><h3 class="error">Error Opening files! <%=Util.htmlize(e.getMessage())%></h3></div><%
            }
            if(in1 != null)
                in1.close();
            if(in2 != null)
                in2.close();
        } else if (g == Genre.IMAGE) {
                %> <div class="src">
                <table rules="cols" cellpadding="5"><tr><th><%=basename%> (revision <%=r1%>)</th><th><%=basename%> (revision <%=r2%>)</th></tr>
                <tr><td><img src="<%=context+Constants.rawP+path%>?r=<%=r1%>"/></td><td><img src="<%=context+Constants.rawP+path%>?r=<%=r2%>"/></td></tr></table></div><%

        } else {
                %> <div class="src">Diffs for binary files cannot be displayed. Files are <a href="<%=context+Constants.rawP+path%>?r=<%=r1%>"><%=basename%>(revision <%=r1%>)</a> and
                                    <a href="<%=context+Constants.rawP+path%>?r=<%=r2%>"><%=basename%>(revision <%=r2%>)</a>.
                </div><%
        }
    }
%><%@include file="foot.jspf"%><%
}
%>