Update of /var/cvs/applications/richtext/src/org/mmbase/versioning
In directory james.mmbase.org:/tmp/cvs-serv24938
Modified Files:
Diff.java
Log Message:
added toUnixDiff as a member function too
See also:
http://cvs.mmbase.org/viewcvs/applications/richtext/src/org/mmbase/versioning
Index: Diff.java
===================================================================
RCS file: /var/cvs/applications/richtext/src/org/mmbase/versioning/Diff.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Diff.java 24 Jun 2008 12:10:04 -0000 1.1
+++ Diff.java 30 Jun 2008 09:15:36 -0000 1.2
@@ -8,7 +8,7 @@
* Utility to present diffs.
*
* @author Michiel Meeuwissen
- * @version $Id: Diff.java,v 1.1 2008/06/24 12:10:04 michiel Exp $
+ * @version $Id: Diff.java,v 1.2 2008/06/30 09:15:36 michiel Exp $
* @since
*/
@@ -80,9 +80,17 @@
}
-
- public static String toUnixDiff(Difference difference, Object[] aLines,
Object[] bLines) {
+ public String toUnixDiff() {
StringBuilder buf = new StringBuilder();
+ for (Difference difference : diff()) {
+ toUnixDiff(buf, difference, a, b);
+ }
+ return buf.toString();
+ }
+
+
+ public static void toUnixDiff(StringBuilder buf, Difference difference,
Object[] aLines, Object[] bLines) {
+
append(buf, difference.getDeletedStart(), difference.getDeletedEnd());
buf.append(difference.getDeletedEnd() != Difference.NONE &&
difference.getAddedEnd() != Difference.NONE ? "c" :
(difference.getDeletedEnd() == Difference.NONE ? "a" : "d"));
@@ -99,7 +107,6 @@
if (difference.getAddedEnd() != Difference.NONE) {
appendLines(difference, buf, difference.getAddedStart(),
difference.getAddedEnd(), ">", bLines);
}
- return buf.toString();
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
