diff options
Diffstat (limited to 'bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java')
-rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java index d1ce02c0b..7eaeaa8b0 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2018 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -175,12 +175,12 @@ public class DocLineComparator implements ITokenComparator { int tlen= getTokenLength(thisIndex); int olen= other.getTokenLength(otherIndex); - if (fCompareFilters != null && fCompareFilters.length > 0) { - String[] linesToCompare = extract(thisIndex, otherIndex, other, true); - return linesToCompare[0].equals(linesToCompare[1]); - } else if (tlen == olen) { + if (tlen == olen) { String[] linesToCompare = extract(thisIndex, otherIndex, other, false); return linesToCompare[0].equals(linesToCompare[1]); + } else if (fCompareFilters != null && fCompareFilters.length > 0) { + String[] linesToCompare = extract(thisIndex, otherIndex, other, true); + return linesToCompare[0].equals(linesToCompare[1]); } } return false; |