Attachment #164560 for bug #292831

Lines 135-141 Link Here

(-)compare/org/eclipse/compare/internal/CompareMessages.properties (-1 / +1 lines)
135	CompareContentViewerSwitchingPane_switchButtonTooltip=Switch Compare Viewer	135	CompareContentViewerSwitchingPane_switchButtonTooltip=Switch Compare Viewer
136	CompareContentViewerSwitchingPane_discoveredLabel={0} Compare	136	CompareContentViewerSwitchingPane_discoveredLabel={0} Compare
137	CompareContentViewerSwitchingPane_optimized=Optimized algorithm used	137	CompareContentViewerSwitchingPane_optimized=Optimized algorithm used
138	CompareContentViewerSwitchingPane_optimizedTooltip=To avoid long computation time an optimized comparison algorithm has been used. As a result a non-optimal matching could be found.	138	CompareContentViewerSwitchingPane_optimizedTooltip=To avoid long computation time a faster comparison algorithm has been used. As a result, the matching might not be optimal.
139	CompareStructureViewerSwitchingPane_defaultViewer=Default Structure Compare	139	CompareStructureViewerSwitchingPane_defaultViewer=Default Structure Compare
140	CompareStructureViewerSwitchingPane_switchButtonTooltip=Switch Structure Compare Viewer	140	CompareStructureViewerSwitchingPane_switchButtonTooltip=Switch Structure Compare Viewer
141	CompareStructureViewerSwitchingPane_discoveredLabel={0} Structure Compare	141	CompareStructureViewerSwitchingPane_discoveredLabel={0} Structure Compare

Lines 535-543 Link Here

(-)compare/org/eclipse/compare/internal/merge/DocumentMerger.java (-3 / +3 lines)
535	int aLength = ancestor == null? 0 : ancestor.getRangeCount();	535	int aLength = ancestor == null? 0 : ancestor.getRangeCount();
536	int lLength = left.getRangeCount();	536	int lLength = left.getRangeCount();
537	int rLength = right.getRangeCount();	537	int rLength = right.getRangeCount();
538	if (aLength * lLength > LCS.TOO_LONG	538	if ((double) aLength * (double) lLength > LCS.TOO_LONG
539	\|\| aLength * rLength > LCS.TOO_LONG	539	\|\| (double) aLength * (double) rLength > LCS.TOO_LONG
540	\|\| lLength * lLength > LCS.TOO_LONG)	540	\|\| (double) lLength * (double) lLength > LCS.TOO_LONG)
541	return true;	541	return true;
542	return false;	542	return false;
543	}	543	}

Return to bug 292831