Bug 437558 - Sleak not working with RCP e4

Converts the sleak view to an e4 view. It is still available under Show
View for the IDE and 3x RCP customer. The model element is set to not
persist so that the view will not restored between restarts.

Change-Id: I47f6b689f2f9492c8b4417051cdba8407e75e29b
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

4 files changed, 32 insertions, 15 deletions

diff --git a/bundles/org.eclipse.swt.tools.spies/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.tools.spies/META-INF/MANIFEST.MF
index 36f63a8226..7d6b0ca0ac 100644
--- a/bundles/org.eclipse.swt.tools.spies/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.tools.spies/META-INF/MANIFEST.MF
@@ -10,6 +10,10 @@ Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.4.0",
- org.eclipse.ui;bundle-version="3.4.0",
- org.eclipse.swt.tools.base;bundle-version="3.106.0"
+ org.eclipse.swt.tools.base;bundle-version="3.106.0",
+ org.eclipse.e4.ui.model.workbench;bundle-version="2.1.400",
+ org.eclipse.swt;bundle-version="3.110.100",
+ org.eclipse.ui;bundle-version="3.113.0",
+ org.eclipse.e4.ui.di;bundle-version="1.2.600"
 Automatic-Module-Name: org.eclipse.swt.tools.spies
+Import-Package: javax.annotation;version="1.2.0"
diff --git a/bundles/org.eclipse.swt.tools.spies/fragment.e4xmi b/bundles/org.eclipse.swt.tools.spies/fragment.e4xmi
new file mode 100644
index 0000000000..e38c21a056
--- /dev/null
+++ b/bundles/org.eclipse.swt.tools.spies/fragment.e4xmi
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ASCII"?>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/descriptor/basic" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmi:id="_-LZIEN9kEemzyrbiRClN6A">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="__HWaAN9kEemzyrbiRClN6A" featurename="descriptors" parentElementId="xpath:/">
+    <elements xsi:type="basic:PartDescriptor" xmi:id="_GSP6cN9lEemzyrbiRClN6A" elementId="org.eclipse.swt.tools.spies.partdescriptor.sleak" label="Sleak" iconURI="platform:/plugin/org.eclipse.swt.tools.spies/icons/sleak.png" category="SWT Tools" contributionURI="bundleclass://org.eclipse.swt.tools.spies/org.eclipse.swt.tools.views.SleakView">
+      <persistedState key="persistState" value="false"/>
+      <tags>View</tags>
+    </elements>
+  </fragments>
+</fragment:ModelFragments>
diff --git a/bundles/org.eclipse.swt.tools.spies/plugin.xml b/bundles/org.eclipse.swt.tools.spies/plugin.xml
index 9b81f07d4d..69abd2c858 100644
--- a/bundles/org.eclipse.swt.tools.spies/plugin.xml
+++ b/bundles/org.eclipse.swt.tools.spies/plugin.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
 <plugin>
    <extension
          point="org.eclipse.ui.views">
@@ -11,12 +10,14 @@
             id="org.eclipse.swt.tools.views.SpyView"
             name="%spyViewName">
       </view>
-      <view
-            category="org.eclipse.swt.swt.tools"
-            class="org.eclipse.swt.tools.views.SleakView"
-            icon="icons/sleak.png"
-            id="org.eclipse.swt.tools.views.SleakView"
-            name="%sleakViewName">
-      </view>
    </extension>
+   <extension
+         id="org.eclipse.swt.tools.spies.fragment"
+         point="org.eclipse.e4.workbench.model">
+      <fragment
+            apply="always"
+            uri="fragment.e4xmi">
+      </fragment>
+   </extension>
+
 </plugin>
diff --git a/bundles/org.eclipse.swt.tools.spies/src/org/eclipse/swt/tools/views/SleakView.java b/bundles/org.eclipse.swt.tools.spies/src/org/eclipse/swt/tools/views/SleakView.java
index 65204b6d8d..1f4203f700 100644
--- a/bundles/org.eclipse.swt.tools.spies/src/org/eclipse/swt/tools/views/SleakView.java
+++ b/bundles/org.eclipse.swt.tools.spies/src/org/eclipse/swt/tools/views/SleakView.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2013 IBM Corporation and others.
+ * Copyright (c) 2004, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -10,30 +10,33 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@vogella.com> - Converted to e4 view
  *******************************************************************************/
 package org.eclipse.swt.tools.views;
 
+import javax.annotation.*;
+
+import org.eclipse.e4.ui.di.*;
 import org.eclipse.swt.*;
 import org.eclipse.swt.tools.internal.*;
 import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.part.*;
 
 /**
  * Sleak view to trace native handler allocation
  */
 
-public class SleakView extends ViewPart {
+public class SleakView {
 
 	private Composite composite;
 
-	@Override
+	@PostConstruct
 	public void createPartControl(Composite parent) {
 		composite = new Composite(parent, SWT.NONE);
 		Sleak sleak = new Sleak ();
 		sleak.create(composite);
 	}
 
-	@Override
+	@Focus
 	public void setFocus() {
 		composite.setFocus();
 	}