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 221583 | Differences between
and this patch

Collapse All | Expand All

(-)compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java (-7 / +8 lines)
Lines 1-5 Link Here
1 
/*******************************************************************************
 1 
/*******************************************************************************
2 
 * Copyright (c) 2000, 2008 IBM Corporation and others.
 2 
 * Copyright (c) 2000, 2009 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 737-749 Link Here
737 
			updateContent(ancestor, left, right);
 737 
			updateContent(ancestor, left, right);
738
738
739 
			updateHeader();
 739 
			updateHeader();
740 
			ToolBarManager tbm = (ToolBarManager) getToolBarManager(fComposite.getParent());
 740 
			if (Utilities.okToUse(fComposite) && Utilities.okToUse(fComposite.getParent())) {
741 
			if (tbm != null ) {
 741 
				ToolBarManager tbm = (ToolBarManager) getToolBarManager(fComposite.getParent());
742 
				updateToolItems();
 742 
				if (tbm != null ) {
743 
				tbm.update(true);
 743 
					updateToolItems();
744 
				tbm.getControl().getParent().layout(true);
 744 
					tbm.update(true);
745 
					tbm.getControl().getParent().layout(true);
746 
				}
745 
			}
 747 
			}
746
747 
		}
 748 
		}
748 
	}
 749 
	}
749
750

Return to bug 221583