diff options
| author | Pawel Pogorzelski | 2010-04-12 18:25:07 +0000 |
|---|---|---|
| committer | Pawel Pogorzelski | 2010-04-12 18:25:07 +0000 |
| commit | eba4e921ee3d1737845ae8152dd0a1f8770d6287 (patch) | |
| tree | 12991ad6ce89e9b127d82957de63b2d0b1ab03ea | |
| parent | ebcb60d5ef48347082bb4107865f6664a91b9487 (diff) | |
| download | eclipse.platform.team-eba4e921ee3d1737845ae8152dd0a1f8770d6287.tar.gz eclipse.platform.team-eba4e921ee3d1737845ae8152dd0a1f8770d6287.tar.xz eclipse.platform.team-eba4e921ee3d1737845ae8152dd0a1f8770d6287.zip | |
Bug 306522 - [Backport] Compare files claims that identical lines are different
2 files changed, 5 insertions, 5 deletions
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties index 4557c288e..682086bd3 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties @@ -143,8 +143,8 @@ CompareWithOtherResourceDialog_workspaceRadioButton=&Workspace CompareContentViewerSwitchingPane_defaultViewer=Default Compare CompareContentViewerSwitchingPane_switchButtonTooltip=Switch Compare Viewer CompareContentViewerSwitchingPane_discoveredLabel={0} Compare -CompareContentViewerSwitchingPane_optimized=Optimized algorithm used -CompareContentViewerSwitchingPane_optimizedTooltip=To avoid long computation time an optimized comparison algorithm has been used. As a result a non-optimal matching could be found. +CompareContentViewerSwitchingPane_optimized=Matching might not be optimal +CompareContentViewerSwitchingPane_optimizedTooltip=To avoid long computation time a faster comparison algorithm has been used. As a result, the matching might not be optimal. CompareStructureViewerSwitchingPane_defaultViewer=Default Structure Compare CompareStructureViewerSwitchingPane_switchButtonTooltip=Switch Structure Compare Viewer CompareStructureViewerSwitchingPane_discoveredLabel={0} Structure Compare diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java index 40f6d8302..1dc8bb847 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java @@ -535,9 +535,9 @@ public class DocumentMerger { int aLength = ancestor == null? 0 : ancestor.getRangeCount(); int lLength = left.getRangeCount(); int rLength = right.getRangeCount(); - if (aLength * lLength > LCS.TOO_LONG - || aLength * rLength > LCS.TOO_LONG - || lLength * lLength > LCS.TOO_LONG) + if ((double) aLength * (double) lLength > LCS.TOO_LONG + || (double) aLength * (double) rLength > LCS.TOO_LONG + || (double) lLength * (double) rLength > LCS.TOO_LONG) return true; return false; } |