Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiraj Modi2019-10-11 01:08:23 +0000
committerDani Megert2019-10-11 14:23:09 +0000
commit8c86157a414ac49f969763b050396c43ced40a1e (patch)
treed2668fd907e383300cbae64ee8e2dc5a62694947
parent17002c7e175bd394dd73c7f9e8680e2228a4d2b9 (diff)
downloadeclipse.platform.team-I20191014-1800.tar.gz
eclipse.platform.team-I20191014-1800.tar.xz
eclipse.platform.team-I20191014-1800.zip
Change-Id: I5608cb42222b3cf3aa04c3fb0b46d3c1dc818291 Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java10
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;

Back to the top