Index: Differencer.java =================================================================== RCS file: /home/eclipse/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java,v retrieving revision 1.15 diff -u -r1.15 Differencer.java --- Differencer.java 1 Dec 2004 14:24:31 -0000 1.15 +++ Differencer.java 9 Dec 2004 13:03:19 -0000 @@ -447,6 +447,13 @@ int c2= is2.read(); if (c1 == -1 && c2 == -1) return true; + /* FIX!!!! Obviously this is not the way to fix the problem, + but it helps point out where the problem is */ + if (isWhiteSpace(c1)) + continue; + if (isWhiteSpace(c2)) + continue; + if (c1 != c2) break; @@ -472,6 +479,14 @@ return false; } + /** + * @param c1 + * @return + */ + private boolean isWhiteSpace(int c1) { + return (c1==' ')||(c1=='\t')||(c1=='\r')||(c1=='\n'); + } + /* * Tries to return an InputStream for the given object. * Returns null if the object not an IStreamContentAccessor