Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2019-09-09 07:48:06 +0000
committerLars Vogel2019-09-14 01:58:19 +0000
commit39e4a23eba075049a327fb7a83e67f370b758e18 (patch)
treee208c64e6053dcb5f7b75589caa691501aa01941
parente641b20fa856205ec4def44c018935045a43824d (diff)
downloadeclipse.platform.ua-39e4a23eba075049a327fb7a83e67f370b758e18.tar.gz
eclipse.platform.ua-39e4a23eba075049a327fb7a83e67f370b758e18.tar.xz
eclipse.platform.ua-39e4a23eba075049a327fb7a83e67f370b758e18.zip
Bug 550788 - Replace Tip of the day Early Startup extension with an OSGi
service Also renames Startup to TipsStartupService Also includes the version increase for the 4.14 stream Activating the project specific preferences Change-Id: Ibc830435e520eb2a4a39257e5da423941028c837 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
-rw-r--r--org.eclipse.tips.ide/.project5
-rw-r--r--org.eclipse.tips.ide/.settings/org.eclipse.pde.ds.annotations.prefs8
-rw-r--r--org.eclipse.tips.ide/META-INF/MANIFEST.MF6
-rw-r--r--org.eclipse.tips.ide/OSGI-INF/org.eclipse.tips.ide.internal.TipsStartupService.xml8
-rw-r--r--org.eclipse.tips.ide/plugin.xml6
-rw-r--r--org.eclipse.tips.ide/pom.xml2
-rw-r--r--org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipPart.java2
-rw-r--r--org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipsHandler.java2
-rw-r--r--org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipsStartupService.java (renamed from org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/Startup.java)15
9 files changed, 38 insertions, 16 deletions
diff --git a/org.eclipse.tips.ide/.project b/org.eclipse.tips.ide/.project
index a2d34b4c2..02f913c43 100644
--- a/org.eclipse.tips.ide/.project
+++ b/org.eclipse.tips.ide/.project
@@ -25,6 +25,11 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ds.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
diff --git a/org.eclipse.tips.ide/.settings/org.eclipse.pde.ds.annotations.prefs b/org.eclipse.tips.ide/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 000000000..73a356b6d
--- /dev/null
+++ b/org.eclipse.tips.ide/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,8 @@
+classpath=true
+dsVersion=V1_3
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/org.eclipse.tips.ide/META-INF/MANIFEST.MF b/org.eclipse.tips.ide/META-INF/MANIFEST.MF
index 01abcd11d..984815b53 100644
--- a/org.eclipse.tips.ide/META-INF/MANIFEST.MF
+++ b/org.eclipse.tips.ide/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.tips.ide;singleton:=true
-Bundle-Version: 0.1.600.qualifier
+Bundle-Version: 0.1.700.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.ui;bundle-version="3.0.0",
org.eclipse.core.runtime;bundle-version="3.0.0",
@@ -10,10 +10,12 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.0.0",
org.eclipse.e4.ui.workbench;bundle-version="1.0.0",
org.eclipse.tips.core;bundle-version="0.1.0",
org.eclipse.tips.ui;bundle-version="0.1.0",
- org.eclipse.tips.json
+ org.eclipse.tips.json,
+ org.eclipse.osgi.services
Import-Package: javax.annotation
Export-Package: org.eclipse.tips.ide.internal;x-internal:=true
Automatic-Module-Name: org.eclipse.tips.ide
Bundle-Vendor: %Bundle-Vendor
Bundle-Activator: org.eclipse.tips.ide.internal.Plugin
Bundle-ActivationPolicy: lazy
+Service-Component: OSGI-INF/org.eclipse.tips.ide.internal.TipsStartupService.xml
diff --git a/org.eclipse.tips.ide/OSGI-INF/org.eclipse.tips.ide.internal.TipsStartupService.xml b/org.eclipse.tips.ide/OSGI-INF/org.eclipse.tips.ide.internal.TipsStartupService.xml
new file mode 100644
index 000000000..c2c44d094
--- /dev/null
+++ b/org.eclipse.tips.ide/OSGI-INF/org.eclipse.tips.ide.internal.TipsStartupService.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.tips.ide.internal.TipsStartupService">
+ <property name="event.topics" value="org/eclipse/e4/ui/LifeCycle/appStartupComplete"/>
+ <service>
+ <provide interface="org.osgi.service.event.EventHandler"/>
+ </service>
+ <implementation class="org.eclipse.tips.ide.internal.TipsStartupService"/>
+</scr:component> \ No newline at end of file
diff --git a/org.eclipse.tips.ide/plugin.xml b/org.eclipse.tips.ide/plugin.xml
index d3f645f0e..758d945b6 100644
--- a/org.eclipse.tips.ide/plugin.xml
+++ b/org.eclipse.tips.ide/plugin.xml
@@ -16,12 +16,6 @@
<plugin>
<extension
- point="org.eclipse.ui.startup">
- <startup
- class="org.eclipse.tips.ide.internal.Startup">
- </startup>
- </extension>
- <extension
point="org.eclipse.ui.commands">
<command
defaultHandler="org.eclipse.tips.ide.internal.TipsHandler"
diff --git a/org.eclipse.tips.ide/pom.xml b/org.eclipse.tips.ide/pom.xml
index f55e7a0e9..99c901ce6 100644
--- a/org.eclipse.tips.ide/pom.xml
+++ b/org.eclipse.tips.ide/pom.xml
@@ -22,6 +22,6 @@
</parent>
<groupId>org.eclipse.ui</groupId>
<artifactId>org.eclipse.tips.ide</artifactId>
- <version>0.1.600-SNAPSHOT</version>
+ <version>0.1.700-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipPart.java b/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipPart.java
index e4a34e53e..ee1147d24 100644
--- a/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipPart.java
+++ b/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipPart.java
@@ -14,7 +14,7 @@ public class TipPart {
Composite composite = new Composite(pParent, SWT.NONE);
composite.setLayout(new FillLayout());
IDETipManager manager = (IDETipManager) IDETipManager.getInstance();
- Startup.loadProviders();
+ TipsStartupService.loadProviders();
new TipComposite(composite, SWT.NONE).setTipManager(manager);
}
} \ No newline at end of file
diff --git a/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipsHandler.java b/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipsHandler.java
index 6d66b71c2..0cc25e897 100644
--- a/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipsHandler.java
+++ b/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipsHandler.java
@@ -27,7 +27,7 @@ public class TipsHandler extends AbstractHandler {
public Object execute(ExecutionEvent event) throws ExecutionException {
// if (!IDETipManager.getInstance().isOpen()) {
IDETipManager.getInstance().open(false);
- Startup.loadProviders();
+ TipsStartupService.loadProviders();
// }
return null;
}
diff --git a/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/Startup.java b/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipsStartupService.java
index eeb7fa327..8407b2ac8 100644
--- a/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/Startup.java
+++ b/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipsStartupService.java
@@ -24,20 +24,25 @@ import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.e4.ui.workbench.UIEvents;
import org.eclipse.tips.core.TipProvider;
import org.eclipse.tips.core.internal.TipManager;
-import org.eclipse.ui.IStartup;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.progress.UIJob;
import org.osgi.framework.Bundle;
import org.osgi.framework.FrameworkUtil;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.event.Event;
+import org.osgi.service.event.EventConstants;
+import org.osgi.service.event.EventHandler;
/**
* Early startup to run the TipManager in the IDE.
*
*/
+@Component(property = EventConstants.EVENT_TOPIC + '=' + UIEvents.UILifeCycle.APP_STARTUP_COMPLETE)
@SuppressWarnings("restriction")
-public class Startup implements IStartup {
+public class TipsStartupService implements EventHandler {
private static final String DBLQUOTE = "\""; //$NON-NLS-1$
private static final String EQ = "="; //$NON-NLS-1$
@@ -48,7 +53,7 @@ public class Startup implements IStartup {
private static final String SPACE = " "; //$NON-NLS-1$
@Override
- public void earlyStartup() {
+ public void handleEvent(Event event) {
if (!(TipsPreferences.getStartupBehavior() == TipManager.START_DISABLE)) {
Job job = new Job(Messages.Startup_1) {
@Override
@@ -59,7 +64,7 @@ public class Startup implements IStartup {
@Override
public boolean belongsTo(Object family) {
- return Startup.class.equals(family);
+ return TipsStartupService.class.equals(family);
}
};
job.setSystem(true);
@@ -202,7 +207,7 @@ public class Startup implements IStartup {
}
private static void log(CoreException e) {
- Bundle bundle = FrameworkUtil.getBundle(Startup.class);
+ Bundle bundle = FrameworkUtil.getBundle(TipsStartupService.class);
Status status = new Status(IStatus.ERROR, bundle.getSymbolicName(), e.getMessage(), e);
Platform.getLog(bundle).log(status);
}

Back to the top