summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Georgi2012-02-15 13:03:44 (EST)
committerCurtis Windatt2012-02-15 13:03:44 (EST)
commitd002cff574d863dd1a73e8671dec49964945a878 (patch)
tree3009d65137396b2a6c6021738946bdff7db65ea7
parentcb99fbe08d506adfd359b0f2d14103a55257a3aa (diff)
downloadeclipse.pde.ui-d002cff574d863dd1a73e8671dec49964945a878.zip
eclipse.pde.ui-d002cff574d863dd1a73e8671dec49964945a878.tar.gz
eclipse.pde.ui-d002cff574d863dd1a73e8671dec49964945a878.tar.bz2
Bug 369916 - 'Tracing' page content feels odd
Replace autoloading with service listener
-rw-r--r--ui/org.eclipse.ui.trace/.project5
-rw-r--r--ui/org.eclipse.ui.trace/META-INF/MANIFEST.MF5
-rw-r--r--ui/org.eclipse.ui.trace/OSGI-INF/tracingInitializer.xml5
-rw-r--r--ui/org.eclipse.ui.trace/build.properties4
-rw-r--r--ui/org.eclipse.ui.trace/plugin.xml5
-rw-r--r--ui/org.eclipse.ui.trace/src/org/eclipse/ui/trace/internal/utils/TracingInitializer.java9
6 files changed, 18 insertions, 15 deletions
diff --git a/ui/org.eclipse.ui.trace/.project b/ui/org.eclipse.ui.trace/.project
index 17c37a2..f620013 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 9670df5..a737961 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 0000000..fdd7a3d
--- /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 d561ea1..6e929e2 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 dc0483a..8745599 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 e340579..a841b90 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
}