mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2024-10-28 03:59:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Switch from javax to jakarta (#912)

Browse source
This commit is contained in:
Jonah Graham 2024-10-08 13:26:10 -04:00 committed by GitHub
parent e50f81b95b
commit 4d0eaacf4a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
launchbar/org.eclipse.launchbar.ui.controls/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.launchbar.ui.controls;singleton:=true Bundle-SymbolicName: org.eclipse.launchbar.ui.controls;singleton:=true
Bundle-Version: 1.2.400.qualifier Bundle-Version: 1.2.500.qualifier
Bundle-Activator: org.eclipse.launchbar.ui.controls.internal.Activator Bundle-Activator: org.eclipse.launchbar.ui.controls.internal.Activator
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime, Require-Bundle: org.eclipse.core.runtime,
@ -15,8 +15,8 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.debug.ui;bundle-version="3.11.200", org.eclipse.debug.ui;bundle-version="3.11.200",
org.eclipse.launchbar.core;bundle-version="2.0.0", org.eclipse.launchbar.core;bundle-version="2.0.0",
org.eclipse.launchbar.ui;bundle-version="2.0.0" org.eclipse.launchbar.ui;bundle-version="2.0.0"
Import-Package: javax.annotation, Import-Package: jakarta.annotation,
javax.inject, jakarta.inject,
org.osgi.service.event;version="1.4.1" org.osgi.service.event;version="1.4.1"
Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy

6
launchbar/org.eclipse.launchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/LaunchBarControl.java
View file

@ -15,9 +15,6 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.launchbar.ui.controls.internal; package org.eclipse.launchbar.ui.controls.internal;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import org.eclipse.core.commands.Command; import org.eclipse.core.commands.Command;
import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
@ -44,6 +41,9 @@ import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.commands.ICommandService; import org.eclipse.ui.commands.ICommandService;
import org.eclipse.ui.handlers.IHandlerService; import org.eclipse.ui.handlers.IHandlerService;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
public class LaunchBarControl implements ILaunchBarListener { public class LaunchBarControl implements ILaunchBarListener {
public static final String ID = "org.eclipse.launchbar"; //$NON-NLS-1$ public static final String ID = "org.eclipse.launchbar"; //$NON-NLS-1$
public static final String CLASS_URI = "bundleclass://" + Activator.PLUGIN_ID + "/" //$NON-NLS-1$ //$NON-NLS-2$ public static final String CLASS_URI = "bundleclass://" + Activator.PLUGIN_ID + "/" //$NON-NLS-1$ //$NON-NLS-2$

4
launchbar/org.eclipse.launchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/LaunchBarInjector.java
View file

@ -15,8 +15,6 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.launchbar.ui.controls.internal; package org.eclipse.launchbar.ui.controls.internal;
import javax.inject.Inject;
import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.core.di.annotations.Execute;
import org.eclipse.e4.core.services.events.IEventBroker; import org.eclipse.e4.core.services.events.IEventBroker;
import org.eclipse.e4.ui.model.application.MApplication; import org.eclipse.e4.ui.model.application.MApplication;
@ -31,6 +29,8 @@ import org.eclipse.e4.ui.workbench.UIEvents;
import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.swt.widgets.Widget; import org.eclipse.swt.widgets.Widget;
import jakarta.inject.Inject;
public class LaunchBarInjector { public class LaunchBarInjector {
@Inject @Inject