da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin<%--

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinCDDL HEADER START

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinThe contents of this file are subject to the terms of the

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinCommon Development and Distribution License (the "License").

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinYou may not use this file except in compliance with the License.

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinSee LICENSE.txt included in this distribution for the specific

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinlanguage governing permissions and limitations under the License.

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinWhen distributing Covered Code, include this CDDL HEADER in each

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinfile and include the License file at LICENSE.txt.

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinIf applicable, add the following below this CDDL HEADER, with the

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinfields enclosed by brackets "[]" replaced with your own identifying

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chininformation: Portions Copyright [yyyy] [name of copyright owner]

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinCDDL HEADER END

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinCopyright 2009 Sun Microsystems, Inc. All rights reserved.

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinUse is subject to license terms.

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinident "@(#)diff.jsp 1.2 05/12/01 SMI"

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin--%><%@ page import = "javax.servlet.*,

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinjava.lang.*,

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinjavax.servlet.http.*,

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinjava.util.*,

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinjava.io.*,

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinjava.text.*,

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinjava.net.URLDecoder,

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinorg.opensolaris.opengrok.analysis.*,

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinorg.opensolaris.opengrok.analysis.FileAnalyzer.Genre,

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinorg.opensolaris.opengrok.web.*,

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinorg.opensolaris.opengrok.history.*,

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinorg.apache.commons.jrcs.diff.*"

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin%><%@include file="mast.jsp"%><%!

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinString readableLine(int n) {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin if (n < 10) {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin return " " + n;

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin } else {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin return String.valueOf(n);

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin }

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin}

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin%><%

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinif (valid) {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin final String rp1 = request.getParameter("r1");

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin final String rp2 = request.getParameter("r2");

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin String srcRoot = environment.getSourceRootFile().getAbsolutePath();

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin String r1 = null;

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin String r2 = null;

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin File rpath1 = null;

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin File rpath2 = null;

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin String[] tmp=null;

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin try {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin if (rp1!=null) tmp = rp1.split("@");

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin if (tmp != null && tmp.length == 2) {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin rpath1 = new File(srcRoot+URLDecoder.decode(tmp[0], "UTF-8"));

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin r1 = URLDecoder.decode(tmp[1], "UTF-8");

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin }

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin } catch (UnsupportedEncodingException e) {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin }

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin try {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin if (rp2!=null) tmp = rp2.split("@");

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin if (tmp != null && tmp.length == 2) {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin if (tmp != null && tmp.length == 2) {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin rpath2 = new File(srcRoot+URLDecoder.decode(tmp[0], "UTF-8"));

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin r2 = URLDecoder.decode(tmp[1], "UTF-8");

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin }

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin }

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin } catch (UnsupportedEncodingException e) {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin }

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin if (r1 == null || r2 == null || r1.equals("") || r2.equals("") || r1.equals(r2)) {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin%><div class="src"><h3 class="error">Error:</h3>

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin Please pick two revisions to compare the changed from the <a href="<%=context+Constants.histL+path%>">history</a>

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin</div><%

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin// Error message ask to choose two versions from History log page with link to it

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin } else {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin Genre g = AnalyzerGuru.getGenre(basename);

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin if (g == Genre.PLAIN || g == null || g == Genre.DATA || g == Genre.HTML) {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin InputStream in1 = null;

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin InputStream in2 = null;

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin try{

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin in1 = HistoryGuru.getInstance().getRevision(rpath1.getParent(), rpath1.getName(), r1);

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin in2 = HistoryGuru.getInstance().getRevision(rpath2.getParent(), rpath2.getName(), r2);

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin } catch (Exception e) {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin %> <h3 class="error">Error opening revisions!</h3> <%

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin }

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin try {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin if (in1 != null && in2 != null) {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin g = AnalyzerGuru.getGenre(basename);

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin if (g == null) {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin g = AnalyzerGuru.getGenre(in1);

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin }

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin if (g == Genre.IMAGE) {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin %> <div id="difftable">

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin <table rules="cols" cellpadding="5"><tr><th><%=basename%> (revision <%=r1%>)</th><th><%=basename%> (revision <%=r2%>)</th></tr>

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin <tr><td><img src="<%=context+Constants.rawP+path%>?r=<%=r1%>"/></td><td><img src="<%=context+Constants.rawP+path%>?r=<%=r2%>"/></td></tr></table></div><%

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin } else if (g == Genre.PLAIN || g == Genre.HTML) {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin//--------Do THE DIFFS------------

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin ArrayList<String> l1 = new ArrayList<String>();

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin String line;

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin BufferedReader reader1 = new BufferedReader(new InputStreamReader(in1));

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin BufferedReader reader2 = new BufferedReader(new InputStreamReader(in2));

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin while ((line = reader1.readLine()) != null) {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin l1.add(line);

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin }

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin ArrayList<String> l2 = new ArrayList<String>();

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin while ((line = reader2.readLine()) != null) {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin l2.add(line);

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin }

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin Object[] file1 = l1.toArray();

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin Object[] file2 = l2.toArray();

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin

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

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin if(rev.size() == 0) {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin %><b>No differences found!</b><%

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin } else {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin int ln1 = 0;

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin int ln2 = 0;

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin String format = request.getParameter("format");

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin if(format == null || (!format.equals("o") && !format.equals("n") && !format.equals("u") && !format.equals("t")))

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin format = "s";

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin String pfull = request.getParameter("full");

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin boolean full = pfull != null && pfull.equals("1");

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin pfull = full ? "1" : "0";

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin%><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> | <%

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chinif(format.equals("s")) {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin %><span class="tabsel"><b>sdiff</b></span> <%

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin} else {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin %><span class="tab"><a href="<%=reqURI%>?r1=<%=rp1%>&r2=<%=rp2%>&format=s&full=<%=pfull%>">sdiff</a></span> <%

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin}

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin if(format.equals("u")) {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin %><span class="tabsel"><b>udiff</b></span> <%

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin } else {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin %><span class="tab"><a href="<%=reqURI%>?r1=<%=rp1%>&r2=<%=rp2%>&format=u&full=<%=pfull%>">udiff</a></span> <%

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin }

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin if(format.equals("t")) {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin %><span class="tabsel"><b>text</b></span> <%

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin } else {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin %><span class="tab"><a href="<%=reqURI%>?r1=<%=rp1%>&r2=<%=rp2%>&format=t&full=<%=pfull%>">text</a></span> <%

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin }

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin if(format.equals("o")) {

da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968chin %><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"%><%

}

%>