Bug 369916 - 'Tracing' page content feels odd

Replace autoloading with service listener

6 files changed, 18 insertions, 15 deletions

diff --git a/ui/org.eclipse.ui.trace/.project b/ui/org.eclipse.ui.trace/.project
index 17c37a2a53..f620013970 100644
--- a/ui/org.eclipse.ui.trace/.project
+++ b/ui/org.eclipse.ui.trace/.project
@@ -20,6 +20,11 @@
 			<arguments>

 			</arguments>

 		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ds.core.builder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

 	</buildSpec>

 	<natures>

 		<nature>org.eclipse.jdt.core.javanature</nature>

diff --git a/ui/org.eclipse.ui.trace/META-INF/MANIFEST.MF b/ui/org.eclipse.ui.trace/META-INF/MANIFEST.MF
index 9670df5a7c..a73796187e 100644
--- a/ui/org.eclipse.ui.trace/META-INF/MANIFEST.MF
+++ b/ui/org.eclipse.ui.trace/META-INF/MANIFEST.MF
@@ -9,9 +9,10 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy

 Bundle-Localization: plugin

 Require-Bundle: org.eclipse.osgi;bundle-version="[3.6.0,4.0.0)",

- org.eclipse.core.runtime;bundle-version="3.6.0",

- org.eclipse.ui;bundle-version="[3.5.0,4.0.0)"

+ org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",

+ org.eclipse.ui;bundle-version="[3.6.0,4.0.0)"

 Export-Package: org.eclipse.ui.trace.internal;x-internal:=true,

  org.eclipse.ui.trace.internal.datamodel;x-internal:=true,

  org.eclipse.ui.trace.internal.providers;x-internal:=true,

  org.eclipse.ui.trace.internal.utils;x-internal:=true

+Service-Component: OSGI-INF/tracingInitializer.xml

diff --git a/ui/org.eclipse.ui.trace/OSGI-INF/tracingInitializer.xml b/ui/org.eclipse.ui.trace/OSGI-INF/tracingInitializer.xml
new file mode 100644
index 0000000000..fdd7a3d0e1
--- /dev/null
+++ b/ui/org.eclipse.ui.trace/OSGI-INF/tracingInitializer.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.ui.trace.TracingInitializer">
+   <implementation class="org.eclipse.ui.trace.internal.utils.TracingInitializer"/>
+   <reference cardinality="1..n" interface="org.eclipse.osgi.service.debug.DebugOptionsListener" name="DebugOptionsListener" policy="static"/>
+</scr:component>
diff --git a/ui/org.eclipse.ui.trace/build.properties b/ui/org.eclipse.ui.trace/build.properties
index d561ea1eb5..6e929e258c 100644
--- a/ui/org.eclipse.ui.trace/build.properties
+++ b/ui/org.eclipse.ui.trace/build.properties
@@ -21,6 +21,6 @@ bin.includes = .classpath,\
                plugin.properties,\

                plugin.xml,\

                schema/,\

-               .

-

+               .,\

+               OSGI-INF/

 src.includes = about.html

diff --git a/ui/org.eclipse.ui.trace/plugin.xml b/ui/org.eclipse.ui.trace/plugin.xml
index dc0483a18c..87455997a4 100644
--- a/ui/org.eclipse.ui.trace/plugin.xml
+++ b/ui/org.eclipse.ui.trace/plugin.xml
@@ -68,10 +68,5 @@
             label="%keyword.debug">

       </keyword>

    </extension>

-   <extension

-         point="org.eclipse.ui.startup">

-      <startup

-            class="org.eclipse.ui.trace.internal.utils.TracingInitializer"></startup>

-   </extension>

 

 </plugin>

diff --git a/ui/org.eclipse.ui.trace/src/org/eclipse/ui/trace/internal/utils/TracingInitializer.java b/ui/org.eclipse.ui.trace/src/org/eclipse/ui/trace/internal/utils/TracingInitializer.java
index e34057955e..a841b90b88 100644
--- a/ui/org.eclipse.ui.trace/src/org/eclipse/ui/trace/internal/utils/TracingInitializer.java
+++ b/ui/org.eclipse.ui.trace/src/org/eclipse/ui/trace/internal/utils/TracingInitializer.java
@@ -11,16 +11,13 @@
 package org.eclipse.ui.trace.internal.utils;

 

 import org.eclipse.osgi.service.debug.DebugOptions;

-import org.eclipse.ui.IStartup;

 

 /**

  * Reads the preferences and initialises the {@link DebugOptions} options

  */

-public class TracingInitializer implements IStartup {

+public class TracingInitializer {

 

-	public void earlyStartup() {

-		// Empty extension to trigger the bundle loading

-		// TracingUIActivator.startup sets options from the preferences 

-	}

+	// Empty service component to trigger the bundle loading

+	// TracingUIActivator.startup sets options from the preferences 

 

 }