[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/util ...
Christian Bauer
christian at hibernate.org
Fri Apr 20 05:10:12 EDT 2007
User: cbauer
Date: 07/04/20 05:10:12
Modified: examples/wiki/src/main/org/jboss/seam/wiki/util Diff.java
Log:
Finished document history and diff feature
Revision Changes Path
1.3 +1 -3 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/util/Diff.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Diff.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/util/Diff.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Diff.java 18 Mar 2007 19:01:15 -0000 1.2
+++ Diff.java 20 Apr 2007 09:10:12 -0000 1.3
@@ -2,7 +2,6 @@
import java.util.Arrays;
import java.util.List;
-import java.util.ArrayList;
/**
* String comparison and diff algorithms with customizable result rendering.
@@ -22,7 +21,7 @@
* @param ignoreStrings These strings are ignored and not marked as different.
* @return String A result with all deletions and modifications highlighted with custom boundary markers.
*/
- public String[] renderDiff(String[] x, String[] y, String... ignoreStrings) {
+ public String[] createDiff(String[] x, String[] y, String... ignoreStrings) {
List<String> ignoreList = Arrays.asList(ignoreStrings);
int M = x.length;
@@ -92,7 +91,6 @@
return diff.toString();
}
-
protected abstract String getDeletionStartMarker();
protected abstract String getDeletionEndMarker();
protected abstract String getAdditionStartMarker();
More information about the jboss-cvs-commits
mailing list