|
Lines 11-27
Link Here
|
| 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 446-452
Link Here
|
| 446 |
fAllDiffs.add(diff); |
464 |
fAllDiffs.add(diff); |
| 447 |
throw new CoreException(new Status(IStatus.ERROR, CompareUIPlugin.PLUGIN_ID, 0, CompareMessages.DocumentMerger_1, ex.getTargetException())); |
465 |
throw new CoreException(new Status(IStatus.ERROR, CompareUIPlugin.PLUGIN_ID, 0, CompareMessages.DocumentMerger_1, ex.getTargetException())); |
| 448 |
} catch (InterruptedException ex) { |
466 |
} catch (InterruptedException ex) { |
| 449 |
// |
467 |
// we create a NOCHANGE range for the whole document |
|
|
468 |
Diff diff= new Diff(null, RangeDifference.NOCHANGE, |
| 469 |
aDoc, aRegion, 0, aDoc != null ? aDoc.getLength() : 0, |
| 470 |
lDoc, lRegion, 0, lDoc.getLength(), |
| 471 |
rDoc, rRegion, 0, rDoc.getLength()); |
| 472 |
|
| 473 |
fAllDiffs = new ArrayList(); |
| 474 |
fAllDiffs.add(diff); |
| 475 |
return; |
| 450 |
} |
476 |
} |
| 451 |
|
477 |
|
| 452 |
if (isCapped(sa, sl, sr)) |
478 |
if (isCapped(sa, sl, sr)) |
