Bug 2292 - [JFace Text] Error attempting to merge conflicts (1GEM0CT)
Summary: [JFace Text] Error attempting to merge conflicts (1GEM0CT)
Status: RESOLVED FIXED
Alias: None
Product: Platform
Classification: Eclipse Project
Component: UI (show other bugs)
Version: 2.0   Edit
Hardware: All Windows NT
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Kai-Uwe Maetzel CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2001-10-10 22:33 EDT by Darin Swanson CLA
Modified: 2002-02-05 13:21 EST (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Darin Swanson CLA 2001-10-10 22:33:25 EDT
DS (5/31/01 4:24:34 PM)
	I was attempting to bring in a change from the stream, into a Java file
	that had conflicting changes with the stream.  I was using the "Copy current change from 
	right to left button"

java.lang.IllegalArgumentException: Argument not valid
	at org.eclipse.swt.SWT.error(SWT.java:1795)
	at org.eclipse.swt.SWT.error(SWT.java:1741)
	at org.eclipse.jface.text.DocumentAdapter.getLine(DocumentAdapter.java(Compiled Code))
	at org.eclipse.swt.custom.StyledText.calculateContentWidth(StyledText.java(Compiled Code))
	at org.eclipse.swt.custom.StyledText.handleTextChanged(StyledText.java:3502)
	at org.eclipse.swt.custom.StyledText$5.textChanged(StyledText.java:3180)
	at org.eclipse.jface.text.DocumentAdapter.fireTextChanged(DocumentAdapter.java:276)
	at org.eclipse.jface.text.DocumentAdapter.documentChanged(DocumentAdapter.java:255)
	at org.eclipse.jface.text.AbstractDocument.fireDocumentChanged(AbstractDocument.java:471)
	at org.eclipse.jface.text.AbstractDocument.replace(AbstractDocument.java:757)
	at org.eclipse.compare.contentmergeviewer.TextMergeViewer.copy(TextMergeViewer.java:2152)
	at org.eclipse.compare.contentmergeviewer.TextMergeViewer.copyDiffRightToLeft(TextMergeViewer.java:2094)
	at org.eclipse.compare.contentmergeviewer.TextMergeViewer.access$19(TextMergeViewer.java:2093)
	at org.eclipse.compare.contentmergeviewer.TextMergeViewer$16.run(TextMergeViewer.java:1467)
	at org.eclipse.jface.action.ActionContributionItem.handleWidgetSelection(ActionContributionItem.java:408)
	at org.eclipse.jface.action.ActionContributionItem.handleWidgetEvent(ActionContributionItem.java(Compiled Code))
	at org.eclipse.jface.action.ActionContributionItem$ActionListener.handleEvent(ActionContributionItem.java(Compiled Code))
	at org.eclipse.jface.action.ActionContributionItem$ActionListener.handleEvent(ActionContributionItem.java(Compiled Code))
	at org.eclipse.swt.widgets.Widget.notifyListeners(Widget.java(Compiled Code))
	at org.eclipse.swt.widgets.Widget.notifyListeners(Widget.java(Compiled Code))
	at org.eclipse.swt.widgets.Display.runDeferredEvents(Display.java(Compiled Code))
	at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java(Compiled Code))
	at org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.java(Compiled Code))
	at org.eclipse.ui.internal.Workbench.run(Workbench.java:602)
	at org.eclipse.core.internal.boot.InternalBootLoader.run(InternalBootLoader.java:820)
	at org.eclipse.core.boot.BootLoader.run(BootLoader.java:285)
	at java.lang.reflect.Method.invoke(Native Method)
	at org.eclipse.core.launcher.Main.basicRun(Main.java:70)
	at org.eclipse.core.launcher.Main.run(Main.java:363)
	at org.eclipse.core.launcher.Main.main(Main.java:240)

NOTES:

KM (5/31/01 6:05:43 PM)
	Moving to UI
Comment 1 DJ Houghton CLA 2001-10-29 18:05:37 EST
PRODUCT VERSION:
115

Comment 2 Kai-Uwe Maetzel CLA 2002-02-05 13:21:56 EST
Haven't seen since then. Closed.