diff options
| author | Remy Suen | 2012-02-29 13:06:28 +0000 |
|---|---|---|
| committer | Remy Suen | 2012-02-29 13:06:28 +0000 |
| commit | 5674d2543e19524ad137b1ab3b11c403aa46e531 (patch) | |
| tree | e2091f9484b8387d4416c200bca6932e8557de4a /bundles/org.eclipse.e4.ui.workbench.renderers.swt | |
| parent | cfa5348d057c0d4855b3d33cbcd4952560d0479c (diff) | |
| download | eclipse.platform.ui-5674d2543e19524ad137b1ab3b11c403aa46e531.tar.gz eclipse.platform.ui-5674d2543e19524ad137b1ab3b11c403aa46e531.tar.xz eclipse.platform.ui-5674d2543e19524ad137b1ab3b11c403aa46e531.zip | |
Bug 372844 5 test failures in I20120228-2200v20120229-1306
Change the ToolBarManagerRenderer to handle not being able to
access the CSSRenderingUtils class. Also updated the test to
have the class available to ensure it is at least somewhat
similar to a real running environment.
Diffstat (limited to 'bundles/org.eclipse.e4.ui.workbench.renderers.swt')
| -rw-r--r-- | bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarManagerRenderer.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarManagerRenderer.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarManagerRenderer.java index 04b4641c72b..dbd4f452f5c 100644 --- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarManagerRenderer.java +++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarManagerRenderer.java @@ -277,8 +277,10 @@ public class ToolBarManagerRenderer extends SWTPartRenderer { IEclipseContext parentContext = getContextForParent(element); CSSRenderingUtils cssUtils = parentContext .get(CSSRenderingUtils.class); - intermediate = (Composite) cssUtils.frameMeIfPossible(intermediate, - null, vertical, true); + if (cssUtils != null) { + intermediate = (Composite) cssUtils.frameMeIfPossible( + intermediate, null, vertical, true); + } } return intermediate; |