Attachment 192413 Details for Bug 336080 – Possible fix

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

[patch] Possible fix

patch.txt (text/plain), 9.30 KB, created by Dani Megert

on 2011-04-02 03:05:12 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dani Megert

Created: 2011-04-02 03:05:12 EDT

Size: 9.30 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.ds.ui
>Index: src/org/eclipse/pde/internal/ds/ui/editor/sections/DSComponentSection.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSComponentSection.java,v
>retrieving revision 1.6
>diff -u -r1.6 DSComponentSection.java
>--- src/org/eclipse/pde/internal/ds/ui/editor/sections/DSComponentSection.java	20 Apr 2009 12:02:08 -0000	1.6
>+++ src/org/eclipse/pde/internal/ds/ui/editor/sections/DSComponentSection.java	2 Apr 2011 07:01:49 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008, 2009 Code 9 Corporation and others.
>+ * Copyright (c) 2008, 2011 Code 9 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
>@@ -14,15 +14,6 @@
>  *******************************************************************************/
> package org.eclipse.pde.internal.ds.ui.editor.sections;
> 
>-import org.eclipse.core.resources.IProject;
>-import org.eclipse.core.runtime.CoreException;
>-import org.eclipse.jdt.core.IJavaElement;
>-import org.eclipse.jdt.core.IJavaProject;
>-import org.eclipse.jdt.core.JavaCore;
>-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
>-import org.eclipse.jdt.ui.JavaUI;
>-import org.eclipse.jface.window.Window;
>-import org.eclipse.jface.wizard.WizardDialog;
> import org.eclipse.pde.core.IModelChangedEvent;
> import org.eclipse.pde.internal.ds.core.IDSComponent;
> import org.eclipse.pde.internal.ds.core.IDSImplementation;
>@@ -37,17 +28,33 @@
> import org.eclipse.pde.internal.ui.editor.PDEFormPage;
> import org.eclipse.pde.internal.ui.editor.PDESection;
> import org.eclipse.pde.internal.ui.util.PDEJavaHelperUI;
>+
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.layout.GridLayout;
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Display;
>+
>+import org.eclipse.core.runtime.CoreException;
>+
>+import org.eclipse.core.resources.IProject;
>+
>+import org.eclipse.jface.window.Window;
>+import org.eclipse.jface.wizard.WizardDialog;
>+
> import org.eclipse.ui.IActionBars;
> import org.eclipse.ui.PartInitException;
> import org.eclipse.ui.forms.events.HyperlinkEvent;
> import org.eclipse.ui.forms.widgets.FormToolkit;
> import org.eclipse.ui.forms.widgets.Section;
> 
>+import org.eclipse.jdt.core.IJavaElement;
>+import org.eclipse.jdt.core.IJavaProject;
>+import org.eclipse.jdt.core.JavaCore;
>+
>+import org.eclipse.jdt.ui.IJavaElementSearchConstants;
>+import org.eclipse.jdt.ui.JavaUI;
>+
> public class DSComponentSection extends PDESection {
> 
> 	private IDSComponent fComponent;
>@@ -143,13 +150,17 @@
> 		}
> 
> 		if (fNameEntry != null) {
>-			Display.getDefault().syncExec(new Runnable() {
>-				public void run() {
>-					updateUIFields();
>-				}
>-			});
>+			Display display= fNameEntry.getText().getDisplay();
>+			if (display.getThread() == Thread.currentThread())
>+				updateUIFields();
>+			else
>+				display.asyncExec(new Runnable() {
>+					public void run() {
>+						if (!fNameEntry.getText().isDisposed())
>+							updateUIFields();
>+					}
>+				});
> 		}
>-
> 	}
> 
> 	public void updateUIFields() {
>Index: src/org/eclipse/pde/internal/ds/ui/editor/sections/DSOptionsSection.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSOptionsSection.java,v
>retrieving revision 1.5
>diff -u -r1.5 DSOptionsSection.java
>--- src/org/eclipse/pde/internal/ds/ui/editor/sections/DSOptionsSection.java	1 Apr 2009 21:04:50 -0000	1.5
>+++ src/org/eclipse/pde/internal/ds/ui/editor/sections/DSOptionsSection.java	2 Apr 2011 07:01:49 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008, 2009 Code 9 Corporation and others.
>+ * Copyright (c) 2008, 2011 Code 9 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
>@@ -11,7 +11,6 @@
>  *******************************************************************************/
> package org.eclipse.pde.internal.ds.ui.editor.sections;
> 
>-import org.eclipse.jface.layout.GridDataFactory;
> import org.eclipse.pde.core.IModelChangedEvent;
> import org.eclipse.pde.internal.ds.core.IDSComponent;
> import org.eclipse.pde.internal.ds.core.IDSConstants;
>@@ -24,6 +23,7 @@
> import org.eclipse.pde.internal.ds.ui.parts.FormEntry;
> import org.eclipse.pde.internal.ui.editor.PDEFormPage;
> import org.eclipse.pde.internal.ui.editor.PDESection;
>+
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.ModifyEvent;
> import org.eclipse.swt.events.ModifyListener;
>@@ -35,6 +35,9 @@
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Display;
> import org.eclipse.swt.widgets.Label;
>+
>+import org.eclipse.jface.layout.GridDataFactory;
>+
> import org.eclipse.ui.forms.IFormColors;
> import org.eclipse.ui.forms.widgets.FormToolkit;
> import org.eclipse.ui.forms.widgets.Section;
>@@ -146,11 +149,16 @@
> 			markStale();
> 		}
> 
>-		Display.getDefault().syncExec(new Runnable() {
>-			public void run() {
>-				updateUIFields();
>-			}
>-		});
>+		Display display= fEnabledButton.getDisplay();
>+		if (display.getThread() == Thread.currentThread())
>+			updateUIFields();
>+		else
>+			display.asyncExec(new Runnable() {
>+				public void run() {
>+					if (!fEnabledButton.isDisposed())
>+						updateUIFields();
>+				}
>+			});
> 	}
> 
> 	public void updateUIFields() {
>Index: src/org/eclipse/pde/internal/ds/ui/editor/sections/DSPropertiesSection.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ds/org.eclipse.pde.ds.ui/src/org/eclipse/pde/internal/ds/ui/editor/sections/DSPropertiesSection.java,v
>retrieving revision 1.3
>diff -u -r1.3 DSPropertiesSection.java
>--- src/org/eclipse/pde/internal/ds/ui/editor/sections/DSPropertiesSection.java	1 Apr 2009 21:49:28 -0000	1.3
>+++ src/org/eclipse/pde/internal/ds/ui/editor/sections/DSPropertiesSection.java	2 Apr 2011 07:01:49 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008, 2009 Code 9 Corporation and others.
>+ * Copyright (c) 2008, 2011 Code 9 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
>@@ -14,21 +14,6 @@
> 
> import java.util.Iterator;
> 
>-import org.eclipse.core.resources.IContainer;
>-import org.eclipse.core.resources.IFile;
>-import org.eclipse.core.resources.IProject;
>-import org.eclipse.core.resources.IResource;
>-import org.eclipse.core.runtime.IPath;
>-import org.eclipse.core.runtime.IStatus;
>-import org.eclipse.core.runtime.Status;
>-import org.eclipse.jface.action.Action;
>-import org.eclipse.jface.viewers.ISelection;
>-import org.eclipse.jface.viewers.IStructuredSelection;
>-import org.eclipse.jface.viewers.StructuredSelection;
>-import org.eclipse.jface.viewers.TableViewer;
>-import org.eclipse.jface.viewers.Viewer;
>-import org.eclipse.jface.viewers.ViewerFilter;
>-import org.eclipse.jface.window.Window;
> import org.eclipse.osgi.util.NLS;
> import org.eclipse.pde.core.IModelChangedEvent;
> import org.eclipse.pde.internal.core.text.IDocumentElementNode;
>@@ -50,11 +35,30 @@
> import org.eclipse.pde.internal.ui.elements.DefaultTableProvider;
> import org.eclipse.pde.internal.ui.parts.EditableTablePart;
> import org.eclipse.pde.internal.ui.parts.TablePart;
>+
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.widgets.Composite;
>-import org.eclipse.swt.widgets.Display;
> import org.eclipse.swt.widgets.Table;
>+
>+import org.eclipse.core.runtime.IPath;
>+import org.eclipse.core.runtime.IStatus;
>+import org.eclipse.core.runtime.Status;
>+
>+import org.eclipse.core.resources.IContainer;
>+import org.eclipse.core.resources.IFile;
>+import org.eclipse.core.resources.IProject;
>+import org.eclipse.core.resources.IResource;
>+
>+import org.eclipse.jface.action.Action;
>+import org.eclipse.jface.viewers.ISelection;
>+import org.eclipse.jface.viewers.IStructuredSelection;
>+import org.eclipse.jface.viewers.StructuredSelection;
>+import org.eclipse.jface.viewers.TableViewer;
>+import org.eclipse.jface.viewers.Viewer;
>+import org.eclipse.jface.viewers.ViewerFilter;
>+import org.eclipse.jface.window.Window;
>+
> import org.eclipse.ui.actions.ActionFactory;
> import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
> import org.eclipse.ui.dialogs.ISelectionStatusValidator;
>@@ -451,9 +455,10 @@
> 			fPropertiesTable.refresh();
> 			updateButtons();
> 		}
>-		Display.getDefault().asyncExec(new Runnable() {
>+		fPropertiesTable.getTable().getDisplay().asyncExec(new Runnable() {
> 			public void run() {
>-				updateTitle();
>+				if (!fPropertiesTable.getTable().isDisposed())
>+					updateTitle();
> 			}
> 		});
> 	}

Actions: View | Diff

Attachments on bug 336080: 192366 | 192413