Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 320951 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/jface/viewers/ContentViewer.java (+5 lines)
Lines 15-20 Link Here
15
import org.eclipse.core.runtime.Status;
15
import org.eclipse.core.runtime.Status;
16
import org.eclipse.jface.internal.InternalPolicy;
16
import org.eclipse.jface.internal.InternalPolicy;
17
import org.eclipse.jface.util.Policy;
17
import org.eclipse.jface.util.Policy;
18
import org.eclipse.swt.SWT;
18
import org.eclipse.swt.events.DisposeEvent;
19
import org.eclipse.swt.events.DisposeEvent;
19
import org.eclipse.swt.events.DisposeListener;
20
import org.eclipse.swt.events.DisposeListener;
20
import org.eclipse.swt.widgets.Control;
21
import org.eclipse.swt.widgets.Control;
Lines 262-267 Link Here
262
     * if required.
263
     * if required.
263
     */
264
     */
264
    public void setInput(Object input) {
265
    public void setInput(Object input) {
266
    	Control control = getControl();
267
		if (control == null || control.isDisposed()) {
268
			SWT.error(SWT.ERROR_WIDGET_DISPOSED);
269
		}
265
        Assert
270
        Assert
266
                .isTrue(getContentProvider() != null,
271
                .isTrue(getContentProvider() != null,
267
                        "ContentViewer must have a content provider when input is set."); //$NON-NLS-1$
272
                        "ContentViewer must have a content provider when input is set."); //$NON-NLS-1$
(-)src/org/eclipse/jface/viewers/StructuredViewer.java (-1 / +4 lines)
Lines 1655-1661 Link Here
1655
	 * @see org.eclipse.jface.viewers.Viewer#setInput(java.lang.Object)
1655
	 * @see org.eclipse.jface.viewers.Viewer#setInput(java.lang.Object)
1656
	 */
1656
	 */
1657
	public final void setInput(Object input) {
1657
	public final void setInput(Object input) {
1658
1658
		Control control = getControl();
1659
		if (control == null || control.isDisposed()) {
1660
			SWT.error(SWT.ERROR_WIDGET_DISPOSED);
1661
		}
1659
		try {
1662
		try {
1660
			//		fInChange= true;
1663
			//		fInChange= true;
1661
1664

Return to bug 320951