From 890624c4959e4a8bb25c259dd5d395f54e599356 Mon Sep 17 00:00:00 2001
From: Tom Schindl
Date: Sat, 24 May 2014 17:47:19 +0200
Subject: Bug 435366 - NPE in E4Application when
 LifeCycleManager.@PostContextCreate returns False

---
 testcases/org.eclipse.fx.testcases.e4/plugin.xml                      | 4 ++++
 .../org/eclipse/fx/testcases/e4/handlers/ClosePerspectiveHandler.java | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'testcases')

diff --git a/testcases/org.eclipse.fx.testcases.e4/plugin.xml b/testcases/org.eclipse.fx.testcases.e4/plugin.xml
index 8df62b628..a0b1462e6 100755
--- a/testcases/org.eclipse.fx.testcases.e4/plugin.xml
+++ b/testcases/org.eclipse.fx.testcases.e4/plugin.xml
@@ -19,6 +19,10 @@
                value="org.eclipse.fx.testcases.e4/Application.e4xmi"
                name="applicationXMI">
          </property>
+         <property
+               name="lifeCycleURI"
+               value="bundleclass://org.eclipse.fx.testcases.e4/org.eclipse.fx.testcases.e4.lifecycle.ApplicationLifecycle">
+         </property>
       </product>
    </extension>
    <extension
diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/ClosePerspectiveHandler.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/ClosePerspectiveHandler.java
index fce75d0ac..145503ada 100644
--- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/ClosePerspectiveHandler.java
+++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/ClosePerspectiveHandler.java
@@ -12,7 +12,7 @@ import org.eclipse.e4.ui.workbench.modeling.EModelService;
 import org.eclipse.e4.ui.workbench.modeling.EPartService;
 import org.eclipse.fx.ui.lifecycle.ELifecycleService;
 import org.eclipse.fx.ui.lifecycle.annotations.PreClose;
-import org.eclipse.fx.ui.workbench.base.rendering.AbstractRenderer;
+import org.eclipse.fx.ui.workbench.base.rendering.ElementRenderer;
 import org.eclipse.fx.ui.workbench.renderers.base.BaseRenderer;
 
 public class ClosePerspectiveHandler {
-- 
cgit v1.2.3