Attachment 164560 Details for Bug 292831 – Patch_v02

[patch] Patch_v02

292831_v02.txt (text/plain), 2.44 KB, created by Pawel Pogorzelski

on 2010-04-12 10:14:34 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Pawel Pogorzelski

Created: 2010-04-12 10:14:34 EDT

Size: 2.44 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.compare
>Index: compare/org/eclipse/compare/internal/CompareMessages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties,v
>retrieving revision 1.40
>diff -u -r1.40 CompareMessages.properties
>--- compare/org/eclipse/compare/internal/CompareMessages.properties	27 Mar 2010 09:55:33 -0000	1.40
>+++ compare/org/eclipse/compare/internal/CompareMessages.properties	12 Apr 2010 12:53:22 -0000
>@@ -135,7 +135,7 @@
> 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_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
>Index: compare/org/eclipse/compare/internal/merge/DocumentMerger.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java,v
>retrieving revision 1.10
>diff -u -r1.10 DocumentMerger.java
>--- compare/org/eclipse/compare/internal/merge/DocumentMerger.java	8 Apr 2010 11:48:14 -0000	1.10
>+++ compare/org/eclipse/compare/internal/merge/DocumentMerger.java	12 Apr 2010 12:53:22 -0000
>@@ -535,9 +535,9 @@
> 		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) lLength > LCS.TOO_LONG)
> 			return true;
> 		return false;
> 	}

Actions: View | Diff

Attachments on bug 292831: 150037 | 150038 | 163000 | 163140 | 163141 | 164560 | 164569 | 168160