Update of /var/cvs/applications/richtext/src/org/incava/util/diff
In directory james.mmbase.org:/tmp/cvs-serv13286/incava/util/diff
Modified Files:
Diff.java Difference.java
Log Message:
moved additions to org.incava to extensing in org.mmbase.versioning
See also:
http://cvs.mmbase.org/viewcvs/applications/richtext/src/org/incava/util/diff
Index: Diff.java
===================================================================
RCS file: /var/cvs/applications/richtext/src/org/incava/util/diff/Diff.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Diff.java 17 Jun 2008 15:51:01 -0000 1.2
+++ Diff.java 24 Jun 2008 12:10:04 -0000 1.3
@@ -471,51 +471,5 @@
return k;
}
- protected void appendToHtml(StringBuilder buf, Object[] a, int i, String
claz) {
- buf.append("<td class='" + claz + "'>");
- if (i >= 0 && i < a.length) {
- buf.append("" + a[i]);
- }
- buf.append("</td>");
- }
- protected void appendToHtml(StringBuilder buf, int startA, int endA, int
startB, int endB, Difference d) {
- for (int i = 0; i <= Math.max(endA - startA, endB - startB); i++) {
- buf.append("<tr class='" +
- (d != null ?
- (i + startB < b.length ? "add " : "") +
- (i + startA < a.length ? "delete " : "")
- :
- "") +
- "'>");
- buf.append("<td class='difference'>" + (i == 0 ? "" + d + ": " :
"") + i +"</td>");
- appendToHtml(buf, a, endA != Difference.NONE ? i + startA : -1,
"old");
- appendToHtml(buf, b, endB != Difference.NONE ? i + startB : -1,
"new");
- buf.append("</tr>");
- }
- }
-
- public String toHtml() {
- StringBuilder buf = new StringBuilder();
- int startA = -1;
- int startB = -1;
- buf.append("<tr class='difference'><td colspan='100'>" + diff() +
"</td></tr>");
- for (Difference d : diff()) {
- int delEnd = d.getDeletedEnd();
- int delStart= d.getDeletedStart();
- int addEnd = d.getAddedEnd();
- int addStart = d.getAddedStart();
- if (delEnd != Difference.NONE) {
- startA = delEnd;
- }
- if (addEnd != Difference.NONE) {
- startB = addEnd;
- }
- appendToHtml(buf, delStart, delEnd, addStart, addEnd, d);
-
- }
- appendToHtml(buf, startA + 1, a.length, startB + 1, b.length, null);
- return buf.toString();
-
- }
}
Index: Difference.java
===================================================================
RCS file:
/var/cvs/applications/richtext/src/org/incava/util/diff/Difference.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Difference.java 17 Jun 2008 15:51:17 -0000 1.2
+++ Difference.java 24 Jun 2008 12:10:04 -0000 1.3
@@ -132,41 +132,5 @@
return buf.toString();
}
- public String toUnixDiff(Object[] aLines, Object[] bLines) {
- StringBuilder buf = new StringBuilder();
- append(buf, delStart, delEnd);
- buf.append(delEnd != Difference.NONE && addEnd != Difference.NONE ?
"c" : (delEnd == Difference.NONE ? "a" : "d"));
- append(buf, addStart, addEnd);
-
- buf.append("\n");
-
- if (delEnd != Difference.NONE) {
- appendLines(buf, delStart, delEnd, "<", aLines);
- if (addEnd != Difference.NONE) {
- buf.append("---\n");
- }
- }
- if (addEnd != Difference.NONE) {
- appendLines(buf, addStart, addEnd, ">", bLines);
- }
- return buf.toString();
-
- }
-
- protected void append(StringBuilder buf, int start, int end) {
- // match the line numbering from diff(1):
- buf.append(end == Difference.NONE ? start : (1 + start));
-
- if (end != Difference.NONE && start != end) {
- buf.append(",").append(1 + end);
- }
- }
-
- protected void appendLines(StringBuilder buf, int start, int end, String
ind, Object[] lines) {
-
- for (int lnum = start; lnum <= end; ++lnum) {
- buf.append("" + ind + " " + lines[lnum] + "\n");
- }
- }
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
