Bug 169953 [Edit] Compare editor does not take focus

1 files changed, 12 insertions, 5 deletions

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
index 537f65609..6e0a8e1b7 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
@@ -499,7 +499,8 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang
 		final Splitter h= new Splitter(parent, direction);
 
 		fStructureInputPane= createStructureInputPane(h);
-		fFocusPane= fStructureInputPane;
+		if (hasChildren(getCompareResult()))
+			fFocusPane= fStructureInputPane;
 		
 		fStructurePane1= new CompareViewerSwitchingPane(h, SWT.BORDER | SWT.FLAT, true) {
 			protected Viewer getViewer(Viewer oldViewer, Object input) {
@@ -581,10 +582,8 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang
 			final Composite parent) {
 		return new CompareViewerSwitchingPane(parent, SWT.BORDER | SWT.FLAT, true) {
 			protected Viewer getViewer(Viewer oldViewer, Object input) {
-				if (input instanceof IDiffContainer) {
-					IDiffContainer dn= (IDiffContainer) input;
-					if (dn.hasChildren())
-						return createDiffViewer(this);
+				if (CompareEditorInput.this.hasChildren(input)) {
+					return createDiffViewer(this);
 				}
 				if (input instanceof ICompareInput)
 					return findStructureViewer(oldViewer, (ICompareInput)input, this);
@@ -592,6 +591,14 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang
 			}
 		};
 	}
+	
+	/* private */ boolean hasChildren(Object input) {
+		if (input instanceof IDiffContainer) {
+			IDiffContainer dn= (IDiffContainer) input;
+			return (dn.hasChildren());
+		}
+		return false;
+	}
 
 	private void feedInput() {
 		if (fStructureInputPane != null