Attachment #176766 for bug #307280





import org.eclipse.compare.CompareConfiguration;
import org.eclipse.compare.CompareEditorInput;
import org.eclipse.compare.CompareUI;
import org.eclipse.compare.CompareViewerSwitchingPane;
import org.eclipse.compare.Splitter;
import org.eclipse.compare.internal.core.LCS;
import org.eclipse.compare.structuremergeviewer.ICompareInput;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.osgi.util.NLS;

import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.RowLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.MenuItem;
import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.swt.widgets.ToolItem;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IReusableEditor;
import org.eclipse.ui.PlatformUI;

public class CompareContentViewerSwitchingPane extends

	private ViewerDescriptor fSelectedViewerDescriptor;

	private ToolBar toolBar;
	private Button clOptimized;

	private boolean menuShowing;


			}
		});

		clOptimized = new Button(composite, SWT.NONE);
		clOptimized
				.setText(CompareMessages.CompareContentViewerSwitchingPane_optimized);
		clOptimized

				}
			}
		});
		clOptimized.addSelectionListener(new SelectionListener() {
			public void widgetSelected(SelectionEvent e) {
				LCS.cap = false;
				IEditorPart activeEditor = fCompareEditorInput.getCompareConfiguration().getContainer().getWorkbenchPart().getSite().getPage().getActiveEditor();
				if (activeEditor instanceof IReusableEditor) {
					IReusableEditor reusableEditor = (IReusableEditor) activeEditor;
					CompareUI.reuseCompareEditor(fCompareEditorInput, reusableEditor);
				}
				LCS.cap = true;
			}
			
			public void widgetDefaultSelected(SelectionEvent e) {
			}
		});

		return composite;
	}

Lines 11-27 Link Here

(-)compare/org/eclipse/compare/internal/merge/DocumentMerger.java (-5 / +25 lines)
11	package org.eclipse.compare.internal.merge;	11	package org.eclipse.compare.internal.merge;
12		12
13	import java.lang.reflect.InvocationTargetException;	13	import java.lang.reflect.InvocationTargetException;
14	import java.util.*;	14	import java.util.ArrayList;
		15	import java.util.Iterator;
		16	import java.util.List;
15		17
16	import org.eclipse.compare.CompareConfiguration;	18	import org.eclipse.compare.CompareConfiguration;
17	import org.eclipse.compare.contentmergeviewer.ITokenComparator;	19	import org.eclipse.compare.contentmergeviewer.ITokenComparator;
18	import org.eclipse.compare.internal.*;	20	import org.eclipse.compare.internal.CompareContentViewerSwitchingPane;
		21	import org.eclipse.compare.internal.CompareMessages;
		22	import org.eclipse.compare.internal.CompareUIPlugin;
		23	import org.eclipse.compare.internal.DocLineComparator;
		24	import org.eclipse.compare.internal.MergeViewerContentProvider;
		25	import org.eclipse.compare.internal.Utilities;
19	import org.eclipse.compare.internal.core.LCS;	26	import org.eclipse.compare.internal.core.LCS;
20	import org.eclipse.compare.rangedifferencer.*;	27	import org.eclipse.compare.rangedifferencer.IRangeComparator;
		28	import org.eclipse.compare.rangedifferencer.RangeDifference;
		29	import org.eclipse.compare.rangedifferencer.RangeDifferencer;
21	import org.eclipse.compare.structuremergeviewer.Differencer;	30	import org.eclipse.compare.structuremergeviewer.Differencer;
22	import org.eclipse.core.runtime.*;	31	import org.eclipse.core.runtime.CoreException;
		32	import org.eclipse.core.runtime.IProgressMonitor;
		33	import org.eclipse.core.runtime.IStatus;
		34	import org.eclipse.core.runtime.Status;
23	import org.eclipse.jface.operation.IRunnableWithProgress;	35	import org.eclipse.jface.operation.IRunnableWithProgress;
24	import org.eclipse.jface.text.*;	36	import org.eclipse.jface.text.BadLocationException;
		37	import org.eclipse.jface.text.BadPositionCategoryException;
		38	import org.eclipse.jface.text.IDocument;
		39	import org.eclipse.jface.text.IRegion;
		40	import org.eclipse.jface.text.Position;
		41	import org.eclipse.jface.text.Region;
		42	import org.eclipse.jface.text.TextUtilities;
25	import org.eclipse.swt.graphics.Image;	43	import org.eclipse.swt.graphics.Image;
26	import org.eclipse.swt.graphics.Point;	44	import org.eclipse.swt.graphics.Point;
27	import org.eclipse.ui.PlatformUI;	45	import org.eclipse.ui.PlatformUI;
Lines 532-537 Link Here
532		550
533	private boolean isCapped(DocLineComparator ancestor,	551	private boolean isCapped(DocLineComparator ancestor,
534	DocLineComparator left, DocLineComparator right) {	552	DocLineComparator left, DocLineComparator right) {
		553	if (!LCS.cap)
		554	return false;
535	int aLength = ancestor == null? 0 : ancestor.getRangeCount();	555	int aLength = ancestor == null? 0 : ancestor.getRangeCount();
536	int lLength = left.getRangeCount();	556	int lLength = left.getRangeCount();
537	int rLength = right.getRangeCount();	557	int rLength = right.getRangeCount();

Lines 28-33 Link Here

(-)src/org/eclipse/compare/internal/core/LCS.java (-1 / +3 lines)
28		28
29	private int length;	29	private int length;
30		30
		31	public static boolean cap = true;
		32
31	/**	33	/**
32	* Myers' algorithm for longest common subsequence. O((M + N)D) worst case	34	* Myers' algorithm for longest common subsequence. O((M + N)D) worst case
33	* time, O(M + N + D^2) expected time, O(M + N) space	35	* time, O(M + N + D^2) expected time, O(M + N) space
Lines 52-58 Link Here
52	}	54	}
53		55
54	this.max_differences = (length1 + length2 + 1) / 2; // ceil((N+M)/2)	56	this.max_differences = (length1 + length2 + 1) / 2; // ceil((N+M)/2)
55	if ((double) length1 * (double) length2 > TOO_LONG) {	57	if (cap && (double) length1 * (double) length2 > TOO_LONG) {
56	// limit complexity to D^POW_LIMIT for long sequences	58	// limit complexity to D^POW_LIMIT for long sequences
57	this.max_differences = (int) Math.pow(this.max_differences, POW_LIMIT - 1.0);	59	this.max_differences = (int) Math.pow(this.max_differences, POW_LIMIT - 1.0);
58	}	60	}

Return to bug 307280