Attachment #159919 for bug #273951

Lines 775-785 Link Here

(-)compare/org/eclipse/compare/CompareEditorInput.java (+4 lines)
775	Object input= fStructureInputPane.getInput();	775	Object input= fStructureInputPane.getInput();
776	if (input != null)	776	if (input != null)
777	internalSetContentPaneInput(input);	777	internalSetContentPaneInput(input);
		778	if (!Utilities.okToUse(fStructurePane1) \|\| !Utilities.okToUse(fStructurePane2))
		779	return;
778	fStructurePane2.setInput(null); // clear downstream pane	780	fStructurePane2.setInput(null); // clear downstream pane
779	fStructurePane1.setInput(null);	781	fStructurePane1.setInput(null);
780	} else {	782	} else {
781	Object input= getElement(selection);	783	Object input= getElement(selection);
782	internalSetContentPaneInput(input);	784	internalSetContentPaneInput(input);
		785	if (!Utilities.okToUse(fStructurePane1) \|\| !Utilities.okToUse(fStructurePane2))
		786	return;
783	if (structureCompareOnSingleClick() \|\| hasUnusableContentViewer())	787	if (structureCompareOnSingleClick() \|\| hasUnusableContentViewer())
784	fStructurePane1.setInput(input);	788	fStructurePane1.setInput(input);
785	fStructurePane2.setInput(null); // clear downstream pane	789	fStructurePane2.setInput(null); // clear downstream pane

Lines 1-5 Link Here

(-)compare/org/eclipse/compare/CompareViewerSwitchingPane.java (-4 / +13 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 11-23 Link Here
11	package org.eclipse.compare;	11	package org.eclipse.compare;
12		12
13	import org.eclipse.compare.contentmergeviewer.IFlushable;	13	import org.eclipse.compare.contentmergeviewer.IFlushable;
14	import org.eclipse.compare.internal.*;	14	import org.eclipse.compare.internal.CompareMessages;
		15	import org.eclipse.compare.internal.NullViewer;
		16	import org.eclipse.compare.internal.Utilities;
15	import org.eclipse.compare.structuremergeviewer.ICompareInput;	17	import org.eclipse.compare.structuremergeviewer.ICompareInput;
16	import org.eclipse.jface.viewers.*;	18	import org.eclipse.jface.viewers.ISelection;
		19	import org.eclipse.jface.viewers.StructuredViewer;
		20	import org.eclipse.jface.viewers.Viewer;
17	import org.eclipse.swt.events.DisposeEvent;	21	import org.eclipse.swt.events.DisposeEvent;
18	import org.eclipse.swt.events.DisposeListener;	22	import org.eclipse.swt.events.DisposeListener;
19	import org.eclipse.swt.graphics.Image;	23	import org.eclipse.swt.graphics.Image;
20	import org.eclipse.swt.widgets.*;	24	import org.eclipse.swt.widgets.Composite;
		25	import org.eclipse.swt.widgets.Control;
		26	import org.eclipse.swt.widgets.Display;
21		27
22	import com.ibm.icu.text.MessageFormat;	28	import com.ibm.icu.text.MessageFormat;
23		29
Lines 269-274 Link Here
269	// set input	275	// set input
270	fViewer.setInput(input);	276	fViewer.setInput(input);
271		277
		278	if (getViewer() == null \|\| !Utilities.okToUse(getViewer().getControl()))
		279	return;
		280
272	Image image= null;	281	Image image= null;
273	if (!(fViewer instanceof NullViewer) && input instanceof ICompareInput)	282	if (!(fViewer instanceof NullViewer) && input instanceof ICompareInput)
274	image= ((ICompareInput)input).getImage();	283	image= ((ICompareInput)input).getImage();

Lines 1-5 Link Here

(-)compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java (-1 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2009 IBM Corporation and others.	2	* Copyright (c) 2009, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 130-135 Link Here
130		130
131	public void setInput(Object input) {	131	public void setInput(Object input) {
132	super.setInput(input);	132	super.setInput(input);
		133	if (getViewer() == null \|\| !Utilities.okToUse(getViewer().getControl()))
		134	return;
133	ViewerDescriptor[] vd = CompareUIPlugin.getDefault()	135	ViewerDescriptor[] vd = CompareUIPlugin.getDefault()
134	.findContentViewerDescriptor(getViewer(), getInput(),	136	.findContentViewerDescriptor(getViewer(), getInput(),
135	getCompareConfiguration());	137	getCompareConfiguration());




import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.GridData;

				setState(CREATING_CONTROL);
				if (getSite().getSelectionProvider() == null)
					getSite().setSelectionProvider(new CompareEditorSelectionProvider());
				try {
					fControl = ci.createContents(fPageBook);
				} catch (SWTException e) {
					// closed while creating
					if (e.code == SWT.ERROR_WIDGET_DISPOSED) {
						setState(CANCELED);
						return;
					}
				}
				fPageBook.showPage(fControl);
				PlatformUI.getWorkbench().getHelpSystem().setHelp(fControl, ICompareContextIds.COMPARE_EDITOR);
				if (isActive()) {

Lines 1-5 Link Here

(-)compare/org/eclipse/compare/internal/CompareStructureViewerSwitchingPane.java (-1 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2009 IBM Corporation and others.	2	* Copyright (c) 2009, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 130-135 Link Here
130		130
131	public void setInput(Object input) {	131	public void setInput(Object input) {
132	super.setInput(input);	132	super.setInput(input);
		133	if (getViewer() == null \|\| !Utilities.okToUse(getViewer().getControl()))
		134	return;
133	ViewerDescriptor[] vd = null;	135	ViewerDescriptor[] vd = null;
134	if (getInput() instanceof ICompareInput) {	136	if (getInput() instanceof ICompareInput) {
135	vd = CompareUIPlugin.getDefault().findStructureViewerDescriptor(	137	vd = CompareUIPlugin.getDefault().findStructureViewerDescriptor(

Return to bug 273951