Attachment 127149 Details for Bug 221583 – Fix #2

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix #2

clipboard.txt (text/plain), 1.65 KB, created by Tomasz Zarna

on 2009-03-02 06:11:42 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Zarna

Created: 2009-03-02 06:11:42 EST

Size: 1.65 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.compare
>Index: compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java,v
>retrieving revision 1.75
>diff -u -r1.75 ContentMergeViewer.java
>--- compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java	20 Jan 2009 10:56:12 -0000	1.75
>+++ compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java	2 Mar 2009 11:04:05 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2008 IBM Corporation and others.
>+ * Copyright (c) 2000, 2009 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -737,13 +737,14 @@
> 			updateContent(ancestor, left, right);
> 			
> 			updateHeader();
>-			ToolBarManager tbm = (ToolBarManager) getToolBarManager(fComposite.getParent());
>-			if (tbm != null ) {
>-				updateToolItems();
>-				tbm.update(true);
>-				tbm.getControl().getParent().layout(true);
>+			if (Utilities.okToUse(fComposite) && Utilities.okToUse(fComposite.getParent())) {
>+				ToolBarManager tbm = (ToolBarManager) getToolBarManager(fComposite.getParent());
>+				if (tbm != null ) {
>+					updateToolItems();
>+					tbm.update(true);
>+					tbm.getControl().getParent().layout(true);
>+				}
> 			}
>-			
> 		}
> 	}
>

Actions: View | Diff

Attachments on bug 221583: 91737 | 91738 | 127149