From 784238868adf6c4df0e4f55439595369006c2dc7 Mon Sep 17 00:00:00 2001 From: Martin Bluehweis Date: Wed, 15 Jan 2025 18:03:21 +0100 Subject: [PATCH] refs #468 code modifications (mostly imports) --- .../fx/demo/contacts/DecorationController.java | 2 +- .../contacts/handlers/AddContactHandler.java | 2 +- .../demo/contacts/handlers/AddGroupHandler.java | 2 +- .../fx/demo/contacts/handlers/CopyHandler.java | 2 +- .../fx/demo/contacts/handlers/CutHandler.java | 2 +- .../contacts/handlers/DeleteContactHandler.java | 2 +- .../fx/demo/contacts/handlers/PasteHandler.java | 2 +- .../fx/demo/contacts/handlers/RedoHandler.java | 2 +- .../contacts/handlers/SwitchThemeHandler.java | 2 +- .../fx/demo/contacts/handlers/UndoHandler.java | 2 +- .../contacts/processors/MenuThemeProcessor.java | 4 ++-- .../processors/ToolbarThemeProcessor.java | 4 ++-- .../demo/contacts/views/ContactsListView.java | 2 +- .../demo/contacts/views/ContactsTableView.java | 2 +- .../contacts/views/ContactsTreeTableView.java | 2 +- .../demo/contacts/views/ContactsTreeView.java | 2 +- .../fx/demo/contacts/views/DetailsView.java | 2 +- .../app/controller/MainFrameController.java | 2 +- .../fx/demo/customWindow/app/part/Part1.java | 4 ++-- .../fx/demo/e4/parts/PersonDetailPart.java | 2 +- .../fx/demo/e4/parts/PersonListPart.java | 2 +- .../controllers/PersonDetailPartController.java | 2 +- .../media/addon/PerspectiveAnimationAddon.java | 4 ++-- .../media/handlers/PerspectiveSwitcher.java | 2 +- .../fx/demo/media/parts/ConfigurationPart.java | 2 +- .../media/parts/ConfigurationPartControler.java | 2 +- .../fx/demo/media/parts/MediaListPart.java | 4 ++-- .../eclipse/fx/demo/media/parts/MediaPart.java | 6 +++--- .../eclipse/fx/demo/osgi/di/FXController.java | 4 ++-- .../fx/demo/osgi/di/FXSubController.java | 4 ++-- .../fx/demo/osgi/di/MainApplication.java | 4 ++-- .../org/eclipse/fx/sample/e4swt/fx/FXView.java | 2 +- .../simplycode/app/parts/ProjectExplorer.java | 4 ++-- .../eclipse/fx/testcases/dnd/app/PartImpl.java | 2 +- .../fx/testcases/l10n/app/SamplePart.java | 4 ++-- .../fx/testcases/l10n/app/SwitchLang.java | 2 +- .../fx/ui/preferences/app/MainApplication.java | 4 ++-- .../app/pages/PreferencePageProvider_1.java | 2 +- .../app/ApplicationDecorationController.java | 2 +- .../compensator/app/DirtyStateTrackerAddon.java | 4 ++-- .../compensator/app/ToggleThemeHandler.java | 2 +- .../editor/hsl/HSLConfiguration.java | 2 +- .../editor/java/JavaSourceConfiguration.java | 2 +- .../js/JavaScriptSourceConfiguration.java | 2 +- .../compensator/editor/EditorNavigation.java | 4 ++-- .../compensator/editor/FileOutlineViewer.java | 6 +++--- .../fx/code/compensator/editor/TextEditor.java | 6 +++--- .../compensator/editor/internal/FileInput.java | 4 ++-- .../fx/code/compensator/freeedit/FileList.java | 4 ++-- .../code/compensator/freeedit/FileOutline.java | 6 +++--- .../code/compensator/jdt/JDTOutlineFactory.java | 2 +- .../fx/code/compensator/nashorn/JSOutline.java | 2 +- .../project/ci/travis/TravisProjectViewer.java | 2 +- .../project/jdt/handler/NewClassAction.java | 2 +- .../jdt/handler/NewClassPaneController.java | 4 ++-- .../jdt/handler/OpenServerManagedFile.java | 2 +- .../jdt/internal/JDTAnnotationModel.java | 2 +- .../jdt/internal/JDTInstanceProject.java | 2 +- .../internal/JDTProposalComputerFactory.java | 2 +- .../project/jdt/internal/JDTServerInput.java | 4 ++-- .../project/jdt/menu/ImportModuleElement.java | 2 +- .../compensator/project/EditorNavigation.java | 4 ++-- .../compensator/project/ProjectFileOutline.java | 6 +++--- .../compensator/project/ProjectMainToolbar.java | 4 ++-- .../compensator/project/ProjectNavigator.java | 4 ++-- .../project/ProjectSecondaryToolbar.java | 2 +- .../project/internal/DynamicContextMenu.java | 2 +- .../internal/ProjectSetupServiceImpl.java | 2 +- .../internal/commands/CommitActiveInput.java | 2 +- .../project/internal/commands/OpenProject.java | 2 +- .../internal/commands/OpenProjectDialog.java | 2 +- .../project/internal/commands/OpenResource.java | 2 +- .../fx/code/editor/hsl/HSLConfiguration.java | 2 +- .../singlesource/views/JFaceHelloWorld.java | 2 +- .../singlesource/views/SWTHelloWorld.java | 2 +- .../e4/AsciiDoctorEditorOpenerTypeProvider.java | 2 +- .../editor/asciidoc/fx/e4/EditorDelegate.java | 2 +- .../asciidoc/fx/AsciiDoctorPreviewer.java | 6 +++--- .../fx/ConfigurationPresentationReconciler.java | 2 +- .../text/ConfigurationPartitioner.java | 2 +- .../e4/addons/DirtyStateTrackingAddon.java | 4 ++-- .../fx/code/editor/e4/handlers/SaveFile.java | 2 +- .../EditorContainerServiceContextFunction.java | 2 +- ...MenuProviderTypeProviderContextFunction.java | 2 +- .../internal/EditorOpenerContextFunction.java | 2 +- .../fx/code/editor/fx/FilesystemViewer.java | 6 +++--- .../fx/code/editor/fx/OutlineViewer.java | 4 ++-- .../eclipse/fx/code/editor/fx/TextEditor.java | 6 +++--- .../code/editor/fx/handlers/SetTabAdvance.java | 2 +- .../editor/fx/handlers/ToggleEditorFeature.java | 2 +- .../DefaultSourceViewerConfiguration.java | 2 +- .../fx/code/editor/LocalSourceFileInput.java | 8 ++++---- .../fx/code/editor/services/InputDocument.java | 6 +++--- .../di/context/tests/AdaptSupplierTestCase.java | 6 +++--- .../tests/ContextBoundValueTestCase.java | 6 +++--- .../di/context/tests/LocalInstanceTestCase.java | 6 +++--- .../core/di/context/tests/LoggerTestCase.java | 2 +- .../context/tests/PreferenceValueTestCase.java | 4 ++-- .../context/tests/ServiceSupplierTestCase.java | 2 +- .../di/context/internal/AdaptValueSupplier.java | 4 ++-- .../internal/EclipseContextBoundValue.java | 4 ++-- .../internal/FXMLLoaderTypeProvider.java | 4 ++-- .../internal/LocalInstanceObjectSupplier.java | 2 +- .../di/context/internal/PreferenceValue.java | 4 ++-- .../org/eclipse/fx/core/di/ContextValue.java | 2 +- .../org/eclipse/fx/core/di/LocalInstance.java | 2 +- .../java/org/eclipse/fx/core/di/Service.java | 2 +- .../fx/core/log4j/Log4JLoggerFactory.java | 2 +- .../fx/core/slf4j/Slf4JLoggerFactory.java | 2 +- .../eclipse/fx/core/DisposeableCollector.java | 2 +- .../java/org/eclipse/fx/core/adapter/Adapt.java | 2 +- .../fx/core/internal/JAXBObjectSerializer.java | 8 ++++---- .../fx/core/internal/JUtilLoggerFactory.java | 2 +- .../core/internal/JavaDSServiceProcessor.java | 4 ++-- .../eclipse/fx/core/internal/sm/Component.java | 4 ++-- .../fx/core/internal/sm/Component10.java | 2 +- .../fx/core/internal/sm/Component11.java | 2 +- .../fx/core/internal/sm/Component12.java | 2 +- .../fx/core/internal/sm/Component13.java | 2 +- .../fx/core/internal/sm/Component14.java | 2 +- .../fx/core/internal/sm/Implementation.java | 4 ++-- .../eclipse/fx/core/internal/sm/Properties.java | 4 ++-- .../eclipse/fx/core/internal/sm/Property.java | 4 ++-- .../eclipse/fx/core/internal/sm/Provide.java | 4 ++-- .../eclipse/fx/core/internal/sm/Reference.java | 4 ++-- .../eclipse/fx/core/internal/sm/Service.java | 2 +- .../main/java/org/eclipse/fx/core/log/Log.java | 2 +- .../core/observable/SubscriptionRegistry.java | 2 +- .../eclipse/fx/core/preferences/Preference.java | 2 +- .../fx/core/text/AbstractTextRegistry.java | 2 +- .../org/eclipse/fx/core/text/DateFormatter.java | 2 +- .../eclipse/fx/core/text/NumberFormatter.java | 2 +- .../fx/core/text/TemporalAccessorFormatter.java | 2 +- .../fx/ui/di/interopt/CommandServiceImpl.java | 6 +++--- .../java/org/eclipse/fx/ui/di/FXMLLoader.java | 2 +- .../fx/ui/di/internal/ResourceServiceImpl.java | 4 ++-- .../keybindings/e4/BindingProcessingAddon.java | 6 +++--- .../ui/keybindings/e4/BindingServiceAddon.java | 2 +- .../e4/internal/BindingServiceImpl.java | 4 ++-- .../e4/internal/BindingTableManager.java | 2 +- .../context/PreferencePageFactoryCF.java | 2 +- .../eclipse/fx/ui/preferences/PreferenceUI.java | 4 ++-- .../page/FieldEditorPreferencePage.java | 2 +- .../base/internal/CommandEventDispatcher.java | 2 +- .../base/internal/CommandServiceImpl.java | 6 +++--- .../base/internal/EFX_ModelAssembler.java | 2 +- .../base/internal/EFX_ResourceHandler.java | 6 +++--- .../base/internal/LoggerProviderImpl.java | 2 +- .../base/internal/ModelServiceImpl.java | 4 ++-- .../TranslationServiceContextFunction.java | 2 +- .../base/restart/RestartPreferenceUtil.java | 2 +- .../base/restart/RestartServiceImpl.java | 2 +- .../fx/ui/workbench/fx/PartRenderingEngine.java | 4 ++-- .../fx/internal/GraphicsLoaderImpl.java | 2 +- .../ui/workbench/fx/internal/MenuServiceCF.java | 2 +- .../workbench/fx/key/KeyBindingDispatcher.java | 2 +- .../LwPerspectiveSwitcherDialog.java | 2 +- .../fx/perspective/PerspectiveListView.java | 4 ++-- .../PerspectiveSwitcherComponent.java | 2 +- .../perspective/PerspectiveSwitcherDialog.java | 2 +- .../fx/perspective/PerspectiveSwitcherNode.java | 2 +- .../SwitchPerspectiveDialogHandler.java | 2 +- .../renderers/base/BaseAreaRenderer.java | 4 ++-- .../base/BaseCompositePartRenderer.java | 4 ++-- .../base/BaseItemContainerRenderer.java | 4 ++-- .../renderers/base/BaseItemRenderer.java | 2 +- .../renderers/base/BaseMenuBarRenderer.java | 2 +- .../renderers/base/BaseMenuItemRenderer.java | 2 +- .../renderers/base/BaseMenuRenderer.java | 2 +- .../renderers/base/BasePartMenuRenderer.java | 2 +- .../renderers/base/BasePartRenderer.java | 2 +- .../renderers/base/BasePerspectiveRenderer.java | 4 ++-- .../base/BasePerspectiveStackRenderer.java | 4 ++-- .../renderers/base/BasePlaceholderRenderer.java | 6 +++--- .../renderers/base/BasePopupMenuRenderer.java | 2 +- .../workbench/renderers/base/BaseRenderer.java | 2 +- .../renderers/base/BaseSashRenderer.java | 4 ++-- .../renderers/base/BaseStackRenderer.java | 4 ++-- .../renderers/base/BaseToolItemRenderer.java | 2 +- .../renderers/base/BaseTrimBarRenderer.java | 2 +- .../renderers/base/BaseWindowRenderer.java | 4 ++-- .../base/BaseWorkbenchRendererFactory.java | 2 +- .../renderers/base/addons/CleanUpAddon.java | 4 ++-- .../renderers/base/addons/DnDAddon.java | 4 ++-- .../renderers/base/addons/MinMaxAddon.java | 2 +- .../addons/MinMaxAddonWithPartialRestore.java | 2 +- .../PerspectiveMaximizationServiceImpl.java | 2 +- .../internal/WindowMaximizationServiceImpl.java | 2 +- .../workbench/renderers/fx/DefAreaRenderer.java | 4 ++-- .../renderers/fx/DefCompositePartRenderer.java | 4 ++-- .../renderers/fx/DefMenuBarRenderer.java | 4 ++-- .../renderers/fx/DefMenuItemRenderer.java | 4 ++-- .../workbench/renderers/fx/DefMenuRenderer.java | 4 ++-- .../workbench/renderers/fx/DefPartRenderer.java | 4 ++-- .../renderers/fx/DefPerspectiveRenderer.java | 2 +- .../fx/DefPerspectiveStackRenderer.java | 4 ++-- .../workbench/renderers/fx/DefSashRenderer.java | 4 ++-- .../renderers/fx/DefStackRenderer.java | 8 ++++---- .../renderers/fx/DefToolControlRenderer.java | 2 +- .../renderers/fx/DefToolItemMenuRenderer.java | 4 ++-- .../renderers/fx/DefToolItemRenderer.java | 4 ++-- .../renderers/fx/DefTrimBarRenderer.java | 4 ++-- .../renderers/fx/DefWindowRenderer.java | 6 +++--- .../fx/DefWorkbenchRendererFactory.java | 2 +- .../addons/internal/DefaultTrimStackImpl.java | 4 ++-- .../fx/internal/DefaultSaveDialogPresenter.java | 2 +- .../renderers/fx/internal/FXDialogService.java | 2 +- .../fx/internal/PartPopupMenuServiceImpl.java | 2 +- .../fx/widget/WLayoutedWidgetImpl.java | 4 ++-- .../renderers/fx/widget/WWidgetImpl.java | 4 ++-- .../services/lifecycle/LifecycleAddon.java | 4 ++-- .../internal/LifecycleServiceImpl.java | 2 +- .../fx/testcases/e4/CustomRendererFactory.java | 2 +- .../eclipse/fx/testcases/e4/ModelViewAddon.java | 2 +- .../e4/decoration/DecorationController.java | 4 ++-- .../fx/testcases/e4/handlers/DiHandler.java | 2 +- .../fx/testcases/e4/handlers/DynDiHandler.java | 2 +- .../fx/testcases/e4/handlers/Handler0.java | 2 +- .../e4/handlers/OpenLightweightWindow.java | 2 +- .../e4/handlers/SwitchPerspectiveHandler.java | 2 +- .../fx/testcases/e4/parts/ContentPanel.java | 8 ++++---- .../fx/testcases/e4/parts/ControlPanel.java | 6 +++--- .../fx/testcases/e4/parts/ExtraWindowPart.java | 2 +- .../e4/parts/MCompositePartContribution.java | 2 +- .../fx/testcases/e4/parts/SampleNoFocus.java | 2 +- .../fx/testcases/e4/parts/StartCountPart.java | 2 +- .../e4/parts/TestExtendedFXMLBuilder.java | 2 +- .../fx/testcases/e4/parts/TestFXMLBuilder.java | 4 ++-- .../testcases/e4/parts/TestFXMLController.java | 6 +++--- .../eclipse/fx/testcases/e4/parts/TestPane.java | 2 +- .../fx/testcases/e4/parts/TestSwingPart.java | 2 +- .../fx/testcases/e4/parts/Test_431338.java | 4 ++-- .../fx/testcases/e4/parts/Test_431391.java | 2 +- .../testcases/e4/parts/Test_PersistState.java | 2 +- .../e4/renderer/MyDefMenuRenderer.java | 4 ++-- .../fx/testcases/e4/tool/ProgressControl.java | 2 +- .../fx/testcases/e4/tool/SpacerDummy.java | 2 +- .../fx/testcases/e4/tool/ToolControlSample.java | 2 +- .../sample/splash/app/LoginSplashStartup.class | Bin 579 -> 579 bytes .../bin/sample/splash/app/RestartHandler.class | Bin 671 -> 671 bytes .../src/test/issue12/app/ChildPart1.java | 2 +- .../src/test/issue12/app/ChildPart2.java | 2 +- .../src/test/issue12/app/MainPart.java | 4 ++-- 243 files changed, 363 insertions(+), 363 deletions(-) diff --git a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/DecorationController.java b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/DecorationController.java index 6ab31e12c..beb5005d1 100755 --- a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/DecorationController.java +++ b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/DecorationController.java @@ -21,7 +21,7 @@ import javafx.scene.input.MouseEvent; import javafx.stage.Screen; import javafx.stage.Stage; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; public class DecorationController { private double mouseDragOffsetX = 0; diff --git a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/AddContactHandler.java b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/AddContactHandler.java index 5df22583d..e6519a31c 100755 --- a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/AddContactHandler.java +++ b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/AddContactHandler.java @@ -13,7 +13,7 @@ package org.eclipse.fx.demo.contacts.handlers; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.emf.common.command.Command; diff --git a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/AddGroupHandler.java b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/AddGroupHandler.java index 097f270b7..938501cac 100755 --- a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/AddGroupHandler.java +++ b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/AddGroupHandler.java @@ -13,7 +13,7 @@ package org.eclipse.fx.demo.contacts.handlers; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.emf.common.command.Command; diff --git a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/CopyHandler.java b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/CopyHandler.java index f35e3ffb9..4a9a5489d 100755 --- a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/CopyHandler.java +++ b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/CopyHandler.java @@ -14,7 +14,7 @@ package org.eclipse.fx.demo.contacts.handlers; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.core.di.annotations.Optional; diff --git a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/CutHandler.java b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/CutHandler.java index 5ef2143fd..7efa528e6 100755 --- a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/CutHandler.java +++ b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/CutHandler.java @@ -14,7 +14,7 @@ package org.eclipse.fx.demo.contacts.handlers; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.core.di.annotations.Optional; diff --git a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/DeleteContactHandler.java b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/DeleteContactHandler.java index 7229e05dc..e94fd0153 100755 --- a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/DeleteContactHandler.java +++ b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/DeleteContactHandler.java @@ -14,7 +14,7 @@ package org.eclipse.fx.demo.contacts.handlers; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.core.di.annotations.Optional; diff --git a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/PasteHandler.java b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/PasteHandler.java index 452c9cb1d..bf9b7dce2 100755 --- a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/PasteHandler.java +++ b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/PasteHandler.java @@ -13,7 +13,7 @@ package org.eclipse.fx.demo.contacts.handlers; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; diff --git a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/RedoHandler.java b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/RedoHandler.java index 339ab2e09..3f9e59da1 100755 --- a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/RedoHandler.java +++ b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/RedoHandler.java @@ -13,7 +13,7 @@ package org.eclipse.fx.demo.contacts.handlers; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.emf.common.command.CommandStack; diff --git a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/SwitchThemeHandler.java b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/SwitchThemeHandler.java index 19cf62dec..1318b495e 100755 --- a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/SwitchThemeHandler.java +++ b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/SwitchThemeHandler.java @@ -13,7 +13,7 @@ ******************************************************************************/ package org.eclipse.fx.demo.contacts.handlers; -import javax.inject.Named; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.core.di.annotations.Optional; diff --git a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/UndoHandler.java b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/UndoHandler.java index 1155a9501..6d5b2703d 100755 --- a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/UndoHandler.java +++ b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/UndoHandler.java @@ -14,7 +14,7 @@ package org.eclipse.fx.demo.contacts.handlers; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.emf.common.command.CommandStack; diff --git a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/processors/MenuThemeProcessor.java b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/processors/MenuThemeProcessor.java index 53470844a..e7ac51a0f 100755 --- a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/processors/MenuThemeProcessor.java +++ b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/processors/MenuThemeProcessor.java @@ -13,8 +13,8 @@ ******************************************************************************/ package org.eclipse.fx.demo.contacts.processors; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.ui.model.application.MApplication; import org.eclipse.e4.ui.model.application.commands.MCommand; diff --git a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/processors/ToolbarThemeProcessor.java b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/processors/ToolbarThemeProcessor.java index b6bd4b901..799effb0e 100755 --- a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/processors/ToolbarThemeProcessor.java +++ b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/processors/ToolbarThemeProcessor.java @@ -13,8 +13,8 @@ package org.eclipse.fx.demo.contacts.processors; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.ui.model.application.MApplication; import org.eclipse.e4.ui.model.application.commands.MCommand; diff --git a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/views/ContactsListView.java b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/views/ContactsListView.java index 009477df2..08a2145aa 100755 --- a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/views/ContactsListView.java +++ b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/views/ContactsListView.java @@ -21,7 +21,7 @@ import javafx.scene.control.SelectionMode; import javafx.scene.layout.BorderPane; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.ui.model.application.MApplication; import org.eclipse.emf.common.notify.AdapterFactory; diff --git a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/views/ContactsTableView.java b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/views/ContactsTableView.java index 4f65049c3..9838ebc79 100755 --- a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/views/ContactsTableView.java +++ b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/views/ContactsTableView.java @@ -22,7 +22,7 @@ import javafx.scene.control.TableView; import javafx.scene.layout.BorderPane; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.ui.model.application.MApplication; import org.eclipse.emf.common.notify.AdapterFactory; diff --git a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/views/ContactsTreeTableView.java b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/views/ContactsTreeTableView.java index c217df6a7..ede302a17 100644 --- a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/views/ContactsTreeTableView.java +++ b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/views/ContactsTreeTableView.java @@ -21,7 +21,7 @@ import javafx.scene.control.TreeTableView; import javafx.scene.layout.BorderPane; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.ui.model.application.MApplication; import org.eclipse.emf.common.notify.AdapterFactory; diff --git a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/views/ContactsTreeView.java b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/views/ContactsTreeView.java index ca5b5bdc3..549d54d4e 100755 --- a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/views/ContactsTreeView.java +++ b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/views/ContactsTreeView.java @@ -22,7 +22,7 @@ import javafx.scene.control.TreeView; import javafx.scene.layout.BorderPane; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.ui.model.application.MApplication; import org.eclipse.emf.edit.domain.EditingDomain; diff --git a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/views/DetailsView.java b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/views/DetailsView.java index b4c92b969..980dbc7fb 100755 --- a/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/views/DetailsView.java +++ b/demos/org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/views/DetailsView.java @@ -19,7 +19,7 @@ import javafx.scene.layout.BorderPane; import javafx.scene.layout.Pane; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.ui.model.application.MApplication; diff --git a/demos/org.eclipse.fx.demo.customWindow.app/src/org/eclipse/fx/demo/customWindow/app/controller/MainFrameController.java b/demos/org.eclipse.fx.demo.customWindow.app/src/org/eclipse/fx/demo/customWindow/app/controller/MainFrameController.java index 44ef5f395..499ae7ce1 100644 --- a/demos/org.eclipse.fx.demo.customWindow.app/src/org/eclipse/fx/demo/customWindow/app/controller/MainFrameController.java +++ b/demos/org.eclipse.fx.demo.customWindow.app/src/org/eclipse/fx/demo/customWindow/app/controller/MainFrameController.java @@ -15,7 +15,7 @@ import java.net.URL; import java.util.ResourceBundle; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.fx.core.event.EventBus; import org.eclipse.fx.demo.customWindow.app.CustomWindowDemoConstants; diff --git a/demos/org.eclipse.fx.demo.customWindow.app/src/org/eclipse/fx/demo/customWindow/app/part/Part1.java b/demos/org.eclipse.fx.demo.customWindow.app/src/org/eclipse/fx/demo/customWindow/app/part/Part1.java index 166599b68..1fb0a3085 100644 --- a/demos/org.eclipse.fx.demo.customWindow.app/src/org/eclipse/fx/demo/customWindow/app/part/Part1.java +++ b/demos/org.eclipse.fx.demo.customWindow.app/src/org/eclipse/fx/demo/customWindow/app/part/Part1.java @@ -22,8 +22,8 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import org.eclipse.fx.core.Subscription; import org.eclipse.fx.core.event.EventBus; diff --git a/demos/org.eclipse.fx.demo.e4/src/org/eclipse/fx/demo/e4/parts/PersonDetailPart.java b/demos/org.eclipse.fx.demo.e4/src/org/eclipse/fx/demo/e4/parts/PersonDetailPart.java index 5407acfb8..c44bd4742 100755 --- a/demos/org.eclipse.fx.demo.e4/src/org/eclipse/fx/demo/e4/parts/PersonDetailPart.java +++ b/demos/org.eclipse.fx.demo.e4/src/org/eclipse/fx/demo/e4/parts/PersonDetailPart.java @@ -17,7 +17,7 @@ import javafx.scene.Node; import javafx.scene.layout.BorderPane; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.eclipse.fx.ui.di.FXMLBuilder; import org.eclipse.fx.ui.di.FXMLLoader; diff --git a/demos/org.eclipse.fx.demo.e4/src/org/eclipse/fx/demo/e4/parts/PersonListPart.java b/demos/org.eclipse.fx.demo.e4/src/org/eclipse/fx/demo/e4/parts/PersonListPart.java index f65d58f84..d07826416 100755 --- a/demos/org.eclipse.fx.demo.e4/src/org/eclipse/fx/demo/e4/parts/PersonListPart.java +++ b/demos/org.eclipse.fx.demo.e4/src/org/eclipse/fx/demo/e4/parts/PersonListPart.java @@ -22,7 +22,7 @@ import javafx.scene.layout.BorderPane; import javafx.util.Callback; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.ui.model.application.MApplication; diff --git a/demos/org.eclipse.fx.demo.e4/src/org/eclipse/fx/demo/e4/parts/controllers/PersonDetailPartController.java b/demos/org.eclipse.fx.demo.e4/src/org/eclipse/fx/demo/e4/parts/controllers/PersonDetailPartController.java index e76e58a92..5be05d87a 100755 --- a/demos/org.eclipse.fx.demo.e4/src/org/eclipse/fx/demo/e4/parts/controllers/PersonDetailPartController.java +++ b/demos/org.eclipse.fx.demo.e4/src/org/eclipse/fx/demo/e4/parts/controllers/PersonDetailPartController.java @@ -24,7 +24,7 @@ import javafx.scene.layout.GridPane; import javafx.util.Duration; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.beans.BeanProperties; diff --git a/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/addon/PerspectiveAnimationAddon.java b/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/addon/PerspectiveAnimationAddon.java index d29e01882..06d220dd7 100755 --- a/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/addon/PerspectiveAnimationAddon.java +++ b/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/addon/PerspectiveAnimationAddon.java @@ -19,8 +19,8 @@ import javafx.scene.Node; import javafx.scene.layout.BorderPane; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; diff --git a/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/handlers/PerspectiveSwitcher.java b/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/handlers/PerspectiveSwitcher.java index cb2823c62..d03f39498 100755 --- a/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/handlers/PerspectiveSwitcher.java +++ b/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/handlers/PerspectiveSwitcher.java @@ -13,7 +13,7 @@ package org.eclipse.fx.demo.media.handlers; -import javax.inject.Named; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.ui.model.application.MApplication; diff --git a/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/parts/ConfigurationPart.java b/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/parts/ConfigurationPart.java index 956bb8301..a27d1cb98 100755 --- a/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/parts/ConfigurationPart.java +++ b/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/parts/ConfigurationPart.java @@ -17,7 +17,7 @@ import javafx.scene.layout.BorderPane; import javafx.scene.layout.GridPane; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.eclipse.fx.ui.di.FXMLBuilder; import org.eclipse.fx.ui.di.FXMLLoader; diff --git a/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/parts/ConfigurationPartControler.java b/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/parts/ConfigurationPartControler.java index 301ba7f6d..779775937 100755 --- a/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/parts/ConfigurationPartControler.java +++ b/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/parts/ConfigurationPartControler.java @@ -28,7 +28,7 @@ import javafx.scene.layout.BorderPane; import javafx.scene.shape.Rectangle; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.core.runtime.preferences.InstanceScope; diff --git a/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/parts/MediaListPart.java b/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/parts/MediaListPart.java index f26097732..8d278930d 100755 --- a/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/parts/MediaListPart.java +++ b/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/parts/MediaListPart.java @@ -22,8 +22,8 @@ import javafx.scene.layout.BorderPane; import javafx.util.Callback; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.ui.di.Focus; import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective; diff --git a/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/parts/MediaPart.java b/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/parts/MediaPart.java index 862349e09..95f3bf4a9 100755 --- a/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/parts/MediaPart.java +++ b/demos/org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/parts/MediaPart.java @@ -30,9 +30,9 @@ import javafx.scene.media.MediaPlayer; import javafx.scene.media.MediaView; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.ui.di.Focus; import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective; diff --git a/demos/org.eclipse.fx.demo.osgi.di/src/org/eclipse/fx/demo/osgi/di/FXController.java b/demos/org.eclipse.fx.demo.osgi.di/src/org/eclipse/fx/demo/osgi/di/FXController.java index 4bbbad1ce..c9aa749e1 100755 --- a/demos/org.eclipse.fx.demo.osgi.di/src/org/eclipse/fx/demo/osgi/di/FXController.java +++ b/demos/org.eclipse.fx.demo.osgi.di/src/org/eclipse/fx/demo/osgi/di/FXController.java @@ -14,8 +14,8 @@ import javafx.fxml.FXML; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.IEclipseContext; diff --git a/demos/org.eclipse.fx.demo.osgi.di/src/org/eclipse/fx/demo/osgi/di/FXSubController.java b/demos/org.eclipse.fx.demo.osgi.di/src/org/eclipse/fx/demo/osgi/di/FXSubController.java index 472aa864a..a4d720219 100755 --- a/demos/org.eclipse.fx.demo.osgi.di/src/org/eclipse/fx/demo/osgi/di/FXSubController.java +++ b/demos/org.eclipse.fx.demo.osgi.di/src/org/eclipse/fx/demo/osgi/di/FXSubController.java @@ -14,8 +14,8 @@ import javafx.fxml.FXML; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.IEclipseContext; diff --git a/demos/org.eclipse.fx.demo.osgi.di/src/org/eclipse/fx/demo/osgi/di/MainApplication.java b/demos/org.eclipse.fx.demo.osgi.di/src/org/eclipse/fx/demo/osgi/di/MainApplication.java index 64fdd21b0..d16f83859 100755 --- a/demos/org.eclipse.fx.demo.osgi.di/src/org/eclipse/fx/demo/osgi/di/MainApplication.java +++ b/demos/org.eclipse.fx.demo.osgi.di/src/org/eclipse/fx/demo/osgi/di/MainApplication.java @@ -18,8 +18,8 @@ import javafx.scene.layout.BorderPane; import javafx.stage.Stage; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.equinox.app.IApplicationContext; import org.eclipse.fx.ui.di.FXMLBuilder; diff --git a/demos/org.eclipse.fx.sample.e4swt.fx/src/org/eclipse/fx/sample/e4swt/fx/FXView.java b/demos/org.eclipse.fx.sample.e4swt.fx/src/org/eclipse/fx/sample/e4swt/fx/FXView.java index f307ffcbf..a751d119a 100644 --- a/demos/org.eclipse.fx.sample.e4swt.fx/src/org/eclipse/fx/sample/e4swt/fx/FXView.java +++ b/demos/org.eclipse.fx.sample.e4swt.fx/src/org/eclipse/fx/sample/e4swt/fx/FXView.java @@ -15,7 +15,7 @@ import javafx.scene.control.Button; import javafx.scene.layout.BorderPane; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; public class FXView { @PostConstruct diff --git a/demos/org.eclipse.fx.simplycode.app/src/org/eclipse/fx/simplycode/app/parts/ProjectExplorer.java b/demos/org.eclipse.fx.simplycode.app/src/org/eclipse/fx/simplycode/app/parts/ProjectExplorer.java index 2f657fbf4..f8ce5d548 100644 --- a/demos/org.eclipse.fx.simplycode.app/src/org/eclipse/fx/simplycode/app/parts/ProjectExplorer.java +++ b/demos/org.eclipse.fx.simplycode.app/src/org/eclipse/fx/simplycode/app/parts/ProjectExplorer.java @@ -14,8 +14,8 @@ import java.nio.file.Paths; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.ui.model.application.MApplication; import org.eclipse.e4.ui.workbench.modeling.EModelService; diff --git a/demos/org.eclipse.fx.testcases.dnd.app/src/org/eclipse/fx/testcases/dnd/app/PartImpl.java b/demos/org.eclipse.fx.testcases.dnd.app/src/org/eclipse/fx/testcases/dnd/app/PartImpl.java index a165a4446..60a67201b 100644 --- a/demos/org.eclipse.fx.testcases.dnd.app/src/org/eclipse/fx/testcases/dnd/app/PartImpl.java +++ b/demos/org.eclipse.fx.testcases.dnd.app/src/org/eclipse/fx/testcases/dnd/app/PartImpl.java @@ -19,7 +19,7 @@ import javafx.scene.layout.BorderPane; import javafx.scene.text.Font; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.eclipse.e4.ui.model.application.ui.basic.MPart; diff --git a/demos/org.eclipse.fx.testcases.l10n.app/src/org/eclipse/fx/testcases/l10n/app/SamplePart.java b/demos/org.eclipse.fx.testcases.l10n.app/src/org/eclipse/fx/testcases/l10n/app/SamplePart.java index 559eb0627..87e31028f 100644 --- a/demos/org.eclipse.fx.testcases.l10n.app/src/org/eclipse/fx/testcases/l10n/app/SamplePart.java +++ b/demos/org.eclipse.fx.testcases.l10n.app/src/org/eclipse/fx/testcases/l10n/app/SamplePart.java @@ -18,8 +18,8 @@ import javafx.scene.layout.BorderPane; import javafx.scene.layout.VBox; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; public class SamplePart { @Inject diff --git a/demos/org.eclipse.fx.testcases.l10n.app/src/org/eclipse/fx/testcases/l10n/app/SwitchLang.java b/demos/org.eclipse.fx.testcases.l10n.app/src/org/eclipse/fx/testcases/l10n/app/SwitchLang.java index 9c6c0be39..1df9b0416 100644 --- a/demos/org.eclipse.fx.testcases.l10n.app/src/org/eclipse/fx/testcases/l10n/app/SwitchLang.java +++ b/demos/org.eclipse.fx.testcases.l10n.app/src/org/eclipse/fx/testcases/l10n/app/SwitchLang.java @@ -13,7 +13,7 @@ package org.eclipse.fx.testcases.l10n.app; -import javax.inject.Named; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.core.services.nls.ILocaleChangeService; diff --git a/demos/org.eclipse.fx.ui.preferences.app/src/main/java/org/eclipse/fx/ui/preferences/app/MainApplication.java b/demos/org.eclipse.fx.ui.preferences.app/src/main/java/org/eclipse/fx/ui/preferences/app/MainApplication.java index 5c5b207ee..6696470bb 100644 --- a/demos/org.eclipse.fx.ui.preferences.app/src/main/java/org/eclipse/fx/ui/preferences/app/MainApplication.java +++ b/demos/org.eclipse.fx.ui.preferences.app/src/main/java/org/eclipse/fx/ui/preferences/app/MainApplication.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.eclipse.fx.ui.preferences.app; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; diff --git a/demos/org.eclipse.fx.ui.preferences.app/src/main/java/org/eclipse/fx/ui/preferences/app/pages/PreferencePageProvider_1.java b/demos/org.eclipse.fx.ui.preferences.app/src/main/java/org/eclipse/fx/ui/preferences/app/pages/PreferencePageProvider_1.java index ca85e9f00..f6a559079 100644 --- a/demos/org.eclipse.fx.ui.preferences.app/src/main/java/org/eclipse/fx/ui/preferences/app/pages/PreferencePageProvider_1.java +++ b/demos/org.eclipse.fx.ui.preferences.app/src/main/java/org/eclipse/fx/ui/preferences/app/pages/PreferencePageProvider_1.java @@ -14,7 +14,7 @@ import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.core.runtime.preferences.DefaultScope; import org.eclipse.core.runtime.preferences.IEclipsePreferences; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.app/src/org/eclipse/fx/code/compensator/app/ApplicationDecorationController.java b/experimental/compensator/org.eclipse.fx.code.compensator.app/src/org/eclipse/fx/code/compensator/app/ApplicationDecorationController.java index cee914adc..83eec89a0 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.app/src/org/eclipse/fx/code/compensator/app/ApplicationDecorationController.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.app/src/org/eclipse/fx/code/compensator/app/ApplicationDecorationController.java @@ -27,7 +27,7 @@ import javafx.stage.WindowEvent; import javafx.util.Duration; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.services.events.IEventBroker; import org.osgi.service.event.Event; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.app/src/org/eclipse/fx/code/compensator/app/DirtyStateTrackerAddon.java b/experimental/compensator/org.eclipse.fx.code.compensator.app/src/org/eclipse/fx/code/compensator/app/DirtyStateTrackerAddon.java index 4534c6eec..71dc70070 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.app/src/org/eclipse/fx/code/compensator/app/DirtyStateTrackerAddon.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.app/src/org/eclipse/fx/code/compensator/app/DirtyStateTrackerAddon.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.eclipse.fx.code.compensator.app; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.core.services.events.IEventBroker; import org.eclipse.e4.ui.model.application.MApplication; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.app/src/org/eclipse/fx/code/compensator/app/ToggleThemeHandler.java b/experimental/compensator/org.eclipse.fx.code.compensator.app/src/org/eclipse/fx/code/compensator/app/ToggleThemeHandler.java index 9c27e67c9..8ff8c73ec 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.app/src/org/eclipse/fx/code/compensator/app/ToggleThemeHandler.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.app/src/org/eclipse/fx/code/compensator/app/ToggleThemeHandler.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.code.compensator.app; -import javax.inject.Named; +import jakarta.inject.Named; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.e4.core.di.annotations.Execute; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/HSLConfiguration.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/HSLConfiguration.java index ad294dbf5..9bb5d7434 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/HSLConfiguration.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/HSLConfiguration.java @@ -16,7 +16,7 @@ import java.net.MalformedURLException; import java.net.URL; -import javax.inject.Inject; +import jakarta.inject.Inject; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.property.ReadOnlyProperty; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/JavaSourceConfiguration.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/JavaSourceConfiguration.java index 0ec22e46e..47208b827 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/JavaSourceConfiguration.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/JavaSourceConfiguration.java @@ -18,7 +18,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.fx.code.compensator.editor.Input; import org.eclipse.fx.code.compensator.editor.ProposalComputer; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.js/src/org/eclipse/fx/code/compensator/editor/js/JavaScriptSourceConfiguration.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.js/src/org/eclipse/fx/code/compensator/editor/js/JavaScriptSourceConfiguration.java index 252b0e93d..63d62a162 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.js/src/org/eclipse/fx/code/compensator/editor/js/JavaScriptSourceConfiguration.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.js/src/org/eclipse/fx/code/compensator/editor/js/JavaScriptSourceConfiguration.java @@ -14,7 +14,7 @@ import java.net.URL; -import javax.inject.Inject; +import jakarta.inject.Inject; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.property.ReadOnlyProperty; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/EditorNavigation.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/EditorNavigation.java index a36687f16..1b2542fc9 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/EditorNavigation.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/EditorNavigation.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.eclipse.fx.code.compensator.editor; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.fx.core.URI; import org.eclipse.fx.ui.services.resources.GraphicsLoader; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/FileOutlineViewer.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/FileOutlineViewer.java index 34b620437..44c03ca43 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/FileOutlineViewer.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/FileOutlineViewer.java @@ -17,9 +17,9 @@ import java.util.WeakHashMap; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.fx.code.compensator.editor.Outline.OutlineItem; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/TextEditor.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/TextEditor.java index cbb6e355f..1605c4220 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/TextEditor.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/TextEditor.java @@ -12,9 +12,9 @@ *******************************************************************************/ package org.eclipse.fx.code.compensator.editor; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.core.services.events.IEventBroker; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/internal/FileInput.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/internal/FileInput.java index dadf6c1f0..3d44b1164 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/internal/FileInput.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/internal/FileInput.java @@ -19,8 +19,8 @@ import java.nio.file.Paths; import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.fx.code.compensator.editor.ContentTypeProvider; import org.eclipse.fx.code.compensator.editor.Input; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.freeedit/src/org/eclipse/fx/code/compensator/freeedit/FileList.java b/experimental/compensator/org.eclipse.fx.code.compensator.freeedit/src/org/eclipse/fx/code/compensator/freeedit/FileList.java index 020a22fd5..c272dde4c 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.freeedit/src/org/eclipse/fx/code/compensator/freeedit/FileList.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.freeedit/src/org/eclipse/fx/code/compensator/freeedit/FileList.java @@ -41,8 +41,8 @@ import javafx.scene.input.TransferMode; import javafx.scene.layout.BorderPane; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.core.commands.Command; import org.eclipse.core.commands.ParameterizedCommand; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.freeedit/src/org/eclipse/fx/code/compensator/freeedit/FileOutline.java b/experimental/compensator/org.eclipse.fx.code.compensator.freeedit/src/org/eclipse/fx/code/compensator/freeedit/FileOutline.java index 4c62e62fe..03f0b04a3 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.freeedit/src/org/eclipse/fx/code/compensator/freeedit/FileOutline.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.freeedit/src/org/eclipse/fx/code/compensator/freeedit/FileOutline.java @@ -19,9 +19,9 @@ import javafx.scene.control.TreeView; import javafx.scene.layout.BorderPane; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.fx.code.compensator.editor.Outline; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.jdt/src/org/eclipse/fx/code/compensator/jdt/JDTOutlineFactory.java b/experimental/compensator/org.eclipse.fx.code.compensator.jdt/src/org/eclipse/fx/code/compensator/jdt/JDTOutlineFactory.java index 31e71d415..dfe6ceee9 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.jdt/src/org/eclipse/fx/code/compensator/jdt/JDTOutlineFactory.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.jdt/src/org/eclipse/fx/code/compensator/jdt/JDTOutlineFactory.java @@ -21,7 +21,7 @@ import javafx.collections.ObservableList; import javafx.scene.Node; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.fx.code.compensator.editor.ContentTypeProvider; import org.eclipse.fx.code.compensator.editor.Input; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.nashorn/src/org/eclipse/fx/code/compensator/nashorn/JSOutline.java b/experimental/compensator/org.eclipse.fx.code.compensator.nashorn/src/org/eclipse/fx/code/compensator/nashorn/JSOutline.java index 804fcc456..07a6108a4 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.nashorn/src/org/eclipse/fx/code/compensator/nashorn/JSOutline.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.nashorn/src/org/eclipse/fx/code/compensator/nashorn/JSOutline.java @@ -18,7 +18,7 @@ import javafx.collections.ObservableList; -import javax.inject.Inject; +import jakarta.inject.Inject; import jdk.nashorn.internal.ir.FunctionNode; import jdk.nashorn.internal.ir.IdentNode; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/src/org/eclipse/fx/code/compensator/project/ci/travis/TravisProjectViewer.java b/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/src/org/eclipse/fx/code/compensator/project/ci/travis/TravisProjectViewer.java index 8fcb96e36..af344bac5 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/src/org/eclipse/fx/code/compensator/project/ci/travis/TravisProjectViewer.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.project.ci.travis/src/org/eclipse/fx/code/compensator/project/ci/travis/TravisProjectViewer.java @@ -17,7 +17,7 @@ import javafx.scene.web.WebErrorEvent; import javafx.scene.web.WebView; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; public class TravisProjectViewer { @PostConstruct diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/handler/NewClassAction.java b/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/handler/NewClassAction.java index f3db20d87..f27b55312 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/handler/NewClassAction.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/handler/NewClassAction.java @@ -24,7 +24,7 @@ import javafx.scene.layout.StackPane; import javafx.stage.Stage; -import javax.inject.Named; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.core.services.events.IEventBroker; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/handler/NewClassPaneController.java b/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/handler/NewClassPaneController.java index f1c161c1f..932286f15 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/handler/NewClassPaneController.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/handler/NewClassPaneController.java @@ -15,8 +15,8 @@ import java.net.URL; import java.util.ResourceBundle; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.fx.code.compensator.project.ProjectNavigatorItem; import org.eclipse.fx.code.compensator.project.jdt.internal.JDTPackageItem; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/handler/OpenServerManagedFile.java b/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/handler/OpenServerManagedFile.java index 7189d0e1d..837542a8e 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/handler/OpenServerManagedFile.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/handler/OpenServerManagedFile.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.code.compensator.project.jdt.handler; -import javax.inject.Named; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/internal/JDTAnnotationModel.java b/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/internal/JDTAnnotationModel.java index de4ff19db..b0b1d48c7 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/internal/JDTAnnotationModel.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/internal/JDTAnnotationModel.java @@ -16,7 +16,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.services.events.IEventBroker; import org.eclipse.fx.code.compensator.editor.Constants; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/internal/JDTInstanceProject.java b/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/internal/JDTInstanceProject.java index 1e2548dbd..1408a580b 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/internal/JDTInstanceProject.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/internal/JDTInstanceProject.java @@ -16,7 +16,7 @@ import java.nio.file.Paths; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.services.events.IEventBroker; import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/internal/JDTProposalComputerFactory.java b/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/internal/JDTProposalComputerFactory.java index e636b88b9..d9629943e 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/internal/JDTProposalComputerFactory.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/internal/JDTProposalComputerFactory.java @@ -21,7 +21,7 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import javafx.scene.Node; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/internal/JDTServerInput.java b/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/internal/JDTServerInput.java index a6a1744db..02f9837ce 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/internal/JDTServerInput.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/internal/JDTServerInput.java @@ -19,8 +19,8 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.fx.code.compensator.editor.ContentTypeProvider; import org.eclipse.fx.code.compensator.editor.Input; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/menu/ImportModuleElement.java b/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/menu/ImportModuleElement.java index a0522badb..24979e325 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/menu/ImportModuleElement.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.project.jdt/src/org/eclipse/fx/code/compensator/project/jdt/menu/ImportModuleElement.java @@ -15,7 +15,7 @@ import java.nio.file.Path; import java.util.concurrent.Future; -import javax.inject.Named; +import jakarta.inject.Named; import org.eclipse.fx.code.compensator.model.workbench.Module; import org.eclipse.fx.code.compensator.model.workbench.Project; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/EditorNavigation.java b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/EditorNavigation.java index 5278967b1..56b2737ab 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/EditorNavigation.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/EditorNavigation.java @@ -23,8 +23,8 @@ import javafx.scene.layout.Pane; import javafx.scene.layout.Priority; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.fx.code.compensator.project.internal.commands.CommitActiveInput; import org.eclipse.fx.core.URI; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/ProjectFileOutline.java b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/ProjectFileOutline.java index 43fafd29b..c714ec4b8 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/ProjectFileOutline.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/ProjectFileOutline.java @@ -23,9 +23,9 @@ import javafx.scene.layout.BorderPane; import javafx.scene.layout.HBox; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.ui.model.application.ui.MUIElement; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/ProjectMainToolbar.java b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/ProjectMainToolbar.java index 55c915dc4..8aa08082c 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/ProjectMainToolbar.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/ProjectMainToolbar.java @@ -26,8 +26,8 @@ import javafx.scene.layout.BorderPane; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.fx.code.compensator.project.ProjectService.ToolbarElement; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/ProjectNavigator.java b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/ProjectNavigator.java index 7e198f178..b38a3e87d 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/ProjectNavigator.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/ProjectNavigator.java @@ -29,8 +29,8 @@ import javafx.scene.layout.BorderPane; import javafx.scene.layout.HBox; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.ui.model.application.ui.MUIElement; import org.eclipse.e4.ui.model.application.ui.basic.MPart; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/ProjectSecondaryToolbar.java b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/ProjectSecondaryToolbar.java index ede8fd9b0..568aeeb1a 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/ProjectSecondaryToolbar.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/ProjectSecondaryToolbar.java @@ -15,7 +15,7 @@ import javafx.scene.control.Label; import javafx.scene.layout.BorderPane; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; public class ProjectSecondaryToolbar { @PostConstruct diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/DynamicContextMenu.java b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/DynamicContextMenu.java index 0d24223ec..fbc4bbc4f 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/DynamicContextMenu.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/DynamicContextMenu.java @@ -15,7 +15,7 @@ import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import org.eclipse.e4.ui.di.AboutToShow; import org.eclipse.e4.ui.model.application.ui.menu.MDirectMenuItem; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/ProjectSetupServiceImpl.java b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/ProjectSetupServiceImpl.java index f56698950..aa57884f9 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/ProjectSetupServiceImpl.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/ProjectSetupServiceImpl.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.ui.model.application.MApplication; import org.eclipse.e4.ui.model.application.ui.MUIElement; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/CommitActiveInput.java b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/CommitActiveInput.java index 539311978..24173e25f 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/CommitActiveInput.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/CommitActiveInput.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.code.compensator.project.internal.commands; -import javax.inject.Named; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.fx.code.compensator.editor.VCSInput; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/OpenProject.java b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/OpenProject.java index 30b8eacdd..a10bcc9cd 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/OpenProject.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/OpenProject.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.code.compensator.project.internal.commands; -import javax.inject.Named; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.ui.model.application.MApplication; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/OpenProjectDialog.java b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/OpenProjectDialog.java index 20110b025..900fb689e 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/OpenProjectDialog.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/OpenProjectDialog.java @@ -15,7 +15,7 @@ import java.util.Collections; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.fx.code.compensator.model.workbench.Project; diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/OpenResource.java b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/OpenResource.java index f378162dd..8cfeb2f3a 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/OpenResource.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.project/src/org/eclipse/fx/code/compensator/project/internal/commands/OpenResource.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.code.compensator.project.internal.commands; -import javax.inject.Named; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective; diff --git a/experimental/compensator/org.eclipse.fx.code.editor.hsl/src/org/eclipse/fx/code/editor/hsl/HSLConfiguration.java b/experimental/compensator/org.eclipse.fx.code.editor.hsl/src/org/eclipse/fx/code/editor/hsl/HSLConfiguration.java index a9133e18c..3d592008f 100644 --- a/experimental/compensator/org.eclipse.fx.code.editor.hsl/src/org/eclipse/fx/code/editor/hsl/HSLConfiguration.java +++ b/experimental/compensator/org.eclipse.fx.code.editor.hsl/src/org/eclipse/fx/code/editor/hsl/HSLConfiguration.java @@ -16,7 +16,7 @@ import java.util.List; import java.util.concurrent.ExecutionException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.fx.code.compensator.editor.Input; diff --git a/experimental/swt/org.eclipse.fx.sample.singlesource.views/src/org/eclipse/fx/sample/singlesource/views/JFaceHelloWorld.java b/experimental/swt/org.eclipse.fx.sample.singlesource.views/src/org/eclipse/fx/sample/singlesource/views/JFaceHelloWorld.java index 3a3a2c893..20fc608f2 100644 --- a/experimental/swt/org.eclipse.fx.sample.singlesource.views/src/org/eclipse/fx/sample/singlesource/views/JFaceHelloWorld.java +++ b/experimental/swt/org.eclipse.fx.sample.singlesource.views/src/org/eclipse/fx/sample/singlesource/views/JFaceHelloWorld.java @@ -14,7 +14,7 @@ import java.io.File; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.JFaceResources; diff --git a/experimental/swt/org.eclipse.fx.sample.singlesource.views/src/org/eclipse/fx/sample/singlesource/views/SWTHelloWorld.java b/experimental/swt/org.eclipse.fx.sample.singlesource.views/src/org/eclipse/fx/sample/singlesource/views/SWTHelloWorld.java index 8e89059c0..f60ed36c4 100644 --- a/experimental/swt/org.eclipse.fx.sample.singlesource.views/src/org/eclipse/fx/sample/singlesource/views/SWTHelloWorld.java +++ b/experimental/swt/org.eclipse.fx.sample.singlesource.views/src/org/eclipse/fx/sample/singlesource/views/SWTHelloWorld.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.sample.singlesource.views; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Font; diff --git a/modules/code/org.eclipse.fx.code.editor.asciidoc.fx.e4/src/org/eclipse/fx/code/editor/asciidoc/fx/e4/AsciiDoctorEditorOpenerTypeProvider.java b/modules/code/org.eclipse.fx.code.editor.asciidoc.fx.e4/src/org/eclipse/fx/code/editor/asciidoc/fx/e4/AsciiDoctorEditorOpenerTypeProvider.java index dba73bbde..40fea9571 100644 --- a/modules/code/org.eclipse.fx.code.editor.asciidoc.fx.e4/src/org/eclipse/fx/code/editor/asciidoc/fx/e4/AsciiDoctorEditorOpenerTypeProvider.java +++ b/modules/code/org.eclipse.fx.code.editor.asciidoc.fx.e4/src/org/eclipse/fx/code/editor/asciidoc/fx/e4/AsciiDoctorEditorOpenerTypeProvider.java @@ -14,7 +14,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.core.di.annotations.Optional; diff --git a/modules/code/org.eclipse.fx.code.editor.asciidoc.fx.e4/src/org/eclipse/fx/code/editor/asciidoc/fx/e4/EditorDelegate.java b/modules/code/org.eclipse.fx.code.editor.asciidoc.fx.e4/src/org/eclipse/fx/code/editor/asciidoc/fx/e4/EditorDelegate.java index ba9e1b19d..65c123c1d 100644 --- a/modules/code/org.eclipse.fx.code.editor.asciidoc.fx.e4/src/org/eclipse/fx/code/editor/asciidoc/fx/e4/EditorDelegate.java +++ b/modules/code/org.eclipse.fx.code.editor.asciidoc.fx.e4/src/org/eclipse/fx/code/editor/asciidoc/fx/e4/EditorDelegate.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.code.editor.asciidoc.fx.e4; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.ui.di.Persist; diff --git a/modules/code/org.eclipse.fx.code.editor.asciidoc.fx/src/org/eclipse/fx/code/editor/asciidoc/fx/AsciiDoctorPreviewer.java b/modules/code/org.eclipse.fx.code.editor.asciidoc.fx/src/org/eclipse/fx/code/editor/asciidoc/fx/AsciiDoctorPreviewer.java index 65bb6c9a6..fb04712d5 100644 --- a/modules/code/org.eclipse.fx.code.editor.asciidoc.fx/src/org/eclipse/fx/code/editor/asciidoc/fx/AsciiDoctorPreviewer.java +++ b/modules/code/org.eclipse.fx.code.editor.asciidoc.fx/src/org/eclipse/fx/code/editor/asciidoc/fx/AsciiDoctorPreviewer.java @@ -15,9 +15,9 @@ import java.util.concurrent.CompletableFuture; import java.util.function.Consumer; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.fx.code.editor.Constants; diff --git a/modules/code/org.eclipse.fx.code.editor.configuration.text.fx/src/org/eclipse/fx/code/editor/configuration/text/fx/ConfigurationPresentationReconciler.java b/modules/code/org.eclipse.fx.code.editor.configuration.text.fx/src/org/eclipse/fx/code/editor/configuration/text/fx/ConfigurationPresentationReconciler.java index 2b8878bde..c7f0be3d6 100644 --- a/modules/code/org.eclipse.fx.code.editor.configuration.text.fx/src/org/eclipse/fx/code/editor/configuration/text/fx/ConfigurationPresentationReconciler.java +++ b/modules/code/org.eclipse.fx.code.editor.configuration.text.fx/src/org/eclipse/fx/code/editor/configuration/text/fx/ConfigurationPresentationReconciler.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.fx.code.editor.Input; diff --git a/modules/code/org.eclipse.fx.code.editor.configuration.text/src/org/eclipse/fx/code/editor/configuration/text/ConfigurationPartitioner.java b/modules/code/org.eclipse.fx.code.editor.configuration.text/src/org/eclipse/fx/code/editor/configuration/text/ConfigurationPartitioner.java index f31263271..fa0339f22 100644 --- a/modules/code/org.eclipse.fx.code.editor.configuration.text/src/org/eclipse/fx/code/editor/configuration/text/ConfigurationPartitioner.java +++ b/modules/code/org.eclipse.fx.code.editor.configuration.text/src/org/eclipse/fx/code/editor/configuration/text/ConfigurationPartitioner.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.fx.code.editor.Input; import org.eclipse.fx.code.editor.InputContext; diff --git a/modules/code/org.eclipse.fx.code.editor.e4/src/org/eclipse/fx/code/editor/e4/addons/DirtyStateTrackingAddon.java b/modules/code/org.eclipse.fx.code.editor.e4/src/org/eclipse/fx/code/editor/e4/addons/DirtyStateTrackingAddon.java index 0d972eae5..bc684adc8 100644 --- a/modules/code/org.eclipse.fx.code.editor.e4/src/org/eclipse/fx/code/editor/e4/addons/DirtyStateTrackingAddon.java +++ b/modules/code/org.eclipse.fx.code.editor.e4/src/org/eclipse/fx/code/editor/e4/addons/DirtyStateTrackingAddon.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.eclipse.fx.code.editor.e4.addons; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.core.services.events.IEventBroker; import org.eclipse.e4.ui.model.application.MApplication; diff --git a/modules/code/org.eclipse.fx.code.editor.e4/src/org/eclipse/fx/code/editor/e4/handlers/SaveFile.java b/modules/code/org.eclipse.fx.code.editor.e4/src/org/eclipse/fx/code/editor/e4/handlers/SaveFile.java index 8828c3e72..b1aadbfa5 100644 --- a/modules/code/org.eclipse.fx.code.editor.e4/src/org/eclipse/fx/code/editor/e4/handlers/SaveFile.java +++ b/modules/code/org.eclipse.fx.code.editor.e4/src/org/eclipse/fx/code/editor/e4/handlers/SaveFile.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.code.editor.e4.handlers; -import javax.inject.Named; +import jakarta.inject.Named; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; diff --git a/modules/code/org.eclipse.fx.code.editor.fx.e4/src/org/eclipse/fx/code/editor/fx/e4/internal/EditorContainerServiceContextFunction.java b/modules/code/org.eclipse.fx.code.editor.fx.e4/src/org/eclipse/fx/code/editor/fx/e4/internal/EditorContainerServiceContextFunction.java index ab26bf792..10df443b9 100644 --- a/modules/code/org.eclipse.fx.code.editor.fx.e4/src/org/eclipse/fx/code/editor/fx/e4/internal/EditorContainerServiceContextFunction.java +++ b/modules/code/org.eclipse.fx.code.editor.fx.e4/src/org/eclipse/fx/code/editor/fx/e4/internal/EditorContainerServiceContextFunction.java @@ -15,7 +15,7 @@ import java.util.Collections; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.ContextFunction; import org.eclipse.e4.core.contexts.ContextInjectionFactory; diff --git a/modules/code/org.eclipse.fx.code.editor.fx.e4/src/org/eclipse/fx/code/editor/fx/e4/internal/EditorContextMenuProviderTypeProviderContextFunction.java b/modules/code/org.eclipse.fx.code.editor.fx.e4/src/org/eclipse/fx/code/editor/fx/e4/internal/EditorContextMenuProviderTypeProviderContextFunction.java index 75fb3aebc..f8106d6f2 100644 --- a/modules/code/org.eclipse.fx.code.editor.fx.e4/src/org/eclipse/fx/code/editor/fx/e4/internal/EditorContextMenuProviderTypeProviderContextFunction.java +++ b/modules/code/org.eclipse.fx.code.editor.fx.e4/src/org/eclipse/fx/code/editor/fx/e4/internal/EditorContextMenuProviderTypeProviderContextFunction.java @@ -14,7 +14,7 @@ import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IContextFunction; diff --git a/modules/code/org.eclipse.fx.code.editor.fx.e4/src/org/eclipse/fx/code/editor/fx/e4/internal/EditorOpenerContextFunction.java b/modules/code/org.eclipse.fx.code.editor.fx.e4/src/org/eclipse/fx/code/editor/fx/e4/internal/EditorOpenerContextFunction.java index e58383800..d604b6265 100644 --- a/modules/code/org.eclipse.fx.code.editor.fx.e4/src/org/eclipse/fx/code/editor/fx/e4/internal/EditorOpenerContextFunction.java +++ b/modules/code/org.eclipse.fx.code.editor.fx.e4/src/org/eclipse/fx/code/editor/fx/e4/internal/EditorOpenerContextFunction.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IContextFunction; diff --git a/modules/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/FilesystemViewer.java b/modules/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/FilesystemViewer.java index e7fda9417..2be31db09 100644 --- a/modules/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/FilesystemViewer.java +++ b/modules/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/FilesystemViewer.java @@ -19,9 +19,9 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.inject.Inject; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import org.eclipse.fx.code.editor.services.EditorOpener; import org.eclipse.fx.core.preferences.Preference; diff --git a/modules/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/OutlineViewer.java b/modules/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/OutlineViewer.java index 6fbab794a..685d3f7c0 100644 --- a/modules/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/OutlineViewer.java +++ b/modules/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/OutlineViewer.java @@ -19,8 +19,8 @@ import java.util.WeakHashMap; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.fx.code.editor.fx.services.Outline; diff --git a/modules/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/TextEditor.java b/modules/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/TextEditor.java index 76226aa07..e93587f98 100644 --- a/modules/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/TextEditor.java +++ b/modules/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/TextEditor.java @@ -16,9 +16,9 @@ import java.util.List; import java.util.function.Consumer; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.ui.di.Focus; diff --git a/modules/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/handlers/SetTabAdvance.java b/modules/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/handlers/SetTabAdvance.java index f590be67e..00f271774 100644 --- a/modules/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/handlers/SetTabAdvance.java +++ b/modules/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/handlers/SetTabAdvance.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.code.editor.fx.handlers; -import javax.inject.Named; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.fx.code.editor.Constants; diff --git a/modules/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/handlers/ToggleEditorFeature.java b/modules/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/handlers/ToggleEditorFeature.java index 5cbdc2fbb..cc6ed4725 100644 --- a/modules/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/handlers/ToggleEditorFeature.java +++ b/modules/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/handlers/ToggleEditorFeature.java @@ -16,7 +16,7 @@ import java.util.HashSet; import java.util.Set; -import javax.inject.Named; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.fx.code.editor.Constants; diff --git a/modules/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/services/internal/DefaultSourceViewerConfiguration.java b/modules/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/services/internal/DefaultSourceViewerConfiguration.java index 11fd97240..ac1a03d11 100644 --- a/modules/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/services/internal/DefaultSourceViewerConfiguration.java +++ b/modules/code/org.eclipse.fx.code.editor.fx/src/org/eclipse/fx/code/editor/fx/services/internal/DefaultSourceViewerConfiguration.java @@ -22,7 +22,7 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.fx.code.editor.Constants; diff --git a/modules/code/org.eclipse.fx.code.editor/src/org/eclipse/fx/code/editor/LocalSourceFileInput.java b/modules/code/org.eclipse.fx.code.editor/src/org/eclipse/fx/code/editor/LocalSourceFileInput.java index ed013aeb0..748161f2e 100644 --- a/modules/code/org.eclipse.fx.code.editor/src/org/eclipse/fx/code/editor/LocalSourceFileInput.java +++ b/modules/code/org.eclipse.fx.code.editor/src/org/eclipse/fx/code/editor/LocalSourceFileInput.java @@ -20,10 +20,10 @@ import java.util.HashMap; import java.util.Map; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.fx.core.adapter.Adapt; diff --git a/modules/code/org.eclipse.fx.code.editor/src/org/eclipse/fx/code/editor/services/InputDocument.java b/modules/code/org.eclipse.fx.code.editor/src/org/eclipse/fx/code/editor/services/InputDocument.java index 0e7854e4e..d1105792c 100644 --- a/modules/code/org.eclipse.fx.code.editor/src/org/eclipse/fx/code/editor/services/InputDocument.java +++ b/modules/code/org.eclipse.fx.code.editor/src/org/eclipse/fx/code/editor/services/InputDocument.java @@ -12,9 +12,9 @@ *******************************************************************************/ package org.eclipse.fx.code.editor.services; -import javax.annotation.PreDestroy; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.fx.code.editor.Constants; import org.eclipse.fx.code.editor.SourceFileInput; diff --git a/modules/core/org.eclipse.fx.core.di.context.tests/src/org/eclipse/fx/core/di/context/tests/AdaptSupplierTestCase.java b/modules/core/org.eclipse.fx.core.di.context.tests/src/org/eclipse/fx/core/di/context/tests/AdaptSupplierTestCase.java index 61fbc62de..63bd7339c 100644 --- a/modules/core/org.eclipse.fx.core.di.context.tests/src/org/eclipse/fx/core/di/context/tests/AdaptSupplierTestCase.java +++ b/modules/core/org.eclipse.fx.core.di.context.tests/src/org/eclipse/fx/core/di/context/tests/AdaptSupplierTestCase.java @@ -19,9 +19,9 @@ import java.util.List; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Named; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.xml.bind.annotation.XmlRootElement; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.EclipseContextFactory; diff --git a/modules/core/org.eclipse.fx.core.di.context.tests/src/org/eclipse/fx/core/di/context/tests/ContextBoundValueTestCase.java b/modules/core/org.eclipse.fx.core.di.context.tests/src/org/eclipse/fx/core/di/context/tests/ContextBoundValueTestCase.java index 11a1195bc..f56d3f6d5 100644 --- a/modules/core/org.eclipse.fx.core.di.context.tests/src/org/eclipse/fx/core/di/context/tests/ContextBoundValueTestCase.java +++ b/modules/core/org.eclipse.fx.core.di.context.tests/src/org/eclipse/fx/core/di/context/tests/ContextBoundValueTestCase.java @@ -21,9 +21,9 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.core.databinding.observable.Realm; import org.eclipse.core.databinding.observable.value.IObservableValue; diff --git a/modules/core/org.eclipse.fx.core.di.context.tests/src/org/eclipse/fx/core/di/context/tests/LocalInstanceTestCase.java b/modules/core/org.eclipse.fx.core.di.context.tests/src/org/eclipse/fx/core/di/context/tests/LocalInstanceTestCase.java index 989c66a7e..5113cb45a 100644 --- a/modules/core/org.eclipse.fx.core.di.context.tests/src/org/eclipse/fx/core/di/context/tests/LocalInstanceTestCase.java +++ b/modules/core/org.eclipse.fx.core.di.context.tests/src/org/eclipse/fx/core/di/context/tests/LocalInstanceTestCase.java @@ -12,9 +12,9 @@ *******************************************************************************/ package org.eclipse.fx.core.di.context.tests; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.EclipseContextFactory; diff --git a/modules/core/org.eclipse.fx.core.di.context.tests/src/org/eclipse/fx/core/di/context/tests/LoggerTestCase.java b/modules/core/org.eclipse.fx.core.di.context.tests/src/org/eclipse/fx/core/di/context/tests/LoggerTestCase.java index 6d2c791c1..dc3c0c4eb 100644 --- a/modules/core/org.eclipse.fx.core.di.context.tests/src/org/eclipse/fx/core/di/context/tests/LoggerTestCase.java +++ b/modules/core/org.eclipse.fx.core.di.context.tests/src/org/eclipse/fx/core/di/context/tests/LoggerTestCase.java @@ -14,7 +14,7 @@ import static org.junit.Assert.assertNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.EclipseContextFactory; diff --git a/modules/core/org.eclipse.fx.core.di.context.tests/src/org/eclipse/fx/core/di/context/tests/PreferenceValueTestCase.java b/modules/core/org.eclipse.fx.core.di.context.tests/src/org/eclipse/fx/core/di/context/tests/PreferenceValueTestCase.java index f51b2278b..41e200c6e 100644 --- a/modules/core/org.eclipse.fx.core.di.context.tests/src/org/eclipse/fx/core/di/context/tests/PreferenceValueTestCase.java +++ b/modules/core/org.eclipse.fx.core.di.context.tests/src/org/eclipse/fx/core/di/context/tests/PreferenceValueTestCase.java @@ -15,8 +15,8 @@ import java.time.Instant; import java.util.UUID; -import javax.inject.Inject; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.inject.Inject; +import jakarta.xml.bind.annotation.XmlRootElement; import org.eclipse.core.runtime.preferences.ConfigurationScope; import org.eclipse.core.runtime.preferences.IEclipsePreferences; diff --git a/modules/core/org.eclipse.fx.core.di.context.tests/src/org/eclipse/fx/core/di/context/tests/ServiceSupplierTestCase.java b/modules/core/org.eclipse.fx.core.di.context.tests/src/org/eclipse/fx/core/di/context/tests/ServiceSupplierTestCase.java index 7d65e92ca..2b0f39776 100644 --- a/modules/core/org.eclipse.fx.core.di.context.tests/src/org/eclipse/fx/core/di/context/tests/ServiceSupplierTestCase.java +++ b/modules/core/org.eclipse.fx.core.di.context.tests/src/org/eclipse/fx/core/di/context/tests/ServiceSupplierTestCase.java @@ -21,7 +21,7 @@ import java.util.Hashtable; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.EclipseContextFactory; diff --git a/modules/core/org.eclipse.fx.core.di.context/src/main/java/org/eclipse/fx/core/di/context/internal/AdaptValueSupplier.java b/modules/core/org.eclipse.fx.core.di.context/src/main/java/org/eclipse/fx/core/di/context/internal/AdaptValueSupplier.java index d2a49dd42..f6bdb0663 100644 --- a/modules/core/org.eclipse.fx.core.di.context/src/main/java/org/eclipse/fx/core/di/context/internal/AdaptValueSupplier.java +++ b/modules/core/org.eclipse.fx.core.di.context/src/main/java/org/eclipse/fx/core/di/context/internal/AdaptValueSupplier.java @@ -19,8 +19,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.core.contexts.RunAndTrack; diff --git a/modules/core/org.eclipse.fx.core.di.context/src/main/java/org/eclipse/fx/core/di/context/internal/EclipseContextBoundValue.java b/modules/core/org.eclipse.fx.core.di.context/src/main/java/org/eclipse/fx/core/di/context/internal/EclipseContextBoundValue.java index d826c7626..a7a110182 100644 --- a/modules/core/org.eclipse.fx.core.di.context/src/main/java/org/eclipse/fx/core/di/context/internal/EclipseContextBoundValue.java +++ b/modules/core/org.eclipse.fx.core.di.context/src/main/java/org/eclipse/fx/core/di/context/internal/EclipseContextBoundValue.java @@ -16,8 +16,8 @@ import java.util.Collections; import java.util.List; -import javax.annotation.PreDestroy; -import javax.inject.Inject; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.core.contexts.RunAndTrack; diff --git a/modules/core/org.eclipse.fx.core.di.context/src/main/java/org/eclipse/fx/core/di/context/internal/FXMLLoaderTypeProvider.java b/modules/core/org.eclipse.fx.core.di.context/src/main/java/org/eclipse/fx/core/di/context/internal/FXMLLoaderTypeProvider.java index 25620d794..c5f443115 100644 --- a/modules/core/org.eclipse.fx.core.di.context/src/main/java/org/eclipse/fx/core/di/context/internal/FXMLLoaderTypeProvider.java +++ b/modules/core/org.eclipse.fx.core.di.context/src/main/java/org/eclipse/fx/core/di/context/internal/FXMLLoaderTypeProvider.java @@ -15,8 +15,8 @@ import java.lang.reflect.Modifier; import java.lang.reflect.Type; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; diff --git a/modules/core/org.eclipse.fx.core.di.context/src/main/java/org/eclipse/fx/core/di/context/internal/LocalInstanceObjectSupplier.java b/modules/core/org.eclipse.fx.core.di.context/src/main/java/org/eclipse/fx/core/di/context/internal/LocalInstanceObjectSupplier.java index 595909040..69ed8b83d 100644 --- a/modules/core/org.eclipse.fx.core.di.context/src/main/java/org/eclipse/fx/core/di/context/internal/LocalInstanceObjectSupplier.java +++ b/modules/core/org.eclipse.fx.core.di.context/src/main/java/org/eclipse/fx/core/di/context/internal/LocalInstanceObjectSupplier.java @@ -19,7 +19,7 @@ import java.util.Optional; import java.util.function.Supplier; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.EclipseContextFactory; diff --git a/modules/core/org.eclipse.fx.core.di.context/src/main/java/org/eclipse/fx/core/di/context/internal/PreferenceValue.java b/modules/core/org.eclipse.fx.core.di.context/src/main/java/org/eclipse/fx/core/di/context/internal/PreferenceValue.java index 116eabd32..5e0cd79d1 100644 --- a/modules/core/org.eclipse.fx.core.di.context/src/main/java/org/eclipse/fx/core/di/context/internal/PreferenceValue.java +++ b/modules/core/org.eclipse.fx.core.di.context/src/main/java/org/eclipse/fx/core/di/context/internal/PreferenceValue.java @@ -18,8 +18,8 @@ import java.util.List; import java.util.Set; -import javax.annotation.PreDestroy; -import javax.inject.Inject; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import org.eclipse.core.runtime.preferences.ConfigurationScope; import org.eclipse.core.runtime.preferences.DefaultScope; diff --git a/modules/core/org.eclipse.fx.core.di/src/main/java/org/eclipse/fx/core/di/ContextValue.java b/modules/core/org.eclipse.fx.core.di/src/main/java/org/eclipse/fx/core/di/ContextValue.java index 800c4fe95..1207fa0f4 100644 --- a/modules/core/org.eclipse.fx.core.di/src/main/java/org/eclipse/fx/core/di/ContextValue.java +++ b/modules/core/org.eclipse.fx.core.di/src/main/java/org/eclipse/fx/core/di/ContextValue.java @@ -18,7 +18,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import org.eclipse.jdt.annotation.NonNull; diff --git a/modules/core/org.eclipse.fx.core.di/src/main/java/org/eclipse/fx/core/di/LocalInstance.java b/modules/core/org.eclipse.fx.core.di/src/main/java/org/eclipse/fx/core/di/LocalInstance.java index 6aad83d95..f18c822eb 100644 --- a/modules/core/org.eclipse.fx.core.di/src/main/java/org/eclipse/fx/core/di/LocalInstance.java +++ b/modules/core/org.eclipse.fx.core.di/src/main/java/org/eclipse/fx/core/di/LocalInstance.java @@ -18,7 +18,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import org.eclipse.fx.core.TypeTypeProviderService; diff --git a/modules/core/org.eclipse.fx.core.di/src/main/java/org/eclipse/fx/core/di/Service.java b/modules/core/org.eclipse.fx.core.di/src/main/java/org/eclipse/fx/core/di/Service.java index 655741f85..beb72f963 100644 --- a/modules/core/org.eclipse.fx.core.di/src/main/java/org/eclipse/fx/core/di/Service.java +++ b/modules/core/org.eclipse.fx.core.di/src/main/java/org/eclipse/fx/core/di/Service.java @@ -18,7 +18,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import org.eclipse.fx.core.observable.ValueObservable.OString; diff --git a/modules/core/org.eclipse.fx.core.log4j/src/main/java/org/eclipse/fx/core/log4j/Log4JLoggerFactory.java b/modules/core/org.eclipse.fx.core.log4j/src/main/java/org/eclipse/fx/core/log4j/Log4JLoggerFactory.java index 01a4125d2..a25e24dc8 100755 --- a/modules/core/org.eclipse.fx.core.log4j/src/main/java/org/eclipse/fx/core/log4j/Log4JLoggerFactory.java +++ b/modules/core/org.eclipse.fx.core.log4j/src/main/java/org/eclipse/fx/core/log4j/Log4JLoggerFactory.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.core.log4j; -import javax.inject.Provider; +import jakarta.inject.Provider; import org.apache.log4j.Appender; import org.apache.log4j.PropertyConfigurator; diff --git a/modules/core/org.eclipse.fx.core.slf4j/src/main/java/org/eclipse/fx/core/slf4j/Slf4JLoggerFactory.java b/modules/core/org.eclipse.fx.core.slf4j/src/main/java/org/eclipse/fx/core/slf4j/Slf4JLoggerFactory.java index 116785c0b..bcee4fd18 100644 --- a/modules/core/org.eclipse.fx.core.slf4j/src/main/java/org/eclipse/fx/core/slf4j/Slf4JLoggerFactory.java +++ b/modules/core/org.eclipse.fx.core.slf4j/src/main/java/org/eclipse/fx/core/slf4j/Slf4JLoggerFactory.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.core.slf4j; -import javax.inject.Provider; +import jakarta.inject.Provider; import org.eclipse.fx.core.RankedService; import org.eclipse.fx.core.log.Logger; diff --git a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/DisposeableCollector.java b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/DisposeableCollector.java index d4052aa39..8dbf50369 100644 --- a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/DisposeableCollector.java +++ b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/DisposeableCollector.java @@ -16,7 +16,7 @@ import java.util.List; import java.util.function.Consumer; -import javax.annotation.PreDestroy; +import jakarta.annotation.PreDestroy; /** * Base class to implementation disposeable objects diff --git a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/adapter/Adapt.java b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/adapter/Adapt.java index 2a1aedf50..3e9d756e6 100644 --- a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/adapter/Adapt.java +++ b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/adapter/Adapt.java @@ -18,7 +18,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * Adapt the value using the {@link AdapterService} diff --git a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/JAXBObjectSerializer.java b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/JAXBObjectSerializer.java index 54a9e4d8b..cea2e37eb 100644 --- a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/JAXBObjectSerializer.java +++ b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/JAXBObjectSerializer.java @@ -21,10 +21,10 @@ import java.util.Set; import java.util.function.Supplier; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.annotation.XmlRootElement; import org.eclipse.fx.core.ObjectSerializer; import org.osgi.service.component.annotations.Component; diff --git a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/JUtilLoggerFactory.java b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/JUtilLoggerFactory.java index 9a4bea229..3c487d7ca 100755 --- a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/JUtilLoggerFactory.java +++ b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/JUtilLoggerFactory.java @@ -16,7 +16,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Handler; -import javax.inject.Provider; +import jakarta.inject.Provider; import org.eclipse.fx.core.RankedService; import org.eclipse.fx.core.log.Logger; diff --git a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/JavaDSServiceProcessor.java b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/JavaDSServiceProcessor.java index 1df50c754..71873a670 100644 --- a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/JavaDSServiceProcessor.java +++ b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/JavaDSServiceProcessor.java @@ -31,8 +31,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Unmarshaller; import org.eclipse.fx.core.IOUtils; import org.eclipse.fx.core.KeyValueStore; diff --git a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Component.java b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Component.java index 4687c597d..6cb3c0cd9 100644 --- a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Component.java +++ b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Component.java @@ -17,8 +17,8 @@ import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlAttribute; import javax.xml.namespace.QName; /** diff --git a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Component10.java b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Component10.java index 2c51ec517..be4c90493 100644 --- a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Component10.java +++ b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Component10.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.core.internal.sm; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * Component in version 1.0.0 diff --git a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Component11.java b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Component11.java index 7991d66dd..2b23a3f73 100644 --- a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Component11.java +++ b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Component11.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.core.internal.sm; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * Component in version 1.1.0 diff --git a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Component12.java b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Component12.java index 1313175b3..ff4309c51 100644 --- a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Component12.java +++ b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Component12.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.core.internal.sm; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * Component in version 1.2.0 diff --git a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Component13.java b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Component13.java index cf2497467..168bfe233 100644 --- a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Component13.java +++ b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Component13.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.core.internal.sm; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * Component in version 1.3.0 diff --git a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Component14.java b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Component14.java index 0a3ca31e2..04634c115 100644 --- a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Component14.java +++ b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Component14.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.core.internal.sm; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * Component in version 1.4.0 diff --git a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Implementation.java b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Implementation.java index 882ec92af..251b0f62e 100644 --- a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Implementation.java +++ b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Implementation.java @@ -15,8 +15,8 @@ import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlAttribute; import javax.xml.namespace.QName; /** diff --git a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Properties.java b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Properties.java index 5f552fce1..ca53465d9 100644 --- a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Properties.java +++ b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Properties.java @@ -15,8 +15,8 @@ import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlAttribute; import javax.xml.namespace.QName; /** diff --git a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Property.java b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Property.java index 060c70288..90f9cd780 100644 --- a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Property.java +++ b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Property.java @@ -15,8 +15,8 @@ import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlAttribute; import javax.xml.namespace.QName; /** diff --git a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Provide.java b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Provide.java index be1e11449..f0411daca 100644 --- a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Provide.java +++ b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Provide.java @@ -15,8 +15,8 @@ import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlAttribute; import javax.xml.namespace.QName; /** diff --git a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Reference.java b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Reference.java index b28c88767..830d8d6d1 100644 --- a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Reference.java +++ b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Reference.java @@ -15,8 +15,8 @@ import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlAttribute; import javax.xml.namespace.QName; /** diff --git a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Service.java b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Service.java index 032a249e0..33043978f 100644 --- a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Service.java +++ b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/internal/sm/Service.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAnyAttribute; +import jakarta.xml.bind.annotation.XmlAnyAttribute; import javax.xml.namespace.QName; /** diff --git a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/log/Log.java b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/log/Log.java index eb1043293..f4d7e7309 100755 --- a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/log/Log.java +++ b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/log/Log.java @@ -18,7 +18,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** * Annotation to request a logger diff --git a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/observable/SubscriptionRegistry.java b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/observable/SubscriptionRegistry.java index f92e570c9..1d2b08f00 100644 --- a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/observable/SubscriptionRegistry.java +++ b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/observable/SubscriptionRegistry.java @@ -19,7 +19,7 @@ import java.util.function.Function; import java.util.function.IntFunction; -import javax.annotation.PreDestroy; +import jakarta.annotation.PreDestroy; import org.eclipse.fx.core.Subscription; import org.eclipse.fx.core.ThreadSynchronize; diff --git a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/preferences/Preference.java b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/preferences/Preference.java index b2ba5574f..44ad82241 100644 --- a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/preferences/Preference.java +++ b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/preferences/Preference.java @@ -18,7 +18,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; /** *

diff --git a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/text/AbstractTextRegistry.java b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/text/AbstractTextRegistry.java index b708478d0..85fa04e8d 100644 --- a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/text/AbstractTextRegistry.java +++ b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/text/AbstractTextRegistry.java @@ -16,7 +16,7 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.annotation.PreDestroy; +import jakarta.annotation.PreDestroy; import org.eclipse.fx.core.Subscription; diff --git a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/text/DateFormatter.java b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/text/DateFormatter.java index 396699bf6..1c4a3e72c 100644 --- a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/text/DateFormatter.java +++ b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/text/DateFormatter.java @@ -15,7 +15,7 @@ import java.text.SimpleDateFormat; import java.util.Date; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; diff --git a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/text/NumberFormatter.java b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/text/NumberFormatter.java index 45923c8a8..cbc411762 100644 --- a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/text/NumberFormatter.java +++ b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/text/NumberFormatter.java @@ -15,7 +15,7 @@ import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; diff --git a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/text/TemporalAccessorFormatter.java b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/text/TemporalAccessorFormatter.java index 133ed5f38..6cd6c13f4 100644 --- a/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/text/TemporalAccessorFormatter.java +++ b/modules/core/org.eclipse.fx.core/src/main/java/org/eclipse/fx/core/text/TemporalAccessorFormatter.java @@ -15,7 +15,7 @@ import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAccessor; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; diff --git a/modules/ui/org.eclipse.fx.ui.di.interopt/src/org/eclipse/fx/ui/di/interopt/CommandServiceImpl.java b/modules/ui/org.eclipse.fx.ui.di.interopt/src/org/eclipse/fx/ui/di/interopt/CommandServiceImpl.java index 22fb337c5..7c62b4578 100644 --- a/modules/ui/org.eclipse.fx.ui.di.interopt/src/org/eclipse/fx/ui/di/interopt/CommandServiceImpl.java +++ b/modules/ui/org.eclipse.fx.ui.di.interopt/src/org/eclipse/fx/ui/di/interopt/CommandServiceImpl.java @@ -20,9 +20,9 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import org.eclipse.core.commands.ParameterizedCommand; import org.eclipse.e4.core.commands.ECommandService; diff --git a/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/FXMLLoader.java b/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/FXMLLoader.java index c83a4d8ca..d7a8cbec0 100755 --- a/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/FXMLLoader.java +++ b/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/FXMLLoader.java @@ -18,7 +18,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; import org.eclipse.fx.core.fxml.ExtendedFXMLLoader; diff --git a/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/internal/ResourceServiceImpl.java b/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/internal/ResourceServiceImpl.java index a99866ed9..0ffd92b45 100755 --- a/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/internal/ResourceServiceImpl.java +++ b/modules/ui/org.eclipse.fx.ui.di/src/main/java/org/eclipse/fx/ui/di/internal/ResourceServiceImpl.java @@ -21,8 +21,8 @@ import javafx.scene.image.Image; -import javax.annotation.PreDestroy; -import javax.inject.Inject; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import org.eclipse.fx.core.log.LoggerCreator; import org.eclipse.fx.ui.di.ResourceProviderService; diff --git a/modules/ui/org.eclipse.fx.ui.keybindings.e4/src/main/java/org/eclipse/fx/ui/keybindings/e4/BindingProcessingAddon.java b/modules/ui/org.eclipse.fx.ui.keybindings.e4/src/main/java/org/eclipse/fx/ui/keybindings/e4/BindingProcessingAddon.java index 1d165b960..2ffb19554 100755 --- a/modules/ui/org.eclipse.fx.ui.keybindings.e4/src/main/java/org/eclipse/fx/ui/keybindings/e4/BindingProcessingAddon.java +++ b/modules/ui/org.eclipse.fx.ui.keybindings.e4/src/main/java/org/eclipse/fx/ui/keybindings/e4/BindingProcessingAddon.java @@ -19,9 +19,9 @@ import java.util.Locale; import java.util.Map; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import org.eclipse.core.commands.ParameterizedCommand; import org.eclipse.core.commands.contexts.Context; diff --git a/modules/ui/org.eclipse.fx.ui.keybindings.e4/src/main/java/org/eclipse/fx/ui/keybindings/e4/BindingServiceAddon.java b/modules/ui/org.eclipse.fx.ui.keybindings.e4/src/main/java/org/eclipse/fx/ui/keybindings/e4/BindingServiceAddon.java index c64130804..78aa7670e 100755 --- a/modules/ui/org.eclipse.fx.ui.keybindings.e4/src/main/java/org/eclipse/fx/ui/keybindings/e4/BindingServiceAddon.java +++ b/modules/ui/org.eclipse.fx.ui.keybindings.e4/src/main/java/org/eclipse/fx/ui/keybindings/e4/BindingServiceAddon.java @@ -13,7 +13,7 @@ package org.eclipse.fx.ui.keybindings.e4; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.eclipse.core.commands.contexts.ContextManager; import org.eclipse.e4.core.contexts.ContextInjectionFactory; diff --git a/modules/ui/org.eclipse.fx.ui.keybindings.e4/src/main/java/org/eclipse/fx/ui/keybindings/e4/internal/BindingServiceImpl.java b/modules/ui/org.eclipse.fx.ui.keybindings.e4/src/main/java/org/eclipse/fx/ui/keybindings/e4/internal/BindingServiceImpl.java index f8932a406..9baacced4 100755 --- a/modules/ui/org.eclipse.fx.ui.keybindings.e4/src/main/java/org/eclipse/fx/ui/keybindings/e4/internal/BindingServiceImpl.java +++ b/modules/ui/org.eclipse.fx.ui.keybindings.e4/src/main/java/org/eclipse/fx/ui/keybindings/e4/internal/BindingServiceImpl.java @@ -19,8 +19,8 @@ import java.util.Map; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.core.commands.ParameterizedCommand; import org.eclipse.core.commands.contexts.Context; diff --git a/modules/ui/org.eclipse.fx.ui.keybindings.e4/src/main/java/org/eclipse/fx/ui/keybindings/e4/internal/BindingTableManager.java b/modules/ui/org.eclipse.fx.ui.keybindings.e4/src/main/java/org/eclipse/fx/ui/keybindings/e4/internal/BindingTableManager.java index 2b15e53ff..bc06863b8 100755 --- a/modules/ui/org.eclipse.fx.ui.keybindings.e4/src/main/java/org/eclipse/fx/ui/keybindings/e4/internal/BindingTableManager.java +++ b/modules/ui/org.eclipse.fx.ui.keybindings.e4/src/main/java/org/eclipse/fx/ui/keybindings/e4/internal/BindingTableManager.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.ListIterator; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.core.commands.ParameterizedCommand; import org.eclipse.core.commands.contexts.Context; diff --git a/modules/ui/org.eclipse.fx.ui.preferences.context/src/main/java/org/eclipse/fx/ui/preferences/context/PreferencePageFactoryCF.java b/modules/ui/org.eclipse.fx.ui.preferences.context/src/main/java/org/eclipse/fx/ui/preferences/context/PreferencePageFactoryCF.java index bcda92c78..5510b1eab 100644 --- a/modules/ui/org.eclipse.fx.ui.preferences.context/src/main/java/org/eclipse/fx/ui/preferences/context/PreferencePageFactoryCF.java +++ b/modules/ui/org.eclipse.fx.ui.preferences.context/src/main/java/org/eclipse/fx/ui/preferences/context/PreferencePageFactoryCF.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.ui.preferences.context; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.ContextFunction; import org.eclipse.e4.core.contexts.ContextInjectionFactory; diff --git a/modules/ui/org.eclipse.fx.ui.preferences/src/main/java/org/eclipse/fx/ui/preferences/PreferenceUI.java b/modules/ui/org.eclipse.fx.ui.preferences/src/main/java/org/eclipse/fx/ui/preferences/PreferenceUI.java index 78991bb60..cd1c175c9 100644 --- a/modules/ui/org.eclipse.fx.ui.preferences/src/main/java/org/eclipse/fx/ui/preferences/PreferenceUI.java +++ b/modules/ui/org.eclipse.fx.ui.preferences/src/main/java/org/eclipse/fx/ui/preferences/PreferenceUI.java @@ -23,8 +23,8 @@ import java.util.function.Consumer; import java.util.function.Predicate; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.fx.core.Subscription; import org.eclipse.fx.core.command.Command; diff --git a/modules/ui/org.eclipse.fx.ui.preferences/src/main/java/org/eclipse/fx/ui/preferences/page/FieldEditorPreferencePage.java b/modules/ui/org.eclipse.fx.ui.preferences/src/main/java/org/eclipse/fx/ui/preferences/page/FieldEditorPreferencePage.java index c948f2836..e90d75619 100644 --- a/modules/ui/org.eclipse.fx.ui.preferences/src/main/java/org/eclipse/fx/ui/preferences/page/FieldEditorPreferencePage.java +++ b/modules/ui/org.eclipse.fx.ui.preferences/src/main/java/org/eclipse/fx/ui/preferences/page/FieldEditorPreferencePage.java @@ -20,7 +20,7 @@ import java.util.concurrent.Callable; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.eclipse.fx.core.Memento; import org.eclipse.fx.core.MultiStatus; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/CommandEventDispatcher.java b/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/CommandEventDispatcher.java index 3f83c0246..1a0c2edfe 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/CommandEventDispatcher.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/CommandEventDispatcher.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.ui.workbench.base.internal; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.core.commands.CommandManager; import org.eclipse.core.commands.ExecutionEvent; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/CommandServiceImpl.java b/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/CommandServiceImpl.java index cdfd4c33f..d32841211 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/CommandServiceImpl.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/CommandServiceImpl.java @@ -20,9 +20,9 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import org.eclipse.core.commands.ParameterizedCommand; import org.eclipse.e4.core.commands.ECommandService; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/EFX_ModelAssembler.java b/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/EFX_ModelAssembler.java index 279d14a50..bcbd2b179 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/EFX_ModelAssembler.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/EFX_ModelAssembler.java @@ -28,7 +28,7 @@ import java.util.SortedSet; import java.util.TreeSet; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IContributor; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/EFX_ResourceHandler.java b/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/EFX_ResourceHandler.java index f6da7f712..7bca6f80d 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/EFX_ResourceHandler.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/EFX_ResourceHandler.java @@ -25,9 +25,9 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.core.internal.runtime.PlatformURLPluginConnection; import org.eclipse.core.runtime.URIUtil; import org.eclipse.e4.core.contexts.ContextInjectionFactory; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/LoggerProviderImpl.java b/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/LoggerProviderImpl.java index 3ae054a14..4cad7a3f7 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/LoggerProviderImpl.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/LoggerProviderImpl.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.ui.workbench.base.internal; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.services.log.ILoggerProvider; import org.eclipse.e4.core.services.log.Logger; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/ModelServiceImpl.java b/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/ModelServiceImpl.java index c37383a56..33d72e211 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/ModelServiceImpl.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/ModelServiceImpl.java @@ -16,8 +16,8 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.ui.model.application.MApplication; import org.eclipse.e4.ui.model.application.MApplicationElement; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/TranslationServiceContextFunction.java b/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/TranslationServiceContextFunction.java index fa5e646a2..6e02eb794 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/TranslationServiceContextFunction.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/internal/TranslationServiceContextFunction.java @@ -20,7 +20,7 @@ import java.util.function.Consumer; import java.util.function.Supplier; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.ContextFunction; import org.eclipse.e4.core.contexts.ContextInjectionFactory; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/restart/RestartPreferenceUtil.java b/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/restart/RestartPreferenceUtil.java index cd3e2c7b0..db8701402 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/restart/RestartPreferenceUtil.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/restart/RestartPreferenceUtil.java @@ -14,7 +14,7 @@ import java.util.function.Consumer; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.di.annotations.Creatable; import org.eclipse.e4.core.di.annotations.Optional; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/restart/RestartServiceImpl.java b/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/restart/RestartServiceImpl.java index f8c75db6f..592319a51 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/restart/RestartServiceImpl.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.base/src/main/java/org/eclipse/fx/ui/workbench/base/restart/RestartServiceImpl.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.ui.workbench.base.restart; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.ui.workbench.IWorkbench; import org.eclipse.fx.ui.services.restart.RestartService; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/PartRenderingEngine.java b/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/PartRenderingEngine.java index f17e54537..4a79b7898 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/PartRenderingEngine.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/PartRenderingEngine.java @@ -15,8 +15,8 @@ import java.util.Collection; import java.util.Hashtable; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/internal/GraphicsLoaderImpl.java b/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/internal/GraphicsLoaderImpl.java index ec398bcb1..d7b740657 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/internal/GraphicsLoaderImpl.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/internal/GraphicsLoaderImpl.java @@ -22,7 +22,7 @@ import javafx.scene.image.Image; import javafx.scene.image.ImageView; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.commons.lang.text.StrSubstitutor; import org.eclipse.e4.core.di.annotations.Optional; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/internal/MenuServiceCF.java b/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/internal/MenuServiceCF.java index 7cdd7d978..dc2eb7f11 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/internal/MenuServiceCF.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/internal/MenuServiceCF.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.ui.workbench.fx.internal; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.ContextFunction; import org.eclipse.e4.core.contexts.ContextInjectionFactory; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/key/KeyBindingDispatcher.java b/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/key/KeyBindingDispatcher.java index 6e5fd1ecc..502ec473b 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/key/KeyBindingDispatcher.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/key/KeyBindingDispatcher.java @@ -22,7 +22,7 @@ import javafx.scene.input.KeyCode; import javafx.scene.input.KeyEvent; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.core.commands.Command; import org.eclipse.core.commands.ParameterizedCommand; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/perspective/LwPerspectiveSwitcherDialog.java b/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/perspective/LwPerspectiveSwitcherDialog.java index 9cfb33564..6dd47344b 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/perspective/LwPerspectiveSwitcherDialog.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/perspective/LwPerspectiveSwitcherDialog.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.ui.workbench.fx.perspective; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective; import org.eclipse.e4.ui.model.application.ui.basic.MWindow; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/perspective/PerspectiveListView.java b/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/perspective/PerspectiveListView.java index e69ba80f2..6e3672426 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/perspective/PerspectiveListView.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/perspective/PerspectiveListView.java @@ -16,8 +16,8 @@ import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective; import org.eclipse.e4.ui.model.application.ui.advanced.MPerspectiveStack; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/perspective/PerspectiveSwitcherComponent.java b/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/perspective/PerspectiveSwitcherComponent.java index 2b0306b7e..6182ba551 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/perspective/PerspectiveSwitcherComponent.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/perspective/PerspectiveSwitcherComponent.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.ui.workbench.fx.perspective; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/perspective/PerspectiveSwitcherDialog.java b/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/perspective/PerspectiveSwitcherDialog.java index 68defe03f..844fe4ba1 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/perspective/PerspectiveSwitcherDialog.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/perspective/PerspectiveSwitcherDialog.java @@ -14,7 +14,7 @@ import java.net.URL; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective; import org.eclipse.e4.ui.model.application.ui.basic.MWindow; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/perspective/PerspectiveSwitcherNode.java b/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/perspective/PerspectiveSwitcherNode.java index 2a1430a1e..070977c3f 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/perspective/PerspectiveSwitcherNode.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/perspective/PerspectiveSwitcherNode.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.services.events.IEventBroker; import org.eclipse.e4.ui.model.application.MApplication; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/perspective/SwitchPerspectiveDialogHandler.java b/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/perspective/SwitchPerspectiveDialogHandler.java index 8a73310eb..373d16d9f 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/perspective/SwitchPerspectiveDialogHandler.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.fx/src/main/java/org/eclipse/fx/ui/workbench/fx/perspective/SwitchPerspectiveDialogHandler.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.ui.workbench.fx.perspective; -import javax.inject.Named; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.ui.model.application.ui.basic.MWindow; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseAreaRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseAreaRenderer.java index 629c9babb..344290ef6 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseAreaRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseAreaRenderer.java @@ -18,8 +18,8 @@ import java.util.Iterator; import java.util.List; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.core.services.events.IEventBroker; import org.eclipse.e4.ui.model.application.ui.MUIElement; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseCompositePartRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseCompositePartRenderer.java index f845aec0c..5e138d8d5 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseCompositePartRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseCompositePartRenderer.java @@ -18,8 +18,8 @@ import java.util.Iterator; import java.util.List; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.core.services.contributions.IContributionFactory; import org.eclipse.e4.core.services.events.IEventBroker; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseItemContainerRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseItemContainerRenderer.java index 45dbac9ac..375b091c8 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseItemContainerRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseItemContainerRenderer.java @@ -15,8 +15,8 @@ import java.util.ArrayList; import java.util.List; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.core.contexts.RunAndTrack; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseItemRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseItemRenderer.java index be9413128..3d337b047 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseItemRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseItemRenderer.java @@ -16,7 +16,7 @@ import java.util.List; import java.util.Map; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.eclipse.core.commands.ParameterizedCommand; import org.eclipse.e4.core.commands.ECommandService; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseMenuBarRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseMenuBarRenderer.java index b62ba9dce..64503cb7c 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseMenuBarRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseMenuBarRenderer.java @@ -15,7 +15,7 @@ import java.util.Collection; import java.util.Iterator; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.eclipse.e4.core.services.events.IEventBroker; import org.eclipse.e4.ui.model.application.ui.MUIElement; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseMenuItemRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseMenuItemRenderer.java index 13a10af7b..5ff044d5a 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseMenuItemRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseMenuItemRenderer.java @@ -15,7 +15,7 @@ import java.util.Collection; import java.util.Iterator; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.core.commands.ParameterizedCommand; import org.eclipse.e4.core.contexts.IEclipseContext; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseMenuRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseMenuRenderer.java index 4987a67b5..6b2c14f0e 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseMenuRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseMenuRenderer.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BasePartMenuRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BasePartMenuRenderer.java index eac88326e..1c605535a 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BasePartMenuRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BasePartMenuRenderer.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BasePartRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BasePartRenderer.java index 34821221b..ade1a8c86 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BasePartRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BasePartRenderer.java @@ -15,7 +15,7 @@ import java.util.Collection; import java.util.Collections; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.core.services.contributions.IContributionFactory; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BasePerspectiveRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BasePerspectiveRenderer.java index 7e628fda6..b2507faa8 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BasePerspectiveRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BasePerspectiveRenderer.java @@ -15,8 +15,8 @@ import java.util.ArrayList; import java.util.List; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.core.services.events.IEventBroker; import org.eclipse.e4.ui.model.application.MApplication; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BasePerspectiveStackRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BasePerspectiveStackRenderer.java index f4550d1bb..7c9c10fd2 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BasePerspectiveStackRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BasePerspectiveStackRenderer.java @@ -18,8 +18,8 @@ import java.util.Iterator; import java.util.List; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BasePlaceholderRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BasePlaceholderRenderer.java index fee94d992..88a514110 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BasePlaceholderRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BasePlaceholderRenderer.java @@ -16,9 +16,9 @@ import java.util.Map; import java.util.Set; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.core.services.events.IEventBroker; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BasePopupMenuRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BasePopupMenuRenderer.java index dcb3f65be..e6e925640 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BasePopupMenuRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BasePopupMenuRenderer.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseRenderer.java index e7aa13258..def6ff3b6 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseRenderer.java @@ -22,7 +22,7 @@ import java.util.Map.Entry; import java.util.Optional; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.core.expressions.ExpressionInfo; import org.eclipse.e4.core.commands.ExpressionContext; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseSashRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseSashRenderer.java index 9970e95aa..3740c1cdf 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseSashRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseSashRenderer.java @@ -18,8 +18,8 @@ import java.util.Iterator; import java.util.List; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.core.services.events.IEventBroker; import org.eclipse.e4.ui.model.application.ui.MElementContainer; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseStackRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseStackRenderer.java index 7334d267b..a3285560c 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseStackRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseStackRenderer.java @@ -18,8 +18,8 @@ import java.util.Iterator; import java.util.List; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseToolItemRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseToolItemRenderer.java index bc93a0d8a..75439d3e1 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseToolItemRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseToolItemRenderer.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.ui.workbench.renderers.base; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.ui.di.UISynchronize; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseTrimBarRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseTrimBarRenderer.java index d3b1c749a..e200953e7 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseTrimBarRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseTrimBarRenderer.java @@ -16,7 +16,7 @@ import java.util.Collection; import java.util.Iterator; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.eclipse.e4.core.services.events.IEventBroker; import org.eclipse.e4.ui.model.application.ui.MUIElement; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseWindowRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseWindowRenderer.java index 02cf15ffe..524af9b8c 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseWindowRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseWindowRenderer.java @@ -17,8 +17,8 @@ import java.util.Collections; import java.util.List; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseWorkbenchRendererFactory.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseWorkbenchRendererFactory.java index 6bb543ec8..b13e07a0b 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseWorkbenchRendererFactory.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/BaseWorkbenchRendererFactory.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/addons/CleanUpAddon.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/addons/CleanUpAddon.java index 782db4650..e837667df 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/addons/CleanUpAddon.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/addons/CleanUpAddon.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.eclipse.fx.ui.workbench.renderers.base.addons; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.core.services.events.IEventBroker; import org.eclipse.e4.ui.model.application.MApplication; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/addons/DnDAddon.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/addons/DnDAddon.java index 6dbfc2790..b41a132ca 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/addons/DnDAddon.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/addons/DnDAddon.java @@ -17,8 +17,8 @@ import java.util.TimerTask; import java.util.UUID; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.core.services.events.IEventBroker; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/addons/MinMaxAddon.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/addons/MinMaxAddon.java index da677b198..8b42654ff 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/addons/MinMaxAddon.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/addons/MinMaxAddon.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.ui.workbench.renderers.base.addons; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.core.services.events.IEventBroker; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/addons/MinMaxAddonWithPartialRestore.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/addons/MinMaxAddonWithPartialRestore.java index c01174615..8e28fbef9 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/addons/MinMaxAddonWithPartialRestore.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/addons/MinMaxAddonWithPartialRestore.java @@ -22,7 +22,7 @@ import java.util.Arrays; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.core.di.annotations.Optional; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/internal/PerspectiveMaximizationServiceImpl.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/internal/PerspectiveMaximizationServiceImpl.java index 613c89cc1..0a6d8bf40 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/internal/PerspectiveMaximizationServiceImpl.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/internal/PerspectiveMaximizationServiceImpl.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.ui.workbench.renderers.base.internal; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.ui.model.application.ui.MUIElement; import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/internal/WindowMaximizationServiceImpl.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/internal/WindowMaximizationServiceImpl.java index 4a7fa0979..ec440c5b7 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/internal/WindowMaximizationServiceImpl.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.base/src/main/java/org/eclipse/fx/ui/workbench/renderers/base/internal/WindowMaximizationServiceImpl.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.ui.workbench.renderers.base.internal; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.ui.model.application.ui.MUIElement; import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefAreaRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefAreaRenderer.java index 7bf414f71..098ef6656 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefAreaRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefAreaRenderer.java @@ -23,8 +23,8 @@ import javafx.scene.control.SplitPane; import javafx.scene.control.SplitPane.Divider; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.ui.model.application.ui.advanced.MArea; import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainerElement; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefCompositePartRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefCompositePartRenderer.java index d3e91c23d..5e36116ce 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefCompositePartRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefCompositePartRenderer.java @@ -33,8 +33,8 @@ import javafx.scene.layout.Pane; import javafx.scene.layout.StackPane; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.ui.model.application.ui.MUIElement; import org.eclipse.e4.ui.model.application.ui.basic.MCompositePart; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefMenuBarRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefMenuBarRenderer.java index bce32eff1..64501bc4a 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefMenuBarRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefMenuBarRenderer.java @@ -16,8 +16,8 @@ import javafx.scene.control.MenuBar; import javafx.scene.layout.Pane; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.ui.model.application.ui.menu.MMenu; import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefMenuItemRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefMenuItemRenderer.java index d3843f5e0..a295f5060 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefMenuItemRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefMenuItemRenderer.java @@ -17,8 +17,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.ui.model.application.ui.menu.ItemType; import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefMenuRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefMenuRenderer.java index 4748c5ec3..b5bdfa8d5 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefMenuRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefMenuRenderer.java @@ -14,8 +14,8 @@ import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.ui.model.application.ui.menu.MMenu; import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefPartRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefPartRenderer.java index 3de2f09bc..876fe1735 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefPartRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefPartRenderer.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.eclipse.fx.ui.workbench.renderers.fx; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.core.di.annotations.Optional; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefPerspectiveRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefPerspectiveRenderer.java index fc07e6f12..071d83f52 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefPerspectiveRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefPerspectiveRenderer.java @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import javafx.scene.Node; import javafx.scene.layout.Pane; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefPerspectiveStackRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefPerspectiveStackRenderer.java index 123b1c689..6514ecf38 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefPerspectiveStackRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefPerspectiveStackRenderer.java @@ -20,8 +20,8 @@ import javafx.scene.layout.BorderPane; import javafx.scene.layout.StackPane; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.core.services.events.IEventBroker; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefSashRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefSashRenderer.java index 06b825921..32983f393 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefSashRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefSashRenderer.java @@ -17,8 +17,8 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.ui.model.application.ui.MUIElement; import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefStackRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefStackRenderer.java index 3770a05c0..1fd365505 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefStackRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefStackRenderer.java @@ -18,10 +18,10 @@ import java.util.Objects; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.ui.model.application.ui.basic.MPart; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefToolControlRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefToolControlRenderer.java index fb30131e2..bf546a450 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefToolControlRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefToolControlRenderer.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.ui.workbench.renderers.fx; -import javax.inject.Inject; +import jakarta.inject.Inject; import javafx.scene.Group; import javafx.scene.Parent; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefToolItemMenuRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefToolItemMenuRenderer.java index 545f471aa..5d23f1cc6 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefToolItemMenuRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefToolItemMenuRenderer.java @@ -20,8 +20,8 @@ import javafx.scene.control.Toggle; import javafx.scene.control.ToggleGroup; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.ui.model.application.ui.menu.MMenu; import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefToolItemRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefToolItemRenderer.java index 75dbe1412..3ebecce2c 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefToolItemRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefToolItemRenderer.java @@ -14,8 +14,8 @@ import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.ui.model.application.ui.menu.ItemType; import org.eclipse.e4.ui.model.application.ui.menu.MToolItem; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefTrimBarRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefTrimBarRenderer.java index c9ab97ec9..5dcc31d9f 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefTrimBarRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefTrimBarRenderer.java @@ -18,8 +18,8 @@ import javafx.scene.layout.Priority; import javafx.scene.layout.VBox; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.ui.model.application.ui.SideValue; import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefWindowRenderer.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefWindowRenderer.java index d10bf2e96..044cebd12 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefWindowRenderer.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefWindowRenderer.java @@ -24,9 +24,9 @@ import java.util.ResourceBundle; import java.util.concurrent.CompletableFuture; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefWorkbenchRendererFactory.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefWorkbenchRendererFactory.java index 14b4d672a..f2807be0f 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefWorkbenchRendererFactory.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/DefWorkbenchRendererFactory.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.ui.workbench.renderers.fx; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.fx.ui.workbench.renderers.base.BaseAreaRenderer; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/addons/internal/DefaultTrimStackImpl.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/addons/internal/DefaultTrimStackImpl.java index e416939e9..80855dad8 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/addons/internal/DefaultTrimStackImpl.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/addons/internal/DefaultTrimStackImpl.java @@ -18,8 +18,8 @@ import java.util.List; import java.util.Map; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.ui.model.application.ui.MElementContainer; import org.eclipse.e4.ui.model.application.ui.MGenericStack; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/internal/DefaultSaveDialogPresenter.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/internal/DefaultSaveDialogPresenter.java index 7812b079f..61aaed416 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/internal/DefaultSaveDialogPresenter.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/internal/DefaultSaveDialogPresenter.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.concurrent.CompletableFuture; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.services.nls.Translation; import org.eclipse.e4.ui.model.application.ui.basic.MPart; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/internal/FXDialogService.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/internal/FXDialogService.java index 00914d5fa..a5eb17c05 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/internal/FXDialogService.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/internal/FXDialogService.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.ui.workbench.renderers.fx.internal; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/internal/PartPopupMenuServiceImpl.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/internal/PartPopupMenuServiceImpl.java index 66f85aaa9..f755a0bd5 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/internal/PartPopupMenuServiceImpl.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/internal/PartPopupMenuServiceImpl.java @@ -15,7 +15,7 @@ import javafx.scene.control.ContextMenu; import javafx.scene.control.Control; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.ui.model.application.ui.basic.MPart; import org.eclipse.e4.ui.model.application.ui.menu.MMenu; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/widget/WLayoutedWidgetImpl.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/widget/WLayoutedWidgetImpl.java index 65b03cb97..d3b941f74 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/widget/WLayoutedWidgetImpl.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/widget/WLayoutedWidgetImpl.java @@ -15,8 +15,8 @@ import java.util.List; import java.util.function.Predicate; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.ui.model.application.ui.MUIElement; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/widget/WWidgetImpl.java b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/widget/WWidgetImpl.java index 9e8ff7b3f..4af8170dc 100755 --- a/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/widget/WWidgetImpl.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.renderers.fx/src/main/java/org/eclipse/fx/ui/workbench/renderers/fx/widget/WWidgetImpl.java @@ -20,8 +20,8 @@ import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import org.eclipse.e4.ui.model.application.ui.MUIElement; import org.eclipse.fx.ui.workbench.renderers.base.widget.WCallback; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.services/src/main/java/org/eclipse/fx/ui/workbench/services/lifecycle/LifecycleAddon.java b/modules/ui/org.eclipse.fx.ui.workbench.services/src/main/java/org/eclipse/fx/ui/workbench/services/lifecycle/LifecycleAddon.java index c34acc661..67604dec0 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.services/src/main/java/org/eclipse/fx/ui/workbench/services/lifecycle/LifecycleAddon.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.services/src/main/java/org/eclipse/fx/ui/workbench/services/lifecycle/LifecycleAddon.java @@ -14,8 +14,8 @@ import java.util.List; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.core.services.events.IEventBroker; import org.eclipse.e4.ui.model.application.MApplication; diff --git a/modules/ui/org.eclipse.fx.ui.workbench.services/src/main/java/org/eclipse/fx/ui/workbench/services/lifecycle/internal/LifecycleServiceImpl.java b/modules/ui/org.eclipse.fx.ui.workbench.services/src/main/java/org/eclipse/fx/ui/workbench/services/lifecycle/internal/LifecycleServiceImpl.java index 5b9d1007d..501024ae2 100644 --- a/modules/ui/org.eclipse.fx.ui.workbench.services/src/main/java/org/eclipse/fx/ui/workbench/services/lifecycle/internal/LifecycleServiceImpl.java +++ b/modules/ui/org.eclipse.fx.ui.workbench.services/src/main/java/org/eclipse/fx/ui/workbench/services/lifecycle/internal/LifecycleServiceImpl.java @@ -17,7 +17,7 @@ import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/CustomRendererFactory.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/CustomRendererFactory.java index 3fd53012b..20ff24ad6 100644 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/CustomRendererFactory.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/CustomRendererFactory.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.testcases.e4; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.fx.ui.workbench.renderers.fx.DefWorkbenchRendererFactory; diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/ModelViewAddon.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/ModelViewAddon.java index 80fc202f6..fbf95df02 100644 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/ModelViewAddon.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/ModelViewAddon.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.testcases.e4; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.ui.model.application.MApplication; diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/decoration/DecorationController.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/decoration/DecorationController.java index 70fb978da..8e1e7d905 100755 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/decoration/DecorationController.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/decoration/DecorationController.java @@ -26,8 +26,8 @@ import javafx.stage.Screen; import javafx.stage.Stage; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.ui.model.application.ui.basic.MWindow; diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/DiHandler.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/DiHandler.java index a847eb49f..bcfd43575 100755 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/DiHandler.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/DiHandler.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.testcases.e4.handlers; -import javax.inject.Named; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/DynDiHandler.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/DynDiHandler.java index 722f868b5..61099e71a 100644 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/DynDiHandler.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/DynDiHandler.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.testcases.e4.handlers; -import javax.inject.Named; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/Handler0.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/Handler0.java index ab2f84478..2db22471f 100755 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/Handler0.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/Handler0.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.testcases.e4.handlers; -import javax.inject.Named; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/OpenLightweightWindow.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/OpenLightweightWindow.java index fae44e501..ae335180a 100644 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/OpenLightweightWindow.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/OpenLightweightWindow.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.testcases.e4.handlers; -import javax.inject.Named; +import jakarta.inject.Named; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.core.di.annotations.Execute; diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/SwitchPerspectiveHandler.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/SwitchPerspectiveHandler.java index f67f00a5c..b699f2837 100755 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/SwitchPerspectiveHandler.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/handlers/SwitchPerspectiveHandler.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.testcases.e4.handlers; -import javax.inject.Named; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/ContentPanel.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/ContentPanel.java index 699542fe6..96735a74c 100755 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/ContentPanel.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/ContentPanel.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.fx.testcases.e4.parts; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.core.di.extensions.EventTopic; diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/ControlPanel.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/ControlPanel.java index c9ea5ced9..bf2b1d40b 100755 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/ControlPanel.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/ControlPanel.java @@ -31,9 +31,9 @@ import javafx.scene.layout.VBox; import javafx.util.Callback; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.core.commands.ParameterizedCommand; import org.eclipse.e4.core.commands.ECommandService; diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/ExtraWindowPart.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/ExtraWindowPart.java index b7addb86e..369385599 100644 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/ExtraWindowPart.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/ExtraWindowPart.java @@ -15,7 +15,7 @@ import javafx.scene.control.Label; import javafx.scene.layout.BorderPane; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; public class ExtraWindowPart { @PostConstruct diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/MCompositePartContribution.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/MCompositePartContribution.java index 6eaa53529..925c63b87 100644 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/MCompositePartContribution.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/MCompositePartContribution.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.testcases.e4.parts; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.eclipse.e4.ui.model.application.ui.basic.MCompositePart; diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/SampleNoFocus.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/SampleNoFocus.java index 4c680d70d..e20336443 100755 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/SampleNoFocus.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/SampleNoFocus.java @@ -15,7 +15,7 @@ import javafx.scene.layout.BorderPane; import javafx.scene.shape.Rectangle; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.eclipse.e4.ui.di.Focus; diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/StartCountPart.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/StartCountPart.java index 468cad0a9..a90eded82 100644 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/StartCountPart.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/StartCountPart.java @@ -17,7 +17,7 @@ import javafx.scene.control.Label; import javafx.scene.layout.BorderPane; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.eclipse.e4.ui.model.application.ui.basic.MPart; diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/TestExtendedFXMLBuilder.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/TestExtendedFXMLBuilder.java index e957af0b4..b43f19bc7 100644 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/TestExtendedFXMLBuilder.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/TestExtendedFXMLBuilder.java @@ -17,7 +17,7 @@ import javafx.scene.Node; import javafx.scene.layout.BorderPane; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.eclipse.fx.ui.di.FXMLBuilder; import org.eclipse.fx.ui.di.FXMLLoader; diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/TestFXMLBuilder.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/TestFXMLBuilder.java index 6d66384ec..b80cfe3d6 100644 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/TestFXMLBuilder.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/TestFXMLBuilder.java @@ -17,8 +17,8 @@ import javafx.scene.Node; import javafx.scene.layout.BorderPane; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.core.di.annotations.Optional; diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/TestFXMLController.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/TestFXMLController.java index b067ced15..783f274d9 100644 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/TestFXMLController.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/TestFXMLController.java @@ -12,9 +12,9 @@ *******************************************************************************/ package org.eclipse.fx.testcases.e4.parts; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.core.di.annotations.Optional; diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/TestPane.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/TestPane.java index 8b624958c..5ee4ac2a5 100644 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/TestPane.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/TestPane.java @@ -15,7 +15,7 @@ import javafx.scene.control.Button; import javafx.scene.layout.VBox; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; public class TestPane { @PostConstruct diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/TestSwingPart.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/TestSwingPart.java index 67b989d98..e6f34ebab 100644 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/TestSwingPart.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/TestSwingPart.java @@ -18,7 +18,7 @@ import javafx.embed.swing.SwingNode; import javafx.scene.layout.BorderPane; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.JPanel; diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/Test_431338.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/Test_431338.java index 819b2c94e..8286273b7 100644 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/Test_431338.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/Test_431338.java @@ -16,8 +16,8 @@ import javafx.scene.control.Button; import javafx.scene.layout.BorderPane; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.ui.model.application.ui.basic.MPart; import org.eclipse.e4.ui.model.application.ui.menu.MDirectMenuItem; diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/Test_431391.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/Test_431391.java index bf759b461..cfbbe6111 100644 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/Test_431391.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/Test_431391.java @@ -13,7 +13,7 @@ package org.eclipse.fx.testcases.e4.parts; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import javafx.collections.FXCollections; import javafx.scene.control.Label; diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/Test_PersistState.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/Test_PersistState.java index 174e81c35..5c3dbb7f7 100644 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/Test_PersistState.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/parts/Test_PersistState.java @@ -15,7 +15,7 @@ import javafx.scene.control.Label; import javafx.scene.layout.BorderPane; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.eclipse.e4.ui.di.PersistState; import org.eclipse.e4.ui.model.application.ui.basic.MPart; diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/renderer/MyDefMenuRenderer.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/renderer/MyDefMenuRenderer.java index 09a447bc0..b485a1e73 100644 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/renderer/MyDefMenuRenderer.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/renderer/MyDefMenuRenderer.java @@ -14,8 +14,8 @@ // //import java.util.List; // -//import javax.inject.Inject; -//import javax.inject.Named; +//import jakarta.inject.Inject; +//import jakarta.inject.Named; // //import org.eclipse.e4.ui.model.application.ui.menu.MMenu; //import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement; diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/tool/ProgressControl.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/tool/ProgressControl.java index b8a1cde32..892f607ad 100644 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/tool/ProgressControl.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/tool/ProgressControl.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.testcases.e4.tool; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import javafx.scene.Group; import javafx.scene.control.Label; diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/tool/SpacerDummy.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/tool/SpacerDummy.java index 82ebd7759..09facd55b 100644 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/tool/SpacerDummy.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/tool/SpacerDummy.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.fx.testcases.e4.tool; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import javafx.scene.Group; diff --git a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/tool/ToolControlSample.java b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/tool/ToolControlSample.java index 76d9ff275..bb42ea16b 100644 --- a/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/tool/ToolControlSample.java +++ b/testcases/org.eclipse.fx.testcases.e4/src/org/eclipse/fx/testcases/e4/tool/ToolControlSample.java @@ -17,7 +17,7 @@ import javafx.scene.control.TextField; import javafx.scene.layout.HBox; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; public class ToolControlSample { @PostConstruct diff --git a/testcases/sample.splash.app/bin/sample/splash/app/LoginSplashStartup.class b/testcases/sample.splash.app/bin/sample/splash/app/LoginSplashStartup.class index a9ab6a32082c60b09ca64c714787a719504ab88f..959b0ba8eb3fbc2ebdddc917aff296587bc4edb2 100644 GIT binary patch delta 23 fcmX@ia+rnV)W2Q(7#J8FH*#<>G0IOCW-W-