Attachment 133762 Details for Bug 273951 – Possible fix

[patch] Possible fix

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

on 2009-04-29 09:43:59 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Zarna

Created: 2009-04-29 09:43:59 EDT

Size: 1.74 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.compare
>Index: compare/org/eclipse/compare/CompareViewerSwitchingPane.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java,v
>retrieving revision 1.34
>diff -u -r1.34 CompareViewerSwitchingPane.java
>--- compare/org/eclipse/compare/CompareViewerSwitchingPane.java	17 Mar 2009 12:08:26 -0000	1.34
>+++ compare/org/eclipse/compare/CompareViewerSwitchingPane.java	29 Apr 2009 13:44:28 -0000
>@@ -11,13 +11,19 @@
> package org.eclipse.compare;
> 
> import org.eclipse.compare.contentmergeviewer.IFlushable;
>-import org.eclipse.compare.internal.*;
>+import org.eclipse.compare.internal.CompareMessages;
>+import org.eclipse.compare.internal.NullViewer;
>+import org.eclipse.compare.internal.Utilities;
> import org.eclipse.compare.structuremergeviewer.ICompareInput;
>-import org.eclipse.jface.viewers.*;
>+import org.eclipse.jface.viewers.ISelection;
>+import org.eclipse.jface.viewers.StructuredViewer;
>+import org.eclipse.jface.viewers.Viewer;
> import org.eclipse.swt.events.DisposeEvent;
> import org.eclipse.swt.events.DisposeListener;
> import org.eclipse.swt.graphics.Image;
>-import org.eclipse.swt.widgets.*;
>+import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.swt.widgets.Control;
>+import org.eclipse.swt.widgets.Display;
> 
> import com.ibm.icu.text.MessageFormat;
> 
>@@ -269,6 +275,9 @@
> 		// set input
> 		fViewer.setInput(input);
> 
>+		if (!Utilities.okToUse(fViewer.getControl()))
>+			return;
>+
> 		Image image= null;
> 		if (!(fViewer instanceof NullViewer) && input instanceof ICompareInput)
> 			image= ((ICompareInput)input).getImage();

Actions: View | Diff

Attachments on bug 273951: 133762 | 133763 | 133784 | 135519 | 159919