diff options
| author | Daniel Rolka | 2014-08-19 12:45:42 +0000 |
|---|---|---|
| committer | Daniel Rolka | 2014-08-19 12:48:31 +0000 |
| commit | ac516641d09a9cb77eca24925debd63f432ae286 (patch) | |
| tree | be4b0fb6d56f87acdc69d8adadf7ece227f1a9a8 | |
| parent | 503dd65e633bf6d03e0cd1433faedaddabb8a179 (diff) | |
| download | eclipse.platform.ui-ac516641d09a9cb77eca24925debd63f432ae286.tar.gz eclipse.platform.ui-ac516641d09a9cb77eca24925debd63f432ae286.tar.xz eclipse.platform.ui-ac516641d09a9cb77eca24925debd63f432ae286.zip | |
Bug 348429 - [Perspectives] [Compare] NPE inI20140819-1200
ContentMergeViewerLayout.layout
Change-Id: I00219f8198df404ea1157f405eea05ecc018e347
Signed-off-by: Daniel Rolka <daniel.rolka@pl.ibm.com>
3 files changed, 18 insertions, 3 deletions
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/META-INF/MANIFEST.MF index 347cafd698d..8a9cb0e3267 100644 --- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.e4.ui.workbench.renderers.swt;singleton:=true -Bundle-Version: 0.12.0.qualifier +Bundle-Version: 0.12.100.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/pom.xml b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/pom.xml index db1846ad87d..6985804a8d0 100644 --- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/pom.xml +++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.e4</groupId> <artifactId>org.eclipse.e4.ui.workbench.renderers.swt</artifactId> - <version>0.12.0-SNAPSHOT</version> + <version>0.12.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ContributedPartRenderer.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ContributedPartRenderer.java index 074dc80a8c6..9b1f4001976 100644 --- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ContributedPartRenderer.java +++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ContributedPartRenderer.java @@ -255,6 +255,21 @@ public class ContributedPartRenderer extends SWTPartRenderer { engine.removeGui(menu); } } - super.disposeWidget(element); + + Composite parent = null; + if (element.getWidget() instanceof Composite) { + parent = ((Composite) element.getWidget()).getParent(); + } + + if (parent != null) { + try { + parent.setRedraw(false); + super.disposeWidget(element); + } finally { + parent.setRedraw(true); + } + } else { + super.disposeWidget(element); + } } } |