refs #468 code modifications (mostly imports)

eclipse-efx · Feb 6, 2025 · 7842388 · 7842388
1 parent 0353526
commit 7842388
Show file tree

Hide file tree

Showing 243 changed files with 363 additions and 363 deletions.
diff --git a/...g.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/DecorationController.java b/...g.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/...pse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/AddContactHandler.java b/...pse.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/...lipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/AddGroupHandler.java b/...lipse.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/...g.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/CopyHandler.java b/...g.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/...rg.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/CutHandler.java b/...rg.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/....fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/DeleteContactHandler.java b/....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/....eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/PasteHandler.java b/....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/...g.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/RedoHandler.java b/...g.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/...se.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/SwitchThemeHandler.java b/...se.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/...g.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/handlers/UndoHandler.java b/...g.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/....fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/processors/MenuThemeProcessor.java b/....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/....demo.contacts.app/src/org/eclipse/fx/demo/contacts/processors/ToolbarThemeProcessor.java b/....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/...eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/views/ContactsListView.java b/...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/...clipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/views/ContactsTableView.java b/...clipse.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/...se.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/views/ContactsTreeTableView.java b/...se.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/...eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/views/ContactsTreeView.java b/...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/.../org.eclipse.fx.demo.contacts.app/src/org/eclipse/fx/demo/contacts/views/DetailsView.java b/.../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/...omWindow.app/src/org/eclipse/fx/demo/customWindow/app/controller/MainFrameController.java b/...omWindow.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/...eclipse.fx.demo.customWindow.app/src/org/eclipse/fx/demo/customWindow/app/part/Part1.java b/...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
@@ -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
@@ -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/...e.fx.demo.e4/src/org/eclipse/fx/demo/e4/parts/controllers/PersonDetailPartController.java b/...e.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/....eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/addon/PerspectiveAnimationAddon.java b/....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/...org.eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/handlers/PerspectiveSwitcher.java b/...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
@@ -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/...eclipse.fx.demo.media/src/org/eclipse/fx/demo/media/parts/ConfigurationPartControler.java b/...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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...rg.eclipse.fx.simplycode.app/src/org/eclipse/fx/simplycode/app/parts/ProjectExplorer.java b/...rg.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
@@ -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/...s/org.eclipse.fx.testcases.l10n.app/src/org/eclipse/fx/testcases/l10n/app/SamplePart.java b/...s/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/...s/org.eclipse.fx.testcases.l10n.app/src/org/eclipse/fx/testcases/l10n/app/SwitchLang.java b/...s/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/...x.ui.preferences.app/src/main/java/org/eclipse/fx/ui/preferences/app/MainApplication.java b/...x.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/...s.app/src/main/java/org/eclipse/fx/ui/preferences/app/pages/PreferencePageProvider_1.java b/...s.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/...pensator.app/src/org/eclipse/fx/code/compensator/app/ApplicationDecorationController.java b/...pensator.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/....code.compensator.app/src/org/eclipse/fx/code/compensator/app/DirtyStateTrackerAddon.java b/....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/...e.fx.code.compensator.app/src/org/eclipse/fx/code/compensator/app/ToggleThemeHandler.java b/...e.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;