1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
/*
* DiffNormalOutput.java
* Copyright (c) 2001 Andre Kaplan
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
package jdiff.util;
import java.io.IOException;
/** Print a change list in the standard diff format. */
public class DiffNormalOutput extends DiffOutput {
public DiffNormalOutput(Object[] a, Object[] b) {
super(a, b);
}
public void writeScript(Diff.change script) throws IOException {
Diff.change hunk = script;
for (; hunk != null; hunk = hunk.link) {
this.writeHunk(hunk);
}
this.out.flush();
}
/** Writes a hunk of a normal diff. */
protected void writeHunk(Diff.change hunk) throws IOException {
int deletes = hunk.deleted;
int inserts = hunk.inserted;
if (deletes == 0 && inserts == 0) {
return;
}
// Determine range of line numbers involved in each file.
int first0 = hunk.line0;
int first1 = hunk.line1;
int last0 = hunk.line0 + hunk.deleted - 1;
int last1 = hunk.line1 + hunk.inserted - 1;
// Write out the line number header for this hunk
this.writeNumberRange(',', first0, last0);
out.write(DiffOutput.changeLetter(inserts, deletes));
this.writeNumberRange(',', first1, last1);
out.write(this.lineSeparator);
// Write the lines that the first file has.
if (deletes != 0) {
for (int i = first0; i <= last0; i++) {
this.writeLine("< ", this.file0[i]);
}
}
if (inserts != 0 && deletes != 0) {
out.write("---" + this.lineSeparator);
}
// Write the lines that the second file has.
if (inserts != 0) {
for (int i = first1; i <= last1; i++) {
this.writeLine("> ", this.file1[i]);
}
}
}
}
|
