58N/A<%--

58N/ACDDL HEADER START

58N/A

58N/AThe contents of this file are subject to the terms of the

58N/ACommon Development and Distribution License (the "License").

58N/AYou may not use this file except in compliance with the License.

58N/A

58N/ASee LICENSE.txt included in this distribution for the specific

58N/Alanguage governing permissions and limitations under the License.

58N/A

58N/AWhen distributing Covered Code, include this CDDL HEADER in each

58N/Afile and include the License file at LICENSE.txt.

58N/AIf applicable, add the following below this CDDL HEADER, with the

58N/Afields enclosed by brackets "[]" replaced with your own identifying

58N/Ainformation: Portions Copyright [yyyy] [name of copyright owner]

58N/A

58N/ACDDL HEADER END

58N/A

58N/ACopyright 2005 Sun Microsystems, Inc. All rights reserved.

58N/AUse is subject to license terms.

1123N/A

58N/Aident "@(#)diff.jsp 1.2 05/12/01 SMI"

58N/A

58N/A--%><%@ page import = "javax.servlet.*,

234N/Ajava.lang.*,

234N/Ajavax.servlet.http.*,

234N/Ajava.util.*,

234N/Ajava.io.*,

639N/Ajava.text.*,

639N/Aorg.opensolaris.opengrok.analysis.*,

234N/Aorg.opensolaris.opengrok.analysis.FileAnalyzer.Genre,

234N/Aorg.opensolaris.opengrok.web.*,

234N/Aorg.opensolaris.opengrok.history.*,

234N/Aorg.apache.commons.jrcs.diff.*"

639N/A%><%@include file="mast.jsp"%><%!

639N/A

58N/AString readableLine(int n) {

667N/A if (n < 10) {

1016N/A return " " + n;

58N/A } else {

1016N/A return String.valueOf(n);

664N/A }

1026N/A}

112N/A

58N/AString[] diffline(String line1, String line2) {

58N/A int i=0, j=1;

77N/A int l1 = line1.length();

77N/A int l2 = line2.length();

77N/A String[] ret = new String[2];

77N/A while (i < l1 && i < l2 && (line1.charAt(i) == line2.charAt(i)))

58N/A i++;

418N/A

58N/A while (j < l1 && j < l2 && (line1.charAt(l1 - j) == line2.charAt(l2 - j)))

773N/A j++;

773N/A

58N/A StringBuilder sb = new StringBuilder(line1);

773N/A if(i <= l1 - j) {

773N/A sb.insert(i, "<span class=\"d\">");

773N/A sb.insert(sb.length()-j+1, "</span>");

773N/A ret[0] = sb.toString();

58N/A } else {

773N/A ret[0] = line1;

773N/A }

773N/A

773N/A if(i <= l2 - j) {

58N/A sb = new StringBuilder(line2);

58N/A sb.insert(i, "<span class=\"a\">");

58N/A sb.insert(sb.length()-j+1, "</span>");

664N/A ret[1] = sb.toString();

58N/A } else {

65N/A ret[1] = line2;

894N/A }

77N/A return ret;

99N/A}

99N/A

1115N/A%><%

1115N/A

125N/Aif (valid) {

112N/A String r1 = request.getParameter("r1");

1026N/A String r2 = request.getParameter("r2");

129N/A

1100N/A if (r1 == null || r2 == null || r1.equals("") || r2.equals("") || r1.equals(r2) || !r1.matches("^[0-9]+(\\.[0-9]+)*$") || !r2.matches("^[0-9]+(\\.[0-9]+)*$")) {

129N/A%><div class="src"><h3 class="error">Error:</h3>

129N/A Please pick two revisions to compare the changed from the <a href="<%=context%>/history<%=path%>">history</a>

318N/A</div><%

318N/A// Error message ask to choose two versions from History log page with link to it

144N/A } else {

173N/A Genre g = AnalyzerGuru.getGenre(basename);

253N/A if (g == Genre.PLAIN || g == null || g == Genre.DATA || g == Genre.HTML) {

296N/A InputStream in1 = null;

335N/A InputStream in2 = null;

480N/A try{

816N/A in1 = HistoryGuru.getInstance().getRevision(resourceFile.getParent(), basename, r1);

816N/A in2 = HistoryGuru.getInstance().getRevision(resourceFile.getParent(), basename, r2);

833N/A } catch (Exception e) {

833N/A %> <h3 class="error">Error opening revisions!</h3> <%

993N/A }

1016N/A try {

1123N/A if (in1 != null && in2 != null) {

1125N/A g = AnalyzerGuru.getGenre(basename);

993N/A if (g == null) {

993N/A g = AnalyzerGuru.getGenre(in1);

993N/A }

993N/A if (g == Genre.IMAGE) {

993N/A %> <div id="difftable">

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

993N/A <tr><td><img src="<%=context%>/raw<%=path%>?r=<%=r1%>"/></td><td><img src="<%=context%>/raw<%=path%>?r=<%=r2%>"/></td></tr></table></div><%

993N/A } else if (g == Genre.PLAIN || g == Genre.HTML) {

937N/A//--------Do THE DIFFS------------

58N/A ArrayList l1 = new ArrayList();

58N/A String line;

816N/A BufferedReader reader1 = new BufferedReader(new InputStreamReader(in1));

58N/A BufferedReader reader2 = new BufferedReader(new InputStreamReader(in2));

58N/A

773N/A while ((line = reader1.readLine()) != null) {

58N/A l1.add(line);

664N/A }

58N/A

850N/A ArrayList l2 = new ArrayList();

1118N/A while ((line = reader2.readLine()) != null) {

870N/A l2.add(line);

870N/A }

99N/A Object[] file1 = l1.toArray();

1115N/A Object[] file2 = l2.toArray();

101N/A

106N/A Revision rev = Diff.diff(file1, file2);

112N/A

1026N/A if(rev.size() == 0) {

129N/A %><b>No differences found!</b><%

129N/A } else {

129N/A

875N/A int ln1 = 0;

318N/A int ln2 = 0;

144N/A

173N/A String format = request.getParameter("format");

253N/A if(format == null || (!format.equals("o") && !format.equals("n") && !format.equals("u") && !format.equals("t")))

296N/A format = "s";

335N/A String pfull = request.getParameter("full");

480N/A boolean full = pfull != null && pfull.equals("1");

816N/A pfull = full ? "1" : "0";

816N/A

993N/A

1016N/A%><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> | <%

58N/A

937N/Aif(format.equals("s")) {

58N/A %><span class="tabsel"><b>sdiff</b></span> <%

58N/A} else {

58N/A %><span class="tab"><a href="<%=reqURI%>?r1=<%=r1%>&r2=<%=r2%>&format=s&full=<%=pfull%>">sdiff</a></span> <%

937N/A}

58N/A

58N/A if(format.equals("u")) {

58N/A %><span class="tabsel"><b>udiff</b></span> <%

937N/A } else {

816N/A %><span class="tab"><a href="<%=reqURI%>?r1=<%=r1%>&r2=<%=r2%>&format=u&full=<%=pfull%>">udiff</a></span> <%

816N/A }

816N/A

816N/A if(format.equals("t")) {

816N/A %><span class="tabsel"><b>text</b></span> <%

816N/A } else {

816N/A %><span class="tab"><a href="<%=reqURI%>?r1=<%=r1%>&r2=<%=r2%>&format=t&full=<%=pfull%>">text</a></span> <%

816N/A }

816N/A

816N/A if(format.equals("o")) {

816N/A %><span class="tabsel"><b>old (<%=r1%>)</b></span> <%

816N/A } else {

816N/A %><span class="tab"><a href="<%=reqURI%>?r1=<%=r1%>&r2=<%=r2%>&format=o&full=<%=pfull%>">old (<%=r1%>)</a></span> <%

816N/A }

816N/A

773N/A if(format.equals("n")) {

773N/A %><span class="tabsel"><b>new (<%=r2%>)</b></span>&nbsp;|&nbsp;<%

773N/A } else {

773N/A %><span class="tab"><a href="<%=reqURI%>?r1=<%=r1%>&r2=<%=r2%>&format=n&full=<%=pfull%>">new (<%=r2%>)</a></span>&nbsp;|&nbsp;<%

773N/A }

773N/A

58N/A if(!full) {

58N/A %><span class="tab"><a href="<%=reqURI%>?r1=<%=r1%>&r2=<%=r2%>&format=<%=format%>&full=1">&nbsp; &nbsp; full &nbsp; &nbsp;</a></span> <span class="tabsel"><b>compact</b></span><%

58N/A } else {

773N/A %><span class="tabsel"><b>&nbsp; &nbsp; full &nbsp; &nbsp;</b> </span> <span class="tab"> <a href="<%=reqURI%>?r1=<%=r1%>&r2=<%=r2%>&format=<%=format%>&full=0">compact</a></span><%

773N/A }

773N/A

773N/A if(format.equals("s") || format.equals("u")) {

773N/A %></div><pre wrap><table cellpadding="2" cellspacing="1" border="0" rules="cols"><%

58N/A if(format.equals("s")) {

58N/A %><tr><th><%=basename%> (<%=r1%>)</th><th><%=basename%> (<%=r2%>)</th></tr><%

58N/A }

773N/A } else {

773N/A %></div><pre wrap><%

773N/A }

773N/A

773N/A for (int i=0; i < rev.size(); i++) {

773N/A Delta d = rev.getDelta(i);

773N/A if(format.equals("t")) {

773N/A %><%=Util.Htmlize(d.toString())%><%

773N/A } else {

58N/A Chunk c1 = d.getOriginal();

58N/A Chunk c2 = d.getRevised();

58N/A int cn1 = c1.first();

773N/A int cl1 = c1.last();

773N/A int cn2 = c2.first();

773N/A int cl2 = c2.last();

773N/A

773N/A int i1 = cn1, i2 = cn2;

773N/A for (; i1 <= cl1 && i2 <= cl2; i1++, i2++) {

773N/A String[] ss = diffline(Util.Htmlize((String)file1[i1]), Util.Htmlize((String)file2[i2]));

58N/A file1[i1] = ss[0];

58N/A file2[i2] = ss[1];

58N/A }

773N/A if(i1 <= cl1) {

773N/A for(int h=i1; h<= cl1; h++) {

773N/A file1[h] = Util.Htmlize((String)file1[h]);

773N/A }

773N/A file1[i1] = "<span class=\"d\">" + file1[i1];

773N/A file1[cl1] = file1[cl1] + "</span>";

773N/A }

773N/A if(i2 <= cl2) {

773N/A for(int h=i2; h<= cl2; h++) {

773N/A file2[h] = Util.Htmlize((String)file2[h]);

773N/A }

773N/A file2[i2] = "<span class=\"a\">" + file2[i2];

773N/A file2[cl2] = file2[cl2] + "</span>";

773N/A }

773N/A

773N/A if (format.equals("u")) {

773N/A// UDIFF

773N/A if (cn1 > ln1 || cn2 > ln2) {

773N/A %><tr class="k"><td><%

773N/A if (full || (cn2 - ln2 < 20)) {

773N/A for (int j = ln2; j < cn2; j++) {

773N/A %><i><%=readableLine(++ln2)%></i><%=Util.Htmlize((String)file2[j])%><br/><%

773N/A }

937N/A } else {

58N/A for (int j = ln2; j < ln2+8; j++) {

58N/A %><i><%=readableLine(j+1)%></i><%=Util.Htmlize((String)file2[j])%><br/><%

58N/A }

937N/A %><br/>--- <b><%=cn2 - ln2 - 16%> unchanged lines hidden</b> (<a href="<%=reqURI%>?r1=<%=r1%>&r2=<%=r2%>&format=<%=format%>&full=1#<%=ln2%>">view full</a>) --- <br/><br/><%

58N/A ln2 = cn2-8;

58N/A for (int j = cn2 - 8; j < cn2; j++) {

58N/A %><i><%=readableLine(++ln2)%></i><%=Util.Htmlize((String)file2[j])%><br/><%

937N/A }

58N/A }

58N/A %></td></tr><%

58N/A ln1 = cn1;

937N/A }

58N/A if(cn1 <= cl1) {

58N/A %><tr><td class="d"><%

58N/A for(int j = cn1; j <= cl1 ; j++) {

937N/A %><strike class="d"><%=readableLine(++ln1)%></strike><%=file1[j]%><br/><%

58N/A }

58N/A %></td></tr><%

58N/A }

937N/A if(cn2 <= cl2) {

58N/A %><tr class="k"><td><%

58N/A for(int j = cn2; j < cl2; j++) {

58N/A %><i class="a"><%=readableLine(++ln2)%></i><%=file2[j]%><br/><%

937N/A }

664N/A %><i class="a"><%=readableLine(++ln2)%></i><%=file2[cl2]%><%

58N/A if(full) {

58N/A %><a name="<%=ln2%>" /><%

937N/A }

664N/A %></td></tr><%

58N/A }

58N/A// SDIFF by default

937N/A } else if(format.equals("s")) {

58N/A

58N/A if (cn1 > ln1 || cn2 > ln2) {

58N/A %><tr class="k"><td><%

937N/A if(full || cn2 - ln2 < 20) {

58N/A for(int j = ln1; j < cn1; j++) {

58N/A %><i><%=readableLine(++ln1)%></i><%=Util.Htmlize((String)file1[j])%><br/><%

58N/A }

937N/A %></td><td><%

65N/A for(int j = ln2; j < cn2 ; j++) {

65N/A %><i><%=readableLine(++ln2)%></i><%=Util.Htmlize((String)file2[j])%><br/><%

65N/A }

937N/A } else {

65N/A for(int j = ln1; j < ln1+8; j++) {

65N/A %><i><%=readableLine(j+1)%></i><%=Util.Htmlize((String)file1[j])%><br/><%

65N/A }

937N/A %><br/>--- <b><%=cn1 - ln1 - 16%> unchanged lines hidden</b> (<a href="<%=reqURI%>?r1=<%=r1%>&r2=<%=r2%>&format=<%=format%>&full=1#<%=ln2%>">view full</a>) --- <br/><br/><%

77N/A ln1 = cn1-8;

77N/A for (int j = cn1 - 8; j < cn1; j++) {

77N/A %><i><%=readableLine(++ln1)%></i><%=Util.Htmlize((String)file1[j])%><br/><%

937N/A }

77N/A %></td><td><%

77N/A for (int j = ln2; j < ln2+8; j++) {

77N/A %><i><%=readableLine(j+1)%></i><%=Util.Htmlize((String)file2[j])%><br/><%

99N/A }

99N/A %><br/>--- <b><%=cn2 - ln2 - 16%> unchanged lines hidden</b> (<a href="<%=reqURI%>?r1=<%=r1%>&r2=<%=r2%>&format=<%=format%>&full=1#<%=ln2%>">view full</a>) --- <br/><br/><%

99N/A ln2 = cn2-8;

99N/A for (int j = cn2 - 8; j < cn2; j++) {

99N/A %><i><%=readableLine(++ln2)%></i><%=Util.Htmlize((String)file2[j])%><br/><%

99N/A }

99N/A }

99N/A %></td></tr><%

99N/A }

99N/A

99N/A %><tr valign="top" class="k"><td><%

99N/A for(int j = cn1; j <= cl1; j++) {

99N/A %><i><%=readableLine(++ln1)%></i><%=file1[j]%><br/><%

99N/A }

99N/A %></td><td><%

99N/A for(int j = cn2; j <= cl2; j++) {

937N/A %><i><%=readableLine(++ln2)%></i><a name="<%=ln2%>" /></a><%=file2[j]%><br/><%

1115N/A }

1115N/A %></td></tr><%

1115N/A

1115N/A// OLD -----

1115N/A } else if ( format.equals("o")) {

1115N/A if (cn1 > ln1) {

1115N/A if(full || cn1 - ln1 < 20) {

1115N/A for(int j = ln1; j < cn1; j++) {

125N/A %><i><%=readableLine(++ln1)%></i><%=Util.Htmlize((String)file1[j])%><br/><%

125N/A }

125N/A } else {

937N/A for(int j = ln1; j < ln1+8; j++) {

125N/A %><i><%=readableLine(j+1)%></i><%=Util.Htmlize((String)file1[j])%><br/><%

125N/A }

125N/A %><br/>--- <b><%=cn1 - ln1 - 16%> unchanged lines hidden</b> (<a href="<%=reqURI%>?r1=<%=r1%>&r2=<%=r2%>&format=<%=format%>&full=1#<%=ln1%>">view full</a>) --- <br/><br/><%

106N/A ln1 = cn1-8;

106N/A for (int j = cn1 - 8; j < cn1; j++) {

937N/A %><i><%=readableLine(++ln1)%></i><%=Util.Htmlize((String)file1[j])%><br/><%

106N/A }

106N/A }

106N/A }

937N/A for(int j = cn1; j <= cl1 ; j++) {

106N/A %><i><%=readableLine(++ln1)%></i><%=file1[j]%><br/><%

106N/A }

106N/A if(full) {

112N/A %><a name="<%=ln1%>" ></a><%

112N/A }

112N/A

112N/A// NEW -----------

112N/A } else if ( format.equals("n")) {

112N/A

112N/A if (cn2 > ln2) {

112N/A if(full || cn2 - ln2 < 20) {

129N/A for(int j = ln2; j < cn2 ; j++) {

1026N/A %><i><%=readableLine(++ln2)%></i><%=Util.Htmlize((String)file2[j])%><br/><%

1026N/A }

1026N/A } else {

1026N/A for (int j = ln2; j < ln2+8; j++) {

1026N/A %><i><%=readableLine(j+1)%></i><%=Util.Htmlize((String)file2[j])%><br/><%

1026N/A }

1026N/A %><br/>--- <b><%=cn2 - ln2 - 16%> unchanged lines hidden</b> (<a href="<%=reqURI%>?r1=<%=r1%>&r2=<%=r2%>&format=<%=format%>&full=1#<%=ln2%>">view full</a>) --- <br/><br/><%

1026N/A ln2 = cn2-8;

129N/A for (int j = cn2 - 8; j < cn2; j++) {

129N/A %><i><%=readableLine(++ln2)%></i><%=Util.Htmlize((String)file2[j])%><br/><%

129N/A }

129N/A }

129N/A }

129N/A for(int j = cn2; j <= cl2 ; j++) {

129N/A %><i><%=readableLine(++ln2)%></i><%=file2[j]%><br/><%

129N/A }

1100N/A if(full) {

1100N/A %><a name="<%=ln2%>"></a><%

1100N/A }

1100N/A

1100N/A }

1100N/A }

1100N/A }

1100N/A

129N/A

129N/A if (file1.length >= ln1) {

129N/A// dump the remaining

129N/A if (format.equals("s")) {

129N/A if (full || file1.length - ln1 < 20) {

129N/A %><tr><td><%

129N/A for (int j = ln1; j < file1.length ; j++) {

129N/A %><i><%=(j+1)%></i><%=Util.Htmlize((String)file1[j])%><br/><%

129N/A }

129N/A %></td><td><%

129N/A for (int j = ln2; j < file2.length ; j++) {

129N/A %><i><%=(j+1)%></i><%=Util.Htmlize((String)file2[j])%><br/><%

129N/A }

129N/A %></td></tr></table><%

129N/A } else {

937N/A %><tr><td><%

318N/A for (int j = ln1; j < ln1 + 8 ; j++) {

318N/A %><i><%=(j+1)%></i><%=Util.Htmlize((String)file1[j])%><br/><%

318N/A }

318N/A

318N/A %><br/> --- <b><%=file1.length - ln1 - 8%> unchanged lines hidden</b> --- </td><td><%

318N/A for (int j = ln2; j < ln2 + 8 ; j++) {

318N/A %><i><%=(j+1)%></i><%=Util.Htmlize((String)file2[j])%><br/><%

318N/A }

318N/A %><br/>--- <b><%=file1.length - ln1 - 8%> unchanged lines hidden</b> ---</td></tr></table><%

318N/A }

318N/A } else if (format.equals("u")) {

318N/A if (full || file2.length - ln2 < 20) {

318N/A %><tr><td><%

318N/A for (int j = ln2; j < file2.length ; j++) {

318N/A %><i><%=(j+1)%></i><%=Util.Htmlize((String)file2[j])%><br/><%

144N/A }

144N/A %></td></tr></table><%

144N/A } else {

144N/A %><tr><td><%

144N/A for (int j = ln2; j < ln2 + 8 ; j++) {

144N/A %><i><%=(j+1)%></i><%=Util.Htmlize((String)file2[j])%><br/><%

144N/A }

144N/A %><br/>--- <b><%=file2.length - ln2 - 8%> unchanged lines hidden</b> ---</td></tr></table><%

173N/A }

173N/A } else if (format.equals("o")) {

173N/A if (full || file1.length - ln1 < 20) {

173N/A for (int j = ln1; j < file1.length ; j++) {

173N/A %><i><%=(j+1)%></i><%=Util.Htmlize((String)file1[j])%><br/><%

173N/A }

173N/A } else {

173N/A for (int j = ln1; j < ln1 + 8 ; j++) {

234N/A %><i><%=(j+1)%></i><%=Util.Htmlize((String)file1[j])%><br/><%

253N/A }

253N/A

253N/A %><br/> --- <b><%=file1.length - ln1 - 8%> unchanged lines hidden</b> ---<br/><%

253N/A }

253N/A } else if (format.equals("n")) {

253N/A if (full || file2.length - ln2 < 20) {

253N/A for (int j = ln2; j < file2.length ; j++) {

253N/A %><i><%=(j+1)%></i><%=Util.Htmlize((String)file2[j])%><br/><%

296N/A }

296N/A } else {

296N/A for (int j = ln2; j < ln2 + 8 ; j++) {

296N/A %><i><%=(j+1)%></i><%=Util.Htmlize((String)file2[j])%><br/><%

296N/A }

296N/A %><br/> --- <b><%=file2.length - ln2 - 8%> unchanged lines hidden</b> ---<br/><%

296N/A }

335N/A }

335N/A

335N/A }

335N/A

335N/A//----DIFFS Done--------

335N/A%></pre></div><%

335N/A }

335N/A } else {

335N/A %> <div id="src">Diffs for binary files cannot be displayed! Files are <a href="<%=context%>/raw<%=path%>?r=<%=r1%>"><%=basename%>(revision <%=r1%>)</a> and

480N/A <a href="<%=context%>/raw<%=path%>?r=<%=r2%>"><%=basename%>(revision <%=r2%>)</a>.

480N/A </div><%

480N/A }

480N/A }

480N/A } catch (FileNotFoundException e) {

480N/A %><div class="src"><h3 class="error">Error Opening files! <%=Util.Htmlize(e.getMessage())%></h3></div><%

480N/A }

937N/A if(in1 != null)

937N/A in1.close();

667N/A if(in2 != null)

667N/A in2.close();

667N/A } else if (g == Genre.IMAGE) {

833N/A %> <div class="src">

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

833N/A <tr><td><img src="<%=context%>/raw<%=path%>?r=<%=r1%>"/></td><td><img src="<%=context%>/raw<%=path%>?r=<%=r2%>"/></td></tr></table></div><%

833N/A

833N/A } else {

833N/A %> <div class="src">Diffs for binary files cannot be displayed. Files are <a href="<%=context%>/raw<%=path%>?r=<%=r1%>"><%=basename%>(revision <%=r1%>)</a> and

833N/A <a href="<%=context%>/raw<%=path%>?r=<%=r2%>"><%=basename%>(revision <%=r2%>)</a>.

833N/A </div><%

833N/A }

833N/A }

833N/A%><%@include file="foot.html"%><%

833N/A}

833N/A%>

833N/A