diff --git a/cnf/ext/runtime.bnd b/cnf/ext/runtime.bnd index e12f4547..0608ece3 100644 --- a/cnf/ext/runtime.bnd +++ b/cnf/ext/runtime.bnd @@ -13,7 +13,7 @@ bundles.console: \ bundles.deps: \ javax.annotation,\ - jakarta.inject.jakarta.inject-api,\ + javax.inject,\ javax.xml.jre,\ org.apache.commons.jxpath,\ com.google.guava,\ @@ -86,7 +86,7 @@ bundles.required: \ org.apache.commons.text,\ org.eclipse.equinox.preferences,\ controlsfx,\ - jakarta.inject.jakarta.inject-api,\ + javax.inject,\ com.osgifx.console.util,\ com.osgifx.console.wrapper.mug,\ eu.hansolo.tilesfx,\ diff --git a/cnf/maven/runtime.maven b/cnf/maven/runtime.maven index 084e4da1..936f7b04 100644 --- a/cnf/maven/runtime.maven +++ b/cnf/maven/runtime.maven @@ -88,7 +88,3 @@ org.eclipse.platform:org.eclipse.core.variables:3.6.200 org.slf4j:slf4j-api:1.7.36 org.apache.sling:org.apache.sling.commons.log:5.4.2 org.apache.sling:org.apache.sling.commons.logservice:1.1.0 - -# Jakarta - -jakarta.inject:jakarta.inject-api:2.0.1 \ No newline at end of file diff --git a/com.osgifx.console.agent/src/main/java/com/osgifx/console/agent/provider/BundleStartTimeCalculator.java b/com.osgifx.console.agent/src/main/java/com/osgifx/console/agent/provider/BundleStartTimeCalculator.java index 799f5ee5..c610f6ed 100644 --- a/com.osgifx.console.agent/src/main/java/com/osgifx/console/agent/provider/BundleStartTimeCalculator.java +++ b/com.osgifx.console.agent/src/main/java/com/osgifx/console/agent/provider/BundleStartTimeCalculator.java @@ -108,7 +108,7 @@ public List getBundleStartDurations() { return bundleToStartTime.values().stream().map(StartTime::toBundleStartDuration).collect(toList()); } } - + public Optional getBundleStartDuration(long bundleId) { return Optional.ofNullable(bundleToStartTime.get(bundleId)).map(StartTime::toBundleStartDuration); } diff --git a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/addon/AgentConnectedAddon.java b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/addon/AgentConnectedAddon.java index 883186a6..8588abb3 100644 --- a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/addon/AgentConnectedAddon.java +++ b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/addon/AgentConnectedAddon.java @@ -17,6 +17,8 @@ import static com.osgifx.console.supervisor.Supervisor.AGENT_CONNECTED_EVENT_TOPIC; +import javax.inject.Inject; + import org.controlsfx.dialog.ProgressDialog; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.ui.di.UIEventTopic; @@ -30,7 +32,6 @@ import com.osgifx.console.executor.Executor; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; import javafx.concurrent.Task; public final class AgentConnectedAddon { diff --git a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/addon/AgentPingAddon.java b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/addon/AgentPingAddon.java index aa6f0e3a..72468b90 100644 --- a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/addon/AgentPingAddon.java +++ b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/addon/AgentPingAddon.java @@ -24,6 +24,7 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; +import javax.inject.Inject; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.core.di.extensions.EventTopic; @@ -37,8 +38,6 @@ import com.osgifx.console.executor.Executor; import com.osgifx.console.supervisor.Supervisor; -import jakarta.inject.Inject; - public final class AgentPingAddon { private static final Duration INITIAL_DELAY = Duration.ofSeconds(0); diff --git a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/addon/ModifiablePropertyAddon.java b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/addon/ModifiablePropertyAddon.java index 8e9523f6..4081b83d 100644 --- a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/addon/ModifiablePropertyAddon.java +++ b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/addon/ModifiablePropertyAddon.java @@ -19,6 +19,7 @@ import java.util.Set; import javax.annotation.PostConstruct; +import javax.inject.Inject; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.fx.core.log.FluentLogger; @@ -26,8 +27,6 @@ import com.google.common.collect.Maps; -import jakarta.inject.Inject; - public final class ModifiablePropertyAddon { private final Map modifiableProperties = Maps.newHashMap(); diff --git a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/addon/WindowResizeDisablerAddon.java b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/addon/WindowResizeDisablerAddon.java index 095606d0..fdf06b35 100644 --- a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/addon/WindowResizeDisablerAddon.java +++ b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/addon/WindowResizeDisablerAddon.java @@ -15,6 +15,8 @@ ******************************************************************************/ package com.osgifx.console.application.addon; +import javax.inject.Inject; + import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.core.di.extensions.EventTopic; import org.eclipse.e4.ui.model.application.MApplication; @@ -24,7 +26,6 @@ import org.eclipse.fx.ui.workbench.renderers.base.widget.WWindow; import org.osgi.service.event.Event; -import jakarta.inject.Inject; import javafx.stage.Stage; public final class WindowResizeDisablerAddon { diff --git a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/dialog/AboutApplicationDialog.java b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/dialog/AboutApplicationDialog.java index 5bb41542..29bc254a 100644 --- a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/dialog/AboutApplicationDialog.java +++ b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/dialog/AboutApplicationDialog.java @@ -17,13 +17,14 @@ import static com.osgifx.console.constants.FxConstants.STANDARD_CSS; +import javax.inject.Inject; + import org.eclipse.e4.core.di.extensions.OSGiBundle; import org.eclipse.fx.core.di.LocalInstance; import org.osgi.framework.BundleContext; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; import javafx.fxml.FXMLLoader; import javafx.scene.control.ButtonType; import javafx.scene.control.Dialog; diff --git a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/dialog/ConnectToMqttAgentDialog.java b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/dialog/ConnectToMqttAgentDialog.java index ec0c5018..ce9c61da 100644 --- a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/dialog/ConnectToMqttAgentDialog.java +++ b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/dialog/ConnectToMqttAgentDialog.java @@ -25,6 +25,8 @@ import java.util.Map; +import javax.inject.Inject; + import org.eclipse.e4.core.di.extensions.OSGiBundle; import org.eclipse.fx.core.di.LocalInstance; import org.osgi.framework.BundleContext; @@ -33,7 +35,6 @@ import com.osgifx.console.application.fxml.controller.MqttConnectionSettingsDialogController; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; import javafx.fxml.FXMLLoader; import javafx.scene.control.ButtonBar; import javafx.scene.control.ButtonType; diff --git a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/dialog/ConnectToSocketAgentDialog.java b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/dialog/ConnectToSocketAgentDialog.java index a723ebf8..5beb8a07 100644 --- a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/dialog/ConnectToSocketAgentDialog.java +++ b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/dialog/ConnectToSocketAgentDialog.java @@ -25,6 +25,8 @@ import java.util.Map; +import javax.inject.Inject; + import org.eclipse.e4.core.di.extensions.OSGiBundle; import org.eclipse.fx.core.di.LocalInstance; import org.osgi.framework.BundleContext; @@ -33,7 +35,6 @@ import com.osgifx.console.application.fxml.controller.SocketConnectionSettingsDialogController; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; import javafx.fxml.FXMLLoader; import javafx.scene.control.ButtonBar; import javafx.scene.control.ButtonType; diff --git a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/dialog/MqttConnectionDialog.java b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/dialog/MqttConnectionDialog.java index 1316703d..caaabdeb 100644 --- a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/dialog/MqttConnectionDialog.java +++ b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/dialog/MqttConnectionDialog.java @@ -23,6 +23,8 @@ import java.util.Optional; +import javax.inject.Inject; + import org.controlsfx.control.textfield.CustomPasswordField; import org.controlsfx.control.textfield.CustomTextField; import org.controlsfx.control.textfield.TextFields; @@ -35,7 +37,6 @@ import com.google.common.primitives.Ints; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; import javafx.scene.control.Button; import javafx.scene.control.ButtonBar.ButtonData; import javafx.scene.control.ButtonType; diff --git a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/dialog/SocketConnectionDialog.java b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/dialog/SocketConnectionDialog.java index 4a6bcdb1..40f58b93 100644 --- a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/dialog/SocketConnectionDialog.java +++ b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/dialog/SocketConnectionDialog.java @@ -23,6 +23,8 @@ import java.util.Optional; +import javax.inject.Inject; + import org.controlsfx.control.textfield.CustomPasswordField; import org.controlsfx.control.textfield.CustomTextField; import org.controlsfx.control.textfield.TextFields; @@ -35,7 +37,6 @@ import com.google.common.primitives.Ints; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; import javafx.scene.control.Button; import javafx.scene.control.ButtonBar.ButtonData; import javafx.scene.control.ButtonType; diff --git a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/fxml/controller/AboutApplicationDialogController.java b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/fxml/controller/AboutApplicationDialogController.java index 63250a2b..1735f44d 100644 --- a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/fxml/controller/AboutApplicationDialogController.java +++ b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/fxml/controller/AboutApplicationDialogController.java @@ -19,6 +19,8 @@ import java.util.Map; +import javax.inject.Inject; + import org.apache.commons.text.StringSubstitutor; import org.controlsfx.control.HyperlinkLabel; import org.eclipse.e4.core.di.extensions.OSGiBundle; @@ -27,7 +29,6 @@ import org.eclipse.fx.core.log.Log; import org.osgi.framework.BundleContext; -import jakarta.inject.Inject; import javafx.application.Application; import javafx.event.ActionEvent; import javafx.fxml.FXML; diff --git a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/fxml/controller/MqttConnectionSettingsDialogController.java b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/fxml/controller/MqttConnectionSettingsDialogController.java index 16592619..a57fee61 100644 --- a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/fxml/controller/MqttConnectionSettingsDialogController.java +++ b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/fxml/controller/MqttConnectionSettingsDialogController.java @@ -15,6 +15,8 @@ ******************************************************************************/ package com.osgifx.console.application.fxml.controller; +import javax.inject.Inject; + import org.controlsfx.control.table.TableFilter; import org.eclipse.fx.core.di.ContextBoundValue; import org.eclipse.fx.core.di.ContextValue; @@ -26,7 +28,6 @@ import com.osgifx.console.application.preference.ConnectionsProvider; import com.osgifx.console.util.fx.DTOCellValueFactory; -import jakarta.inject.Inject; import javafx.beans.property.ReadOnlyObjectProperty; import javafx.fxml.FXML; import javafx.scene.control.TableColumn; diff --git a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/fxml/controller/SocketConnectionSettingsDialogController.java b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/fxml/controller/SocketConnectionSettingsDialogController.java index 590fb293..f8b89754 100644 --- a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/fxml/controller/SocketConnectionSettingsDialogController.java +++ b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/fxml/controller/SocketConnectionSettingsDialogController.java @@ -15,6 +15,8 @@ ******************************************************************************/ package com.osgifx.console.application.fxml.controller; +import javax.inject.Inject; + import org.controlsfx.control.table.TableFilter; import org.eclipse.fx.core.di.ContextBoundValue; import org.eclipse.fx.core.di.ContextValue; @@ -25,7 +27,6 @@ import com.osgifx.console.application.preference.ConnectionsProvider; import com.osgifx.console.util.fx.DTOCellValueFactory; -import jakarta.inject.Inject; import javafx.beans.property.ReadOnlyObjectProperty; import javafx.fxml.FXML; import javafx.scene.control.TableColumn; diff --git a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/AboutApplicationHandler.java b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/AboutApplicationHandler.java index c9dd8d17..e0996158 100644 --- a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/AboutApplicationHandler.java +++ b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/AboutApplicationHandler.java @@ -15,6 +15,8 @@ ******************************************************************************/ package com.osgifx.console.application.handler; +import javax.inject.Inject; + import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.core.di.annotations.Execute; @@ -23,8 +25,6 @@ import com.osgifx.console.application.dialog.AboutApplicationDialog; -import jakarta.inject.Inject; - public final class AboutApplicationHandler { @Log diff --git a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/ConnectToLocalAgentHandler.java b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/ConnectToLocalAgentHandler.java index 2a170f44..0aa8d08f 100644 --- a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/ConnectToLocalAgentHandler.java +++ b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/ConnectToLocalAgentHandler.java @@ -19,6 +19,9 @@ import static com.osgifx.console.supervisor.factory.SupervisorFactory.SupervisorType.REMOTE_RPC; import static com.osgifx.console.supervisor.factory.SupervisorFactory.SupervisorType.SNAPSHOT; +import javax.inject.Inject; +import javax.inject.Named; + import org.controlsfx.dialog.ProgressDialog; import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; @@ -38,8 +41,6 @@ import com.osgifx.console.supervisor.factory.SupervisorFactory; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; public final class ConnectToLocalAgentHandler { diff --git a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/ConnectToMqttAgentHandler.java b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/ConnectToMqttAgentHandler.java index 1e690a0f..defda516 100644 --- a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/ConnectToMqttAgentHandler.java +++ b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/ConnectToMqttAgentHandler.java @@ -22,6 +22,8 @@ import java.util.Map; +import javax.inject.Inject; + import org.controlsfx.dialog.ProgressDialog; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; @@ -49,7 +51,6 @@ import com.osgifx.console.util.fx.Fx; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; import javafx.concurrent.Task; public final class ConnectToMqttAgentHandler { diff --git a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/ConnectToSocketAgentHandler.java b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/ConnectToSocketAgentHandler.java index 37ee66c4..e3c53b9b 100644 --- a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/ConnectToSocketAgentHandler.java +++ b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/ConnectToSocketAgentHandler.java @@ -22,6 +22,8 @@ import java.util.Map; +import javax.inject.Inject; + import org.controlsfx.dialog.ProgressDialog; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; @@ -49,7 +51,6 @@ import com.osgifx.console.util.fx.Fx; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; import javafx.concurrent.Task; public final class ConnectToSocketAgentHandler { diff --git a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/DisconnectFromAgentHandler.java b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/DisconnectFromAgentHandler.java index c7a946c0..ff8123a2 100644 --- a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/DisconnectFromAgentHandler.java +++ b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/DisconnectFromAgentHandler.java @@ -19,6 +19,8 @@ import java.util.stream.Stream; +import javax.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; @@ -33,8 +35,6 @@ import com.osgifx.console.supervisor.factory.SupervisorFactory; import com.osgifx.console.supervisor.factory.SupervisorFactory.SupervisorType; -import jakarta.inject.Inject; - public final class DisconnectFromAgentHandler { @Log diff --git a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/ExtensionListMenuContributionHandler.java b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/ExtensionListMenuContributionHandler.java index e0e1d907..d0a3f509 100644 --- a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/ExtensionListMenuContributionHandler.java +++ b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/ExtensionListMenuContributionHandler.java @@ -19,6 +19,8 @@ import java.util.List; +import javax.inject.Inject; + import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.core.di.extensions.OSGiBundle; import org.eclipse.e4.ui.di.AboutToShow; @@ -32,8 +34,6 @@ import org.eclipse.fx.core.log.Log; import org.osgi.framework.BundleContext; -import jakarta.inject.Inject; - public final class ExtensionListMenuContributionHandler { @Log diff --git a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/MqttConnectionPreferenceHandler.java b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/MqttConnectionPreferenceHandler.java index 7fcec4b3..eff0f905 100644 --- a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/MqttConnectionPreferenceHandler.java +++ b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/MqttConnectionPreferenceHandler.java @@ -19,6 +19,8 @@ import java.util.stream.IntStream; import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.core.di.annotations.Optional; @@ -34,9 +36,6 @@ import com.osgifx.console.application.dialog.MqttConnectionSettingDTO; import com.osgifx.console.application.preference.ConnectionsProvider; -import jakarta.inject.Inject; -import jakarta.inject.Named; - public final class MqttConnectionPreferenceHandler { @Log diff --git a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/OpenDiagnosticsHandler.java b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/OpenDiagnosticsHandler.java index aca8fd68..7312ec10 100644 --- a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/OpenDiagnosticsHandler.java +++ b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/OpenDiagnosticsHandler.java @@ -19,6 +19,8 @@ import java.io.File; import java.io.IOException; +import javax.inject.Inject; + import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.core.di.extensions.OSGiBundle; import org.eclipse.fx.core.log.FluentLogger; @@ -27,8 +29,6 @@ import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; - public final class OpenDiagnosticsHandler { private static final String LOG_FILE_LOCATION_PROPERTY = "org.apache.sling.commons.log.file"; diff --git a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/RefreshHandler.java b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/RefreshHandler.java index 3dbdd679..96312cda 100644 --- a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/RefreshHandler.java +++ b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/RefreshHandler.java @@ -15,6 +15,9 @@ ******************************************************************************/ package com.osgifx.console.application.handler; +import javax.inject.Inject; +import javax.inject.Named; + import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.core.di.annotations.Optional; @@ -23,9 +26,6 @@ import com.osgifx.console.data.provider.DataProvider; -import jakarta.inject.Inject; -import jakarta.inject.Named; - public final class RefreshHandler { @Log diff --git a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/SocketConnectionPreferenceHandler.java b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/SocketConnectionPreferenceHandler.java index fa748f8c..cb716578 100644 --- a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/SocketConnectionPreferenceHandler.java +++ b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/handler/SocketConnectionPreferenceHandler.java @@ -19,6 +19,8 @@ import java.util.stream.IntStream; import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.core.di.annotations.Optional; @@ -34,9 +36,6 @@ import com.osgifx.console.application.dialog.SocketConnectionSettingDTO; import com.osgifx.console.application.preference.ConnectionsProvider; -import jakarta.inject.Inject; -import jakarta.inject.Named; - public final class SocketConnectionPreferenceHandler { @Log diff --git a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/ui/ConsoleStatusBarProvider.java b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/ui/ConsoleStatusBarProvider.java index 6f00e06e..2b8e1148 100644 --- a/com.osgifx.console.application/src/main/java/com/osgifx/console/application/ui/ConsoleStatusBarProvider.java +++ b/com.osgifx.console.application/src/main/java/com/osgifx/console/application/ui/ConsoleStatusBarProvider.java @@ -20,6 +20,9 @@ import static javafx.scene.paint.Color.GREEN; import static javafx.scene.paint.Color.TRANSPARENT; +import javax.inject.Inject; +import javax.inject.Named; + import org.controlsfx.control.StatusBar; import org.controlsfx.glyphfont.FontAwesome; import org.controlsfx.glyphfont.Glyph; @@ -27,8 +30,6 @@ import com.osgifx.console.ui.ConsoleStatusBar; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.beans.property.DoubleProperty; import javafx.geometry.Insets; import javafx.scene.Node; diff --git a/com.osgifx.console.extension.ui.tictactoe/src/main/java/com/osgifx/console/extension/tictactoe/GameFxController.java b/com.osgifx.console.extension.ui.tictactoe/src/main/java/com/osgifx/console/extension/tictactoe/GameFxController.java index 62a74a19..4ff609fd 100644 --- a/com.osgifx.console.extension.ui.tictactoe/src/main/java/com/osgifx/console/extension/tictactoe/GameFxController.java +++ b/com.osgifx.console.extension.ui.tictactoe/src/main/java/com/osgifx/console/extension/tictactoe/GameFxController.java @@ -15,6 +15,8 @@ ******************************************************************************/ package com.osgifx.console.extension.tictactoe; +import javax.inject.Inject; + import org.eclipse.fx.core.log.FluentLogger; import org.eclipse.fx.core.log.Log; @@ -22,7 +24,6 @@ import eu.lestard.grid.GridModel; import eu.lestard.grid.GridView; -import jakarta.inject.Inject; import javafx.beans.binding.Bindings; import javafx.fxml.FXML; import javafx.scene.control.Label; diff --git a/com.osgifx.console.extension.ui.tictactoe/src/main/java/com/osgifx/console/extension/tictactoe/GameFxUI.java b/com.osgifx.console.extension.ui.tictactoe/src/main/java/com/osgifx/console/extension/tictactoe/GameFxUI.java index 3ff116bd..e68766f3 100644 --- a/com.osgifx.console.extension.ui.tictactoe/src/main/java/com/osgifx/console/extension/tictactoe/GameFxUI.java +++ b/com.osgifx.console.extension.ui.tictactoe/src/main/java/com/osgifx/console/extension/tictactoe/GameFxUI.java @@ -22,6 +22,8 @@ import java.util.Map; import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.core.di.extensions.OSGiBundle; @@ -39,8 +41,6 @@ import com.osgifx.console.util.agent.ExtensionHelper; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; import javafx.fxml.FXMLLoader; import javafx.scene.Node; diff --git a/com.osgifx.console.ui.batchinstall/src/main/java/com/osgifx/console/ui/batchinstall/dialog/BatchInstallDialog.java b/com.osgifx.console.ui.batchinstall/src/main/java/com/osgifx/console/ui/batchinstall/dialog/BatchInstallDialog.java index 3f97be3f..59504cee 100644 --- a/com.osgifx.console.ui.batchinstall/src/main/java/com/osgifx/console/ui/batchinstall/dialog/BatchInstallDialog.java +++ b/com.osgifx.console.ui.batchinstall/src/main/java/com/osgifx/console/ui/batchinstall/dialog/BatchInstallDialog.java @@ -22,6 +22,8 @@ import java.io.File; import java.util.List; +import javax.inject.Inject; + import org.eclipse.e4.core.di.extensions.OSGiBundle; import org.eclipse.fx.core.di.LocalInstance; import org.osgi.framework.BundleContext; @@ -29,7 +31,6 @@ import com.osgifx.console.ui.batchinstall.dialog.BatchInstallDialog.ArtifactDTO; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleListProperty; diff --git a/com.osgifx.console.ui.batchinstall/src/main/java/com/osgifx/console/ui/batchinstall/dialog/BatchInstallDialogController.java b/com.osgifx.console.ui.batchinstall/src/main/java/com/osgifx/console/ui/batchinstall/dialog/BatchInstallDialogController.java index ed9a0f30..2caffd3e 100644 --- a/com.osgifx.console.ui.batchinstall/src/main/java/com/osgifx/console/ui/batchinstall/dialog/BatchInstallDialogController.java +++ b/com.osgifx.console.ui.batchinstall/src/main/java/com/osgifx/console/ui/batchinstall/dialog/BatchInstallDialogController.java @@ -18,6 +18,8 @@ import java.io.File; import java.util.List; +import javax.inject.Inject; + import org.apache.commons.io.FileUtils; import org.controlsfx.control.ListSelectionView; import org.eclipse.fx.core.log.FluentLogger; @@ -25,7 +27,6 @@ import com.osgifx.console.ui.batchinstall.dialog.BatchInstallDialog.ArtifactDTO; -import jakarta.inject.Inject; import javafx.beans.property.ObjectProperty; import javafx.collections.ObservableList; import javafx.fxml.FXML; diff --git a/com.osgifx.console.ui.batchinstall/src/main/java/com/osgifx/console/ui/batchinstall/handler/BatchInstallHandler.java b/com.osgifx.console.ui.batchinstall/src/main/java/com/osgifx/console/ui/batchinstall/handler/BatchInstallHandler.java index 07a4bbf2..2b007e53 100644 --- a/com.osgifx.console.ui.batchinstall/src/main/java/com/osgifx/console/ui/batchinstall/handler/BatchInstallHandler.java +++ b/com.osgifx.console.ui.batchinstall/src/main/java/com/osgifx/console/ui/batchinstall/handler/BatchInstallHandler.java @@ -19,6 +19,9 @@ import static com.osgifx.console.event.topics.ConfigurationActionEventTopics.CONFIGURATION_UPDATED_EVENT_TOPIC; import static com.osgifx.console.supervisor.Supervisor.AGENT_DISCONNECTED_EVENT_TOPIC; +import javax.inject.Inject; +import javax.inject.Named; + import org.controlsfx.dialog.ProgressDialog; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; @@ -36,8 +39,6 @@ import com.osgifx.console.ui.batchinstall.dialog.BatchInstallDialog; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; import javafx.stage.DirectoryChooser; diff --git a/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/BundleDetailsFxController.java b/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/BundleDetailsFxController.java index d1ebbaf2..ca5d2066 100644 --- a/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/BundleDetailsFxController.java +++ b/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/BundleDetailsFxController.java @@ -21,6 +21,9 @@ import java.util.Map; import java.util.Map.Entry; +import javax.inject.Inject; +import javax.inject.Named; + import org.controlsfx.control.ToggleSwitch; import org.controlsfx.control.table.TableFilter; import org.eclipse.fx.core.command.CommandService; @@ -36,8 +39,6 @@ import com.osgifx.console.util.fx.DTOCellValueFactory; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.beans.binding.When; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; diff --git a/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/BundlesFxController.java b/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/BundlesFxController.java index 95f0b38c..592fc970 100644 --- a/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/BundlesFxController.java +++ b/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/BundlesFxController.java @@ -19,6 +19,9 @@ import java.util.function.Predicate; +import javax.inject.Inject; +import javax.inject.Named; + import org.controlsfx.control.table.TableFilter; import org.controlsfx.control.table.TableRowExpanderColumn; import org.controlsfx.control.table.TableRowExpanderColumn.TableRowDataFeatures; @@ -36,8 +39,6 @@ import com.osgifx.console.util.fx.DTOCellValueFactory; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.collections.transformation.FilteredList; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; diff --git a/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/BundlesFxUI.java b/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/BundlesFxUI.java index 7ab3ef94..f94ac0c7 100644 --- a/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/BundlesFxUI.java +++ b/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/BundlesFxUI.java @@ -22,6 +22,8 @@ import static javafx.geometry.Orientation.VERTICAL; import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.core.di.extensions.OSGiBundle; @@ -41,8 +43,6 @@ import com.osgifx.console.util.fx.Fx; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; import javafx.fxml.FXMLLoader; import javafx.scene.Node; diff --git a/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/addon/DragAndDropAddon.java b/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/addon/DragAndDropAddon.java index ef83cbb3..e9df6ec1 100644 --- a/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/addon/DragAndDropAddon.java +++ b/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/addon/DragAndDropAddon.java @@ -17,6 +17,8 @@ import static com.osgifx.console.event.topics.BundleActionEventTopics.BUNDLE_INSTALLED_EVENT_TOPIC; +import javax.inject.Inject; + import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.core.di.extensions.EventTopic; import org.eclipse.e4.core.services.events.IEventBroker; @@ -36,7 +38,6 @@ import com.osgifx.console.util.fx.Fx; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; import javafx.concurrent.Task; import javafx.scene.Scene; import javafx.scene.control.ButtonType; diff --git a/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/dialog/BundleInstallDialog.java b/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/dialog/BundleInstallDialog.java index 5e090fa7..e1946b98 100644 --- a/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/dialog/BundleInstallDialog.java +++ b/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/dialog/BundleInstallDialog.java @@ -17,13 +17,14 @@ import static com.osgifx.console.constants.FxConstants.STANDARD_CSS; +import javax.inject.Inject; + import org.eclipse.e4.core.di.extensions.OSGiBundle; import org.eclipse.fx.core.di.LocalInstance; import org.osgi.framework.BundleContext; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; import javafx.fxml.FXMLLoader; import javafx.scene.control.ButtonBar.ButtonData; import javafx.scene.control.ButtonType; diff --git a/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/dialog/BundleInstallDialogController.java b/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/dialog/BundleInstallDialogController.java index 5b226557..fd5b8438 100644 --- a/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/dialog/BundleInstallDialogController.java +++ b/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/dialog/BundleInstallDialogController.java @@ -18,6 +18,8 @@ import java.io.File; import java.util.function.UnaryOperator; +import javax.inject.Inject; + import org.controlsfx.control.ToggleSwitch; import org.eclipse.fx.core.ThreadSynchronize; import org.eclipse.fx.core.log.FluentLogger; @@ -25,7 +27,6 @@ import com.google.common.primitives.Ints; -import jakarta.inject.Inject; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; import javafx.event.ActionEvent; diff --git a/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/handler/BundleInstallHandler.java b/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/handler/BundleInstallHandler.java index 3f2e643a..c636529b 100644 --- a/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/handler/BundleInstallHandler.java +++ b/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/handler/BundleInstallHandler.java @@ -17,6 +17,9 @@ import static com.osgifx.console.event.topics.BundleActionEventTopics.BUNDLE_INSTALLED_EVENT_TOPIC; +import javax.inject.Inject; +import javax.inject.Named; + import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.core.di.annotations.CanExecute; @@ -33,8 +36,6 @@ import com.osgifx.console.ui.bundles.dialog.BundleInstallDialog; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; public final class BundleInstallHandler { diff --git a/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/handler/BundleStartHandler.java b/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/handler/BundleStartHandler.java index 91b9c411..91492c00 100644 --- a/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/handler/BundleStartHandler.java +++ b/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/handler/BundleStartHandler.java @@ -17,6 +17,9 @@ import static com.osgifx.console.event.topics.BundleActionEventTopics.BUNDLE_STARTED_EVENT_TOPIC; +import javax.inject.Inject; +import javax.inject.Named; + import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.core.di.annotations.Optional; @@ -29,8 +32,6 @@ import com.osgifx.console.supervisor.Supervisor; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; public final class BundleStartHandler { diff --git a/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/handler/BundleStopHandler.java b/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/handler/BundleStopHandler.java index 7fed94c5..be4dd076 100644 --- a/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/handler/BundleStopHandler.java +++ b/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/handler/BundleStopHandler.java @@ -17,6 +17,9 @@ import static com.osgifx.console.event.topics.BundleActionEventTopics.BUNDLE_STOPPED_EVENT_TOPIC; +import javax.inject.Inject; +import javax.inject.Named; + import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.core.di.annotations.Optional; @@ -29,8 +32,6 @@ import com.osgifx.console.supervisor.Supervisor; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; public final class BundleStopHandler { diff --git a/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/handler/BundleUninstallHandler.java b/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/handler/BundleUninstallHandler.java index a28993a7..10042f9c 100644 --- a/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/handler/BundleUninstallHandler.java +++ b/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/handler/BundleUninstallHandler.java @@ -17,6 +17,9 @@ import static com.osgifx.console.event.topics.BundleActionEventTopics.BUNDLE_UNINSTALLED_EVENT_TOPIC; +import javax.inject.Inject; +import javax.inject.Named; + import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.core.di.annotations.Optional; @@ -29,8 +32,6 @@ import com.osgifx.console.supervisor.Supervisor; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; public final class BundleUninstallHandler { diff --git a/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/handler/GenerateObrHandler.java b/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/handler/GenerateObrHandler.java index 77e8bb91..4f674f0c 100644 --- a/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/handler/GenerateObrHandler.java +++ b/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/handler/GenerateObrHandler.java @@ -20,6 +20,9 @@ import java.io.FileOutputStream; import java.io.OutputStream; +import javax.inject.Inject; +import javax.inject.Named; + import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.core.di.annotations.Optional; @@ -36,8 +39,6 @@ import com.osgifx.console.util.fx.FxDialog; import com.osgifx.console.util.io.IO; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.stage.DirectoryChooser; public final class GenerateObrHandler { diff --git a/com.osgifx.console.ui.components/src/main/java/com/osgifx/console/ui/components/ComponentDetailsFxController.java b/com.osgifx.console.ui.components/src/main/java/com/osgifx/console/ui/components/ComponentDetailsFxController.java index 648956be..b7b87cc6 100644 --- a/com.osgifx.console.ui.components/src/main/java/com/osgifx/console/ui/components/ComponentDetailsFxController.java +++ b/com.osgifx.console.ui.components/src/main/java/com/osgifx/console/ui/components/ComponentDetailsFxController.java @@ -19,6 +19,9 @@ import java.util.Map.Entry; import java.util.concurrent.atomic.AtomicBoolean; +import javax.inject.Inject; +import javax.inject.Named; + import org.controlsfx.control.table.TableFilter; import org.controlsfx.control.table.TableRowExpanderColumn; import org.controlsfx.control.table.TableRowExpanderColumn.TableRowDataFeatures; @@ -37,8 +40,6 @@ import com.osgifx.console.util.fx.DTOCellValueFactory; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.beans.binding.When; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; diff --git a/com.osgifx.console.ui.components/src/main/java/com/osgifx/console/ui/components/ComponentsFxController.java b/com.osgifx.console.ui.components/src/main/java/com/osgifx/console/ui/components/ComponentsFxController.java index 119344e5..05deb1e8 100644 --- a/com.osgifx.console.ui.components/src/main/java/com/osgifx/console/ui/components/ComponentsFxController.java +++ b/com.osgifx.console.ui.components/src/main/java/com/osgifx/console/ui/components/ComponentsFxController.java @@ -19,6 +19,9 @@ import java.util.function.Predicate; +import javax.inject.Inject; +import javax.inject.Named; + import org.controlsfx.control.table.TableFilter; import org.controlsfx.control.table.TableRowExpanderColumn; import org.controlsfx.control.table.TableRowExpanderColumn.TableRowDataFeatures; @@ -37,8 +40,6 @@ import com.osgifx.console.util.fx.DTOCellValueFactory; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.beans.property.ReadOnlyStringProperty; import javafx.beans.property.SimpleStringProperty; import javafx.collections.transformation.FilteredList; diff --git a/com.osgifx.console.ui.components/src/main/java/com/osgifx/console/ui/components/ComponentsFxUI.java b/com.osgifx.console.ui.components/src/main/java/com/osgifx/console/ui/components/ComponentsFxUI.java index 9b524611..c53e2b35 100644 --- a/com.osgifx.console.ui.components/src/main/java/com/osgifx/console/ui/components/ComponentsFxUI.java +++ b/com.osgifx.console.ui.components/src/main/java/com/osgifx/console/ui/components/ComponentsFxUI.java @@ -22,6 +22,8 @@ import static javafx.geometry.Orientation.VERTICAL; import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.core.di.extensions.OSGiBundle; @@ -41,8 +43,6 @@ import com.osgifx.console.util.fx.Fx; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; import javafx.fxml.FXMLLoader; import javafx.scene.Node; diff --git a/com.osgifx.console.ui.components/src/main/java/com/osgifx/console/ui/components/ReferenceDetailsFxController.java b/com.osgifx.console.ui.components/src/main/java/com/osgifx/console/ui/components/ReferenceDetailsFxController.java index 1593f821..a038c52b 100644 --- a/com.osgifx.console.ui.components/src/main/java/com/osgifx/console/ui/components/ReferenceDetailsFxController.java +++ b/com.osgifx.console.ui.components/src/main/java/com/osgifx/console/ui/components/ReferenceDetailsFxController.java @@ -15,12 +15,13 @@ ******************************************************************************/ package com.osgifx.console.ui.components; +import javax.inject.Inject; + import org.eclipse.fx.core.log.FluentLogger; import org.eclipse.fx.core.log.Log; import com.osgifx.console.agent.dto.XReferenceDTO; -import jakarta.inject.Inject; import javafx.fxml.FXML; import javafx.scene.control.Label; diff --git a/com.osgifx.console.ui.components/src/main/java/com/osgifx/console/ui/components/handler/ComponentDisableHandler.java b/com.osgifx.console.ui.components/src/main/java/com/osgifx/console/ui/components/handler/ComponentDisableHandler.java index 024e4dd9..03d80418 100644 --- a/com.osgifx.console.ui.components/src/main/java/com/osgifx/console/ui/components/handler/ComponentDisableHandler.java +++ b/com.osgifx.console.ui.components/src/main/java/com/osgifx/console/ui/components/handler/ComponentDisableHandler.java @@ -17,6 +17,9 @@ import static com.osgifx.console.event.topics.ComponentActionEventTopics.COMPONENT_DISABLED_EVENT_TOPIC; +import javax.inject.Inject; +import javax.inject.Named; + import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Creatable; import org.eclipse.e4.core.di.annotations.Execute; @@ -31,8 +34,6 @@ import com.osgifx.console.supervisor.Supervisor; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; @Creatable diff --git a/com.osgifx.console.ui.components/src/main/java/com/osgifx/console/ui/components/handler/ComponentEnableHandler.java b/com.osgifx.console.ui.components/src/main/java/com/osgifx/console/ui/components/handler/ComponentEnableHandler.java index cbeabc7c..dc844ac3 100644 --- a/com.osgifx.console.ui.components/src/main/java/com/osgifx/console/ui/components/handler/ComponentEnableHandler.java +++ b/com.osgifx.console.ui.components/src/main/java/com/osgifx/console/ui/components/handler/ComponentEnableHandler.java @@ -17,6 +17,9 @@ import static com.osgifx.console.event.topics.ComponentActionEventTopics.COMPONENT_ENABLED_EVENT_TOPIC; +import javax.inject.Inject; +import javax.inject.Named; + import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.core.di.annotations.Optional; @@ -30,8 +33,6 @@ import com.osgifx.console.supervisor.Supervisor; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; public final class ComponentEnableHandler { diff --git a/com.osgifx.console.ui.configurations/src/main/java/com/osgifx/console/ui/configurations/ConfigurationEditorFxController.java b/com.osgifx.console.ui.configurations/src/main/java/com/osgifx/console/ui/configurations/ConfigurationEditorFxController.java index f184e405..be842883 100644 --- a/com.osgifx.console.ui.configurations/src/main/java/com/osgifx/console/ui/configurations/ConfigurationEditorFxController.java +++ b/com.osgifx.console.ui.configurations/src/main/java/com/osgifx/console/ui/configurations/ConfigurationEditorFxController.java @@ -40,6 +40,9 @@ import java.util.Map.Entry; import java.util.stream.Collectors; +import javax.inject.Inject; +import javax.inject.Named; + import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.ui.services.internal.events.EventBroker; import org.eclipse.fx.core.log.FluentLogger; @@ -69,8 +72,6 @@ import com.osgifx.console.util.converter.ValueConverter; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.beans.binding.When; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; diff --git a/com.osgifx.console.ui.configurations/src/main/java/com/osgifx/console/ui/configurations/ConfigurationsFxController.java b/com.osgifx.console.ui.configurations/src/main/java/com/osgifx/console/ui/configurations/ConfigurationsFxController.java index f7131d2b..f74a1c66 100644 --- a/com.osgifx.console.ui.configurations/src/main/java/com/osgifx/console/ui/configurations/ConfigurationsFxController.java +++ b/com.osgifx.console.ui.configurations/src/main/java/com/osgifx/console/ui/configurations/ConfigurationsFxController.java @@ -19,6 +19,9 @@ import java.util.function.Predicate; +import javax.inject.Inject; +import javax.inject.Named; + import org.controlsfx.control.table.TableFilter; import org.controlsfx.control.table.TableRowExpanderColumn; import org.controlsfx.control.table.TableRowExpanderColumn.TableRowDataFeatures; @@ -36,8 +39,6 @@ import com.osgifx.console.util.fx.DTOCellValueFactory; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.collections.transformation.FilteredList; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; diff --git a/com.osgifx.console.ui.configurations/src/main/java/com/osgifx/console/ui/configurations/ConfigurationsFxUI.java b/com.osgifx.console.ui.configurations/src/main/java/com/osgifx/console/ui/configurations/ConfigurationsFxUI.java index 489febb4..0170ab75 100644 --- a/com.osgifx.console.ui.configurations/src/main/java/com/osgifx/console/ui/configurations/ConfigurationsFxUI.java +++ b/com.osgifx.console.ui.configurations/src/main/java/com/osgifx/console/ui/configurations/ConfigurationsFxUI.java @@ -22,6 +22,8 @@ import static javafx.geometry.Orientation.VERTICAL; import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.core.di.extensions.OSGiBundle; @@ -41,8 +43,6 @@ import com.osgifx.console.util.fx.Fx; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; import javafx.fxml.FXMLLoader; import javafx.scene.Node; diff --git a/com.osgifx.console.ui.configurations/src/main/java/com/osgifx/console/ui/configurations/dialog/ConfigurationCreateDialog.java b/com.osgifx.console.ui.configurations/src/main/java/com/osgifx/console/ui/configurations/dialog/ConfigurationCreateDialog.java index f29234d6..30c107bb 100644 --- a/com.osgifx.console.ui.configurations/src/main/java/com/osgifx/console/ui/configurations/dialog/ConfigurationCreateDialog.java +++ b/com.osgifx.console.ui.configurations/src/main/java/com/osgifx/console/ui/configurations/dialog/ConfigurationCreateDialog.java @@ -21,6 +21,8 @@ import java.util.Map; import java.util.function.Supplier; +import javax.inject.Inject; + import org.apache.commons.lang3.StringUtils; import org.controlsfx.control.textfield.CustomTextField; import org.controlsfx.control.textfield.TextFields; @@ -37,7 +39,6 @@ import com.osgifx.console.util.fx.PropertiesForm; import com.osgifx.console.util.fx.PropertiesForm.FormContent; -import jakarta.inject.Inject; import javafx.scene.control.Button; import javafx.scene.control.ButtonBar.ButtonData; import javafx.scene.control.ButtonType; diff --git a/com.osgifx.console.ui.configurations/src/main/java/com/osgifx/console/ui/configurations/handler/ConfigurationCreateHandler.java b/com.osgifx.console.ui.configurations/src/main/java/com/osgifx/console/ui/configurations/handler/ConfigurationCreateHandler.java index 1c293cca..070c6619 100644 --- a/com.osgifx.console.ui.configurations/src/main/java/com/osgifx/console/ui/configurations/handler/ConfigurationCreateHandler.java +++ b/com.osgifx.console.ui.configurations/src/main/java/com/osgifx/console/ui/configurations/handler/ConfigurationCreateHandler.java @@ -17,6 +17,9 @@ import static com.osgifx.console.event.topics.ConfigurationActionEventTopics.CONFIGURATION_UPDATED_EVENT_TOPIC; +import javax.inject.Inject; +import javax.inject.Named; + import org.apache.commons.lang3.StringUtils; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; @@ -33,8 +36,6 @@ import com.osgifx.console.util.fx.Fx; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; public final class ConfigurationCreateHandler { diff --git a/com.osgifx.console.ui.dmt/src/main/java/com/osgifx/console/ui/dmt/DmtFxController.java b/com.osgifx.console.ui.dmt/src/main/java/com/osgifx/console/ui/dmt/DmtFxController.java index f2bb269a..38dba736 100644 --- a/com.osgifx.console.ui.dmt/src/main/java/com/osgifx/console/ui/dmt/DmtFxController.java +++ b/com.osgifx.console.ui.dmt/src/main/java/com/osgifx/console/ui/dmt/DmtFxController.java @@ -19,6 +19,9 @@ import java.util.Map; +import javax.inject.Inject; +import javax.inject.Named; + import org.apache.commons.lang3.StringUtils; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; @@ -40,8 +43,6 @@ import com.osgifx.console.supervisor.Supervisor; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; import javafx.fxml.FXML; import javafx.scene.control.Button; diff --git a/com.osgifx.console.ui.dmt/src/main/java/com/osgifx/console/ui/dmt/DmtFxUI.java b/com.osgifx.console.ui.dmt/src/main/java/com/osgifx/console/ui/dmt/DmtFxUI.java index b824772a..52923b1c 100644 --- a/com.osgifx.console.ui.dmt/src/main/java/com/osgifx/console/ui/dmt/DmtFxUI.java +++ b/com.osgifx.console.ui.dmt/src/main/java/com/osgifx/console/ui/dmt/DmtFxUI.java @@ -21,6 +21,8 @@ import static com.osgifx.console.supervisor.Supervisor.AGENT_DISCONNECTED_EVENT_TOPIC; import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.ui.di.UIEventTopic; @@ -36,8 +38,6 @@ import com.osgifx.console.ui.ConsoleStatusBar; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; import javafx.scene.Node; import javafx.scene.layout.BorderPane; diff --git a/com.osgifx.console.ui.dmt/src/main/java/com/osgifx/console/ui/dmt/UpdateNodeDialog.java b/com.osgifx.console.ui.dmt/src/main/java/com/osgifx/console/ui/dmt/UpdateNodeDialog.java index 461b8c24..fa69452b 100644 --- a/com.osgifx.console.ui.dmt/src/main/java/com/osgifx/console/ui/dmt/UpdateNodeDialog.java +++ b/com.osgifx.console.ui.dmt/src/main/java/com/osgifx/console/ui/dmt/UpdateNodeDialog.java @@ -26,6 +26,8 @@ import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatterBuilder; +import javax.inject.Inject; + import org.eclipse.fx.core.log.FluentLogger; import org.eclipse.fx.core.log.Log; import org.osgi.util.converter.Converter; @@ -41,7 +43,6 @@ import com.osgifx.console.agent.dto.XDmtNodeDTO; import com.osgifx.console.ui.dmt.UpdateNodeDialog.UpdateDialogDTO; -import jakarta.inject.Inject; import javafx.geometry.Insets; import javafx.scene.control.ButtonBar.ButtonData; import javafx.scene.control.ButtonType; diff --git a/com.osgifx.console.ui.dto/src/main/java/com/osgifx/console/ui/dto/DtoFxController.java b/com.osgifx.console.ui.dto/src/main/java/com/osgifx/console/ui/dto/DtoFxController.java index adc14b20..6f2485c3 100644 --- a/com.osgifx.console.ui.dto/src/main/java/com/osgifx/console/ui/dto/DtoFxController.java +++ b/com.osgifx.console.ui.dto/src/main/java/com/osgifx/console/ui/dto/DtoFxController.java @@ -15,6 +15,9 @@ ******************************************************************************/ package com.osgifx.console.ui.dto; +import javax.inject.Inject; +import javax.inject.Named; + import org.apache.commons.lang3.StringUtils; import org.eclipse.fx.core.ThreadSynchronize; import org.eclipse.fx.core.log.FluentLogger; @@ -29,8 +32,6 @@ import com.osgifx.console.data.provider.DataProvider; import com.osgifx.console.executor.Executor; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; import javafx.fxml.FXML; import javafx.scene.control.Button; diff --git a/com.osgifx.console.ui.dto/src/main/java/com/osgifx/console/ui/dto/DtoFxUI.java b/com.osgifx.console.ui.dto/src/main/java/com/osgifx/console/ui/dto/DtoFxUI.java index 764e815b..e1f07d2f 100644 --- a/com.osgifx.console.ui.dto/src/main/java/com/osgifx/console/ui/dto/DtoFxUI.java +++ b/com.osgifx.console.ui.dto/src/main/java/com/osgifx/console/ui/dto/DtoFxUI.java @@ -20,6 +20,8 @@ import static com.osgifx.console.supervisor.Supervisor.AGENT_DISCONNECTED_EVENT_TOPIC; import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.ui.di.UIEventTopic; @@ -35,8 +37,6 @@ import com.osgifx.console.ui.ConsoleStatusBar; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; import javafx.scene.Node; import javafx.scene.layout.BorderPane; diff --git a/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/EventDetailsFxController.java b/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/EventDetailsFxController.java index 15e03d29..c6537636 100644 --- a/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/EventDetailsFxController.java +++ b/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/EventDetailsFxController.java @@ -18,6 +18,8 @@ import java.util.Date; import java.util.Map.Entry; +import javax.inject.Inject; + import org.eclipse.fx.core.log.FluentLogger; import org.eclipse.fx.core.log.Log; import org.osgi.util.converter.Converter; @@ -26,7 +28,6 @@ import com.osgifx.console.agent.dto.XEventDTO; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; import javafx.beans.property.SimpleStringProperty; import javafx.collections.FXCollections; import javafx.fxml.FXML; diff --git a/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/EventsFxController.java b/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/EventsFxController.java index 07928213..d7b84056 100644 --- a/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/EventsFxController.java +++ b/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/EventsFxController.java @@ -17,6 +17,9 @@ import java.util.Date; +import javax.inject.Inject; +import javax.inject.Named; + import org.controlsfx.control.table.TableFilter; import org.controlsfx.control.table.TableRowExpanderColumn; import org.controlsfx.control.table.TableRowExpanderColumn.TableRowDataFeatures; @@ -31,8 +34,6 @@ import com.osgifx.console.util.fx.DTOCellValueFactory; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.scene.control.TableColumn; diff --git a/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/EventsFxUI.java b/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/EventsFxUI.java index 1c5653de..1a0b9878 100644 --- a/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/EventsFxUI.java +++ b/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/EventsFxUI.java @@ -22,6 +22,8 @@ import static com.osgifx.console.supervisor.Supervisor.AGENT_DISCONNECTED_EVENT_TOPIC; import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; @@ -39,8 +41,6 @@ import com.osgifx.console.ui.events.dialog.SubscribedEventsDialog; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; import javafx.fxml.FXMLLoader; import javafx.scene.Node; diff --git a/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/dialog/SendEventDialog.java b/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/dialog/SendEventDialog.java index 9ee8dc49..4cd7cce9 100644 --- a/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/dialog/SendEventDialog.java +++ b/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/dialog/SendEventDialog.java @@ -24,6 +24,8 @@ import java.util.Map; import java.util.function.Supplier; +import javax.inject.Inject; + import org.apache.commons.lang3.StringUtils; import org.controlsfx.control.ToggleSwitch; import org.controlsfx.control.textfield.CustomTextField; @@ -42,7 +44,6 @@ import com.osgifx.console.util.fx.PropertiesForm; import com.osgifx.console.util.fx.PropertiesForm.FormContent; -import jakarta.inject.Inject; import javafx.scene.control.Button; import javafx.scene.control.ButtonBar.ButtonData; import javafx.scene.control.ButtonType; diff --git a/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/dialog/SubscribedEventsDialog.java b/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/dialog/SubscribedEventsDialog.java index 5546b334..ae6e0201 100644 --- a/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/dialog/SubscribedEventsDialog.java +++ b/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/dialog/SubscribedEventsDialog.java @@ -20,13 +20,14 @@ import java.util.List; +import javax.inject.Inject; + import org.eclipse.e4.core.di.extensions.OSGiBundle; import org.eclipse.fx.core.di.LocalInstance; import org.osgi.framework.BundleContext; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; import javafx.fxml.FXMLLoader; import javafx.scene.control.Dialog; import javafx.scene.image.ImageView; diff --git a/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/dialog/SubscribedEventsDialogController.java b/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/dialog/SubscribedEventsDialogController.java index b660e613..74c96b83 100644 --- a/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/dialog/SubscribedEventsDialogController.java +++ b/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/dialog/SubscribedEventsDialogController.java @@ -17,11 +17,12 @@ import java.util.Set; +import javax.inject.Inject; +import javax.inject.Named; + import org.eclipse.fx.core.log.FluentLogger; import org.eclipse.fx.core.log.Log; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.fxml.FXML; import javafx.scene.control.ListView; diff --git a/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/dialog/TopicEntryDialog.java b/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/dialog/TopicEntryDialog.java index 772f75cf..ffb2a269 100644 --- a/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/dialog/TopicEntryDialog.java +++ b/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/dialog/TopicEntryDialog.java @@ -23,6 +23,8 @@ import java.util.List; import java.util.Set; +import javax.inject.Inject; + import org.apache.commons.lang3.StringUtils; import org.controlsfx.control.textfield.CustomTextField; import org.controlsfx.control.textfield.TextFields; @@ -36,7 +38,6 @@ import com.google.common.collect.Lists; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; import javafx.geometry.Pos; import javafx.scene.control.Button; import javafx.scene.control.ButtonBar.ButtonData; diff --git a/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/handler/ClearEventsTableHandler.java b/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/handler/ClearEventsTableHandler.java index 9c161331..9c368f4a 100644 --- a/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/handler/ClearEventsTableHandler.java +++ b/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/handler/ClearEventsTableHandler.java @@ -17,15 +17,15 @@ import static com.osgifx.console.event.topics.EventReceiveEventTopics.CLEAR_EVENTS_TOPIC; +import javax.inject.Inject; +import javax.inject.Named; + import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.core.services.events.IEventBroker; import org.eclipse.fx.core.log.FluentLogger; import org.eclipse.fx.core.log.Log; -import jakarta.inject.Inject; -import jakarta.inject.Named; - public final class ClearEventsTableHandler { @Log diff --git a/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/handler/EventReceiveMenuContributionHandler.java b/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/handler/EventReceiveMenuContributionHandler.java index 3e3c02f4..7f1aea27 100644 --- a/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/handler/EventReceiveMenuContributionHandler.java +++ b/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/handler/EventReceiveMenuContributionHandler.java @@ -27,6 +27,9 @@ import java.util.function.BooleanSupplier; import java.util.function.Consumer; +import javax.inject.Inject; +import javax.inject.Named; + import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.core.di.annotations.CanExecute; @@ -57,9 +60,6 @@ import com.osgifx.console.ui.events.dialog.TopicEntryDialog; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; - public final class EventReceiveMenuContributionHandler { private static final String PID = "event.receive.topics"; diff --git a/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/handler/SendEventHandler.java b/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/handler/SendEventHandler.java index c208114f..e14cf2a3 100644 --- a/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/handler/SendEventHandler.java +++ b/com.osgifx.console.ui.events/src/main/java/com/osgifx/console/ui/events/handler/SendEventHandler.java @@ -15,6 +15,9 @@ ******************************************************************************/ package com.osgifx.console.ui.events.handler; +import javax.inject.Inject; +import javax.inject.Named; + import org.apache.commons.lang3.StringUtils; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; @@ -31,8 +34,6 @@ import com.osgifx.console.util.fx.Fx; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; public final class SendEventHandler { diff --git a/com.osgifx.console.ui.extension/src/main/java/com/osgifx/console/ui/extension/dialog/ExtensionsViewDialog.java b/com.osgifx.console.ui.extension/src/main/java/com/osgifx/console/ui/extension/dialog/ExtensionsViewDialog.java index fd680277..a5139ad3 100644 --- a/com.osgifx.console.ui.extension/src/main/java/com/osgifx/console/ui/extension/dialog/ExtensionsViewDialog.java +++ b/com.osgifx.console.ui.extension/src/main/java/com/osgifx/console/ui/extension/dialog/ExtensionsViewDialog.java @@ -17,13 +17,14 @@ import static com.osgifx.console.constants.FxConstants.STANDARD_CSS; +import javax.inject.Inject; + import org.eclipse.e4.core.di.extensions.OSGiBundle; import org.eclipse.fx.core.di.LocalInstance; import org.osgi.framework.BundleContext; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; import javafx.fxml.FXMLLoader; import javafx.scene.control.ButtonType; import javafx.scene.control.Dialog; diff --git a/com.osgifx.console.ui.extension/src/main/java/com/osgifx/console/ui/extension/dialog/ExtensionsViewDialogController.java b/com.osgifx.console.ui.extension/src/main/java/com/osgifx/console/ui/extension/dialog/ExtensionsViewDialogController.java index bd2129f5..fa4f6390 100644 --- a/com.osgifx.console.ui.extension/src/main/java/com/osgifx/console/ui/extension/dialog/ExtensionsViewDialogController.java +++ b/com.osgifx.console.ui.extension/src/main/java/com/osgifx/console/ui/extension/dialog/ExtensionsViewDialogController.java @@ -17,6 +17,8 @@ import java.util.stream.Stream; +import javax.inject.Inject; + import org.eclipse.e4.ui.workbench.IWorkbench; import org.eclipse.fx.core.ThreadSynchronize; import org.eclipse.fx.core.log.FluentLogger; @@ -27,7 +29,6 @@ import com.osgifx.console.util.fx.DTOCellValueFactory; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.fxml.FXML; diff --git a/com.osgifx.console.ui.extension/src/main/java/com/osgifx/console/ui/extension/handler/ExtensionInstallHandler.java b/com.osgifx.console.ui.extension/src/main/java/com/osgifx/console/ui/extension/handler/ExtensionInstallHandler.java index 23acf208..6ccba595 100644 --- a/com.osgifx.console.ui.extension/src/main/java/com/osgifx/console/ui/extension/handler/ExtensionInstallHandler.java +++ b/com.osgifx.console.ui.extension/src/main/java/com/osgifx/console/ui/extension/handler/ExtensionInstallHandler.java @@ -19,6 +19,8 @@ import java.io.FileInputStream; +import javax.inject.Inject; + import org.controlsfx.dialog.ProgressDialog; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.ui.workbench.IWorkbench; @@ -31,7 +33,6 @@ import com.osgifx.console.executor.Executor; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; import javafx.concurrent.Task; import javafx.stage.FileChooser; diff --git a/com.osgifx.console.ui.extension/src/main/java/com/osgifx/console/ui/extension/handler/ExtensionsViewHandler.java b/com.osgifx.console.ui.extension/src/main/java/com/osgifx/console/ui/extension/handler/ExtensionsViewHandler.java index f6bfde38..b8420100 100644 --- a/com.osgifx.console.ui.extension/src/main/java/com/osgifx/console/ui/extension/handler/ExtensionsViewHandler.java +++ b/com.osgifx.console.ui.extension/src/main/java/com/osgifx/console/ui/extension/handler/ExtensionsViewHandler.java @@ -15,6 +15,8 @@ ******************************************************************************/ package com.osgifx.console.ui.extension.handler; +import javax.inject.Inject; + import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.core.di.annotations.Execute; @@ -23,8 +25,6 @@ import com.osgifx.console.ui.extension.dialog.ExtensionsViewDialog; -import jakarta.inject.Inject; - public final class ExtensionsViewHandler { @Log diff --git a/com.osgifx.console.ui.gogo/src/main/java/com/osgifx/console/ui/gogo/GogoFxController.java b/com.osgifx.console.ui.gogo/src/main/java/com/osgifx/console/ui/gogo/GogoFxController.java index 294a570f..dd38ca15 100644 --- a/com.osgifx.console.ui.gogo/src/main/java/com/osgifx/console/ui/gogo/GogoFxController.java +++ b/com.osgifx.console.ui.gogo/src/main/java/com/osgifx/console/ui/gogo/GogoFxController.java @@ -15,6 +15,9 @@ ******************************************************************************/ package com.osgifx.console.ui.gogo; +import javax.inject.Inject; +import javax.inject.Named; + import org.controlsfx.control.textfield.TextFields; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.fx.core.log.FluentLogger; @@ -25,8 +28,6 @@ import com.osgifx.console.executor.Executor; import com.osgifx.console.supervisor.Supervisor; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; import javafx.fxml.FXML; import javafx.scene.control.TextArea; diff --git a/com.osgifx.console.ui.gogo/src/main/java/com/osgifx/console/ui/gogo/GogoFxUI.java b/com.osgifx.console.ui.gogo/src/main/java/com/osgifx/console/ui/gogo/GogoFxUI.java index 35379a15..f7d6ab8a 100644 --- a/com.osgifx.console.ui.gogo/src/main/java/com/osgifx/console/ui/gogo/GogoFxUI.java +++ b/com.osgifx.console.ui.gogo/src/main/java/com/osgifx/console/ui/gogo/GogoFxUI.java @@ -20,6 +20,7 @@ import static com.osgifx.console.supervisor.Supervisor.AGENT_DISCONNECTED_EVENT_TOPIC; import javax.annotation.PostConstruct; +import javax.inject.Inject; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.core.di.extensions.OSGiBundle; @@ -34,7 +35,6 @@ import com.osgifx.console.ui.ConsoleStatusBar; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; import javafx.concurrent.Task; import javafx.fxml.FXMLLoader; import javafx.scene.Node; diff --git a/com.osgifx.console.ui.graph/src/main/java/com/osgifx/console/ui/graph/GraphFxBundleController.java b/com.osgifx.console.ui.graph/src/main/java/com/osgifx/console/ui/graph/GraphFxBundleController.java index c2e96f6e..c4fb9364 100644 --- a/com.osgifx.console.ui.graph/src/main/java/com/osgifx/console/ui/graph/GraphFxBundleController.java +++ b/com.osgifx.console.ui.graph/src/main/java/com/osgifx/console/ui/graph/GraphFxBundleController.java @@ -25,6 +25,8 @@ import java.util.concurrent.Future; import java.util.stream.Stream; +import javax.inject.Inject; + import org.apache.commons.lang3.StringUtils; import org.controlsfx.control.CheckListView; import org.controlsfx.control.MaskerPane; @@ -49,7 +51,6 @@ import com.osgifx.console.smartgraph.graphview.SmartRandomPlacementStrategy; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; import javafx.collections.ObservableList; import javafx.collections.transformation.FilteredList; import javafx.concurrent.Task; diff --git a/com.osgifx.console.ui.graph/src/main/java/com/osgifx/console/ui/graph/GraphFxComponentController.java b/com.osgifx.console.ui.graph/src/main/java/com/osgifx/console/ui/graph/GraphFxComponentController.java index 97c6e030..911eabd3 100644 --- a/com.osgifx.console.ui.graph/src/main/java/com/osgifx/console/ui/graph/GraphFxComponentController.java +++ b/com.osgifx.console.ui.graph/src/main/java/com/osgifx/console/ui/graph/GraphFxComponentController.java @@ -25,6 +25,8 @@ import java.util.concurrent.Future; import java.util.stream.Stream; +import javax.inject.Inject; + import org.apache.commons.lang3.StringUtils; import org.controlsfx.control.CheckListView; import org.controlsfx.control.MaskerPane; @@ -49,7 +51,6 @@ import com.osgifx.console.smartgraph.graphview.SmartRandomPlacementStrategy; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; import javafx.beans.value.ChangeListener; import javafx.collections.ObservableList; import javafx.collections.transformation.FilteredList; diff --git a/com.osgifx.console.ui.graph/src/main/java/com/osgifx/console/ui/graph/GraphFxUI.java b/com.osgifx.console.ui.graph/src/main/java/com/osgifx/console/ui/graph/GraphFxUI.java index bc8c8b9b..1d41dea1 100644 --- a/com.osgifx.console.ui.graph/src/main/java/com/osgifx/console/ui/graph/GraphFxUI.java +++ b/com.osgifx.console.ui.graph/src/main/java/com/osgifx/console/ui/graph/GraphFxUI.java @@ -19,6 +19,8 @@ import static com.osgifx.console.supervisor.Supervisor.AGENT_DISCONNECTED_EVENT_TOPIC; import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.apache.commons.lang3.EnumUtils; import org.eclipse.e4.core.di.annotations.Optional; @@ -43,8 +45,6 @@ import com.osgifx.console.util.fx.Fx; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; import javafx.scene.Node; import javafx.scene.layout.BorderPane; diff --git a/com.osgifx.console.ui.graph/src/main/java/com/osgifx/console/ui/graph/RuntimeBundleGraph.java b/com.osgifx.console.ui.graph/src/main/java/com/osgifx/console/ui/graph/RuntimeBundleGraph.java index 6fec0ef9..87724ac0 100644 --- a/com.osgifx.console.ui.graph/src/main/java/com/osgifx/console/ui/graph/RuntimeBundleGraph.java +++ b/com.osgifx.console.ui.graph/src/main/java/com/osgifx/console/ui/graph/RuntimeBundleGraph.java @@ -26,6 +26,7 @@ import java.util.Set; import javax.annotation.PostConstruct; +import javax.inject.Inject; import org.eclipse.e4.core.di.annotations.Creatable; import org.eclipse.e4.core.di.annotations.Optional; @@ -41,8 +42,6 @@ import com.osgifx.console.agent.dto.XBundleInfoDTO; import com.osgifx.console.data.provider.DataProvider; -import jakarta.inject.Inject; - @Creatable public final class RuntimeBundleGraph { diff --git a/com.osgifx.console.ui.graph/src/main/java/com/osgifx/console/ui/graph/RuntimeComponentGraph.java b/com.osgifx.console.ui.graph/src/main/java/com/osgifx/console/ui/graph/RuntimeComponentGraph.java index d3a7cc08..931b3459 100644 --- a/com.osgifx.console.ui.graph/src/main/java/com/osgifx/console/ui/graph/RuntimeComponentGraph.java +++ b/com.osgifx.console.ui.graph/src/main/java/com/osgifx/console/ui/graph/RuntimeComponentGraph.java @@ -24,6 +24,7 @@ import java.util.Set; import javax.annotation.PostConstruct; +import javax.inject.Inject; import org.eclipse.e4.core.di.annotations.Creatable; import org.eclipse.e4.core.di.annotations.Optional; @@ -43,8 +44,6 @@ import com.osgifx.console.data.provider.DataProvider; import com.osgifx.console.ui.graph.RuntimeComponentGraph.CircularLinkedList.Node; -import jakarta.inject.Inject; - @Creatable public final class RuntimeComponentGraph { diff --git a/com.osgifx.console.ui.healthchecks/src/main/java/com/osgifx/console/ui/healthchecks/HealthCheckFxController.java b/com.osgifx.console.ui.healthchecks/src/main/java/com/osgifx/console/ui/healthchecks/HealthCheckFxController.java index aaa5672c..c455fac8 100644 --- a/com.osgifx.console.ui.healthchecks/src/main/java/com/osgifx/console/ui/healthchecks/HealthCheckFxController.java +++ b/com.osgifx.console.ui.healthchecks/src/main/java/com/osgifx/console/ui/healthchecks/HealthCheckFxController.java @@ -23,6 +23,9 @@ import java.util.concurrent.Future; import java.util.stream.Stream; +import javax.inject.Inject; +import javax.inject.Named; + import org.apache.commons.lang3.StringUtils; import org.controlsfx.control.CheckListView; import org.controlsfx.control.MaskerPane; @@ -48,8 +51,6 @@ import com.osgifx.console.executor.Executor; import com.osgifx.console.supervisor.Supervisor; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.collections.transformation.FilteredList; diff --git a/com.osgifx.console.ui.healthchecks/src/main/java/com/osgifx/console/ui/healthchecks/HealthCheckFxUI.java b/com.osgifx.console.ui.healthchecks/src/main/java/com/osgifx/console/ui/healthchecks/HealthCheckFxUI.java index 1508f446..3d5ab856 100644 --- a/com.osgifx.console.ui.healthchecks/src/main/java/com/osgifx/console/ui/healthchecks/HealthCheckFxUI.java +++ b/com.osgifx.console.ui.healthchecks/src/main/java/com/osgifx/console/ui/healthchecks/HealthCheckFxUI.java @@ -20,6 +20,8 @@ import static com.osgifx.console.supervisor.Supervisor.AGENT_DISCONNECTED_EVENT_TOPIC; import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.core.di.extensions.OSGiBundle; @@ -36,8 +38,6 @@ import com.osgifx.console.ui.ConsoleStatusBar; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; import javafx.fxml.FXMLLoader; import javafx.scene.Node; diff --git a/com.osgifx.console.ui.heap/src/main/java/com/osgifx/console/ui/heap/HeapMonitorFxUI.java b/com.osgifx.console.ui.heap/src/main/java/com/osgifx/console/ui/heap/HeapMonitorFxUI.java index 024e21ea..1bcea79d 100644 --- a/com.osgifx.console.ui.heap/src/main/java/com/osgifx/console/ui/heap/HeapMonitorFxUI.java +++ b/com.osgifx.console.ui.heap/src/main/java/com/osgifx/console/ui/heap/HeapMonitorFxUI.java @@ -19,6 +19,7 @@ import static com.osgifx.console.supervisor.Supervisor.AGENT_DISCONNECTED_EVENT_TOPIC; import javax.annotation.PostConstruct; +import javax.inject.Inject; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.ui.di.UIEventTopic; @@ -27,7 +28,6 @@ import com.osgifx.console.ui.ConsoleStatusBar; -import jakarta.inject.Inject; import javafx.scene.layout.BorderPane; public final class HeapMonitorFxUI { diff --git a/com.osgifx.console.ui.heap/src/main/java/com/osgifx/console/ui/heap/HeapMonitorPane.java b/com.osgifx.console.ui.heap/src/main/java/com/osgifx/console/ui/heap/HeapMonitorPane.java index a8095dc2..7c712c95 100644 --- a/com.osgifx.console.ui.heap/src/main/java/com/osgifx/console/ui/heap/HeapMonitorPane.java +++ b/com.osgifx.console.ui.heap/src/main/java/com/osgifx/console/ui/heap/HeapMonitorPane.java @@ -23,6 +23,8 @@ import java.util.stream.Stream; import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.apache.commons.io.FileUtils; import org.controlsfx.dialog.ProgressDialog; @@ -44,8 +46,6 @@ import com.osgifx.console.util.fx.FxDialog; import com.osgifx.console.util.io.IO; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.animation.Animation; import javafx.animation.KeyFrame; import javafx.animation.Timeline; diff --git a/com.osgifx.console.ui.http/src/main/java/com/osgifx/console/ui/http/HttpDetailsFxController.java b/com.osgifx.console.ui.http/src/main/java/com/osgifx/console/ui/http/HttpDetailsFxController.java index fe3aa27b..d20b804f 100644 --- a/com.osgifx.console.ui.http/src/main/java/com/osgifx/console/ui/http/HttpDetailsFxController.java +++ b/com.osgifx.console.ui.http/src/main/java/com/osgifx/console/ui/http/HttpDetailsFxController.java @@ -18,6 +18,8 @@ import java.util.Arrays; import java.util.List; +import javax.inject.Inject; + import org.eclipse.fx.core.log.FluentLogger; import org.eclipse.fx.core.log.Log; @@ -27,7 +29,6 @@ import com.dlsc.formsfx.view.renderer.FormRenderer; import com.osgifx.console.agent.dto.XHttpComponentDTO; -import jakarta.inject.Inject; import javafx.fxml.FXML; import javafx.geometry.Insets; import javafx.scene.layout.BorderPane; diff --git a/com.osgifx.console.ui.http/src/main/java/com/osgifx/console/ui/http/HttpFxController.java b/com.osgifx.console.ui.http/src/main/java/com/osgifx/console/ui/http/HttpFxController.java index caec0010..9ab04b97 100644 --- a/com.osgifx.console.ui.http/src/main/java/com/osgifx/console/ui/http/HttpFxController.java +++ b/com.osgifx.console.ui.http/src/main/java/com/osgifx/console/ui/http/HttpFxController.java @@ -15,6 +15,9 @@ ******************************************************************************/ package com.osgifx.console.ui.http; +import javax.inject.Inject; +import javax.inject.Named; + import org.controlsfx.control.table.TableFilter; import org.controlsfx.control.table.TableRowExpanderColumn; import org.controlsfx.control.table.TableRowExpanderColumn.TableRowDataFeatures; @@ -29,8 +32,6 @@ import com.osgifx.console.util.fx.DTOCellValueFactory; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.scene.control.TableColumn; diff --git a/com.osgifx.console.ui.http/src/main/java/com/osgifx/console/ui/http/HttpFxUI.java b/com.osgifx.console.ui.http/src/main/java/com/osgifx/console/ui/http/HttpFxUI.java index 92eb4a24..4c7efd71 100644 --- a/com.osgifx.console.ui.http/src/main/java/com/osgifx/console/ui/http/HttpFxUI.java +++ b/com.osgifx.console.ui.http/src/main/java/com/osgifx/console/ui/http/HttpFxUI.java @@ -21,6 +21,8 @@ import static com.osgifx.console.supervisor.Supervisor.AGENT_DISCONNECTED_EVENT_TOPIC; import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.core.di.extensions.OSGiBundle; @@ -37,8 +39,6 @@ import com.osgifx.console.ui.ConsoleStatusBar; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; import javafx.fxml.FXMLLoader; import javafx.scene.Node; diff --git a/com.osgifx.console.ui.leaks/src/main/java/com/osgifx/console/ui/leaks/LeaksFxController.java b/com.osgifx.console.ui.leaks/src/main/java/com/osgifx/console/ui/leaks/LeaksFxController.java index 5bb47cfd..cd8e98bf 100644 --- a/com.osgifx.console.ui.leaks/src/main/java/com/osgifx/console/ui/leaks/LeaksFxController.java +++ b/com.osgifx.console.ui.leaks/src/main/java/com/osgifx/console/ui/leaks/LeaksFxController.java @@ -15,6 +15,9 @@ ******************************************************************************/ package com.osgifx.console.ui.leaks; +import javax.inject.Inject; +import javax.inject.Named; + import org.controlsfx.control.table.TableFilter; import org.eclipse.fx.core.log.FluentLogger; import org.eclipse.fx.core.log.Log; @@ -24,8 +27,6 @@ import com.osgifx.console.util.fx.DTOCellValueFactory; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.fxml.FXML; import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; diff --git a/com.osgifx.console.ui.leaks/src/main/java/com/osgifx/console/ui/leaks/LeaksFxUI.java b/com.osgifx.console.ui.leaks/src/main/java/com/osgifx/console/ui/leaks/LeaksFxUI.java index 4e7fe726..f7017bd4 100644 --- a/com.osgifx.console.ui.leaks/src/main/java/com/osgifx/console/ui/leaks/LeaksFxUI.java +++ b/com.osgifx.console.ui.leaks/src/main/java/com/osgifx/console/ui/leaks/LeaksFxUI.java @@ -20,6 +20,8 @@ import static com.osgifx.console.supervisor.Supervisor.AGENT_DISCONNECTED_EVENT_TOPIC; import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.core.di.extensions.OSGiBundle; @@ -36,8 +38,6 @@ import com.osgifx.console.ui.ConsoleStatusBar; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; import javafx.fxml.FXMLLoader; import javafx.scene.Node; diff --git a/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/LogConfigurationEditorFxController.java b/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/LogConfigurationEditorFxController.java index c1ec8647..5724c958 100644 --- a/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/LogConfigurationEditorFxController.java +++ b/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/LogConfigurationEditorFxController.java @@ -23,6 +23,9 @@ import java.util.List; import java.util.Map; +import javax.inject.Inject; +import javax.inject.Named; + import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.ui.services.internal.events.EventBroker; import org.eclipse.fx.core.log.FluentLogger; @@ -41,8 +44,6 @@ import com.osgifx.console.util.fx.Fx; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.fxml.FXML; import javafx.geometry.Insets; import javafx.scene.control.Button; diff --git a/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/LogConfigurationsFxController.java b/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/LogConfigurationsFxController.java index ce285a15..17c7a613 100644 --- a/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/LogConfigurationsFxController.java +++ b/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/LogConfigurationsFxController.java @@ -15,6 +15,9 @@ ******************************************************************************/ package com.osgifx.console.ui.logs; +import javax.inject.Inject; +import javax.inject.Named; + import org.controlsfx.control.table.TableFilter; import org.controlsfx.control.table.TableRowExpanderColumn; import org.controlsfx.control.table.TableRowExpanderColumn.TableRowDataFeatures; @@ -29,8 +32,6 @@ import com.osgifx.console.util.fx.DTOCellValueFactory; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.beans.property.SimpleBooleanProperty; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; diff --git a/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/LogDetailsFxController.java b/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/LogDetailsFxController.java index 1ec8df8b..6801bca8 100644 --- a/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/LogDetailsFxController.java +++ b/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/LogDetailsFxController.java @@ -17,6 +17,8 @@ import java.util.Date; +import javax.inject.Inject; + import org.eclipse.fx.core.log.FluentLogger; import org.eclipse.fx.core.log.Log; import org.osgi.util.converter.Converter; @@ -24,7 +26,6 @@ import com.osgifx.console.agent.dto.XLogEntryDTO; -import jakarta.inject.Inject; import javafx.fxml.FXML; import javafx.scene.control.Label; import javafx.scene.control.TextArea; diff --git a/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/LogsFxUI.java b/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/LogsFxUI.java index 40ba99ce..b26797d9 100644 --- a/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/LogsFxUI.java +++ b/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/LogsFxUI.java @@ -22,6 +22,8 @@ import static com.osgifx.console.supervisor.Supervisor.AGENT_DISCONNECTED_EVENT_TOPIC; import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.core.di.extensions.OSGiBundle; @@ -38,8 +40,6 @@ import com.osgifx.console.ui.ConsoleStatusBar; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; import javafx.fxml.FXMLLoader; import javafx.scene.Node; diff --git a/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/LogsViewFxController.java b/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/LogsViewFxController.java index 43bfba1c..99588fac 100644 --- a/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/LogsViewFxController.java +++ b/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/LogsViewFxController.java @@ -17,6 +17,9 @@ import java.util.Date; +import javax.inject.Inject; +import javax.inject.Named; + import org.controlsfx.control.table.TableFilter; import org.controlsfx.control.table.TableRowExpanderColumn; import org.controlsfx.control.table.TableRowExpanderColumn.TableRowDataFeatures; @@ -31,8 +34,6 @@ import com.osgifx.console.util.fx.DTOCellValueFactory; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.scene.control.TableColumn; diff --git a/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/StarterFxController.java b/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/StarterFxController.java index 97224747..98734b49 100644 --- a/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/StarterFxController.java +++ b/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/StarterFxController.java @@ -17,6 +17,8 @@ import static org.controlsfx.control.SegmentedButton.STYLE_CLASS_DARK; +import javax.inject.Inject; + import org.controlsfx.control.SegmentedButton; import org.eclipse.fx.core.log.FluentLogger; import org.eclipse.fx.core.log.Log; @@ -24,7 +26,6 @@ import org.eclipse.fx.ui.di.FXMLLoader; import org.eclipse.fx.ui.di.FXMLLoaderFactory; -import jakarta.inject.Inject; import javafx.fxml.FXML; import javafx.scene.Node; import javafx.scene.control.ToggleButton; diff --git a/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/handler/ClearLogsTableHandler.java b/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/handler/ClearLogsTableHandler.java index b7c0ae71..09fd9b95 100644 --- a/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/handler/ClearLogsTableHandler.java +++ b/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/handler/ClearLogsTableHandler.java @@ -17,15 +17,15 @@ import static com.osgifx.console.event.topics.LogReceiveEventTopics.CLEAR_LOGS_TOPIC; +import javax.inject.Inject; +import javax.inject.Named; + import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.core.services.events.IEventBroker; import org.eclipse.fx.core.log.FluentLogger; import org.eclipse.fx.core.log.Log; -import jakarta.inject.Inject; -import jakarta.inject.Named; - public final class ClearLogsTableHandler { @Log diff --git a/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/handler/LogReceiveMenuContributionHandler.java b/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/handler/LogReceiveMenuContributionHandler.java index a9f3e4e0..f5c3cefc 100644 --- a/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/handler/LogReceiveMenuContributionHandler.java +++ b/com.osgifx.console.ui.logs/src/main/java/com/osgifx/console/ui/logs/handler/LogReceiveMenuContributionHandler.java @@ -23,6 +23,9 @@ import java.util.function.BooleanSupplier; import java.util.function.Consumer; +import javax.inject.Inject; +import javax.inject.Named; + import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.core.di.annotations.Optional; @@ -45,9 +48,6 @@ import com.osgifx.console.supervisor.Supervisor; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; - public final class LogReceiveMenuContributionHandler { @Log diff --git a/com.osgifx.console.ui.overview/src/main/java/com/osgifx/console/ui/overview/OverviewFxUI.java b/com.osgifx.console.ui.overview/src/main/java/com/osgifx/console/ui/overview/OverviewFxUI.java index c610cf4e..0f793a10 100644 --- a/com.osgifx.console.ui.overview/src/main/java/com/osgifx/console/ui/overview/OverviewFxUI.java +++ b/com.osgifx.console.ui.overview/src/main/java/com/osgifx/console/ui/overview/OverviewFxUI.java @@ -34,6 +34,8 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; +import javax.inject.Inject; +import javax.inject.Named; import org.controlsfx.glyphfont.Glyph; import org.eclipse.e4.core.contexts.ContextInjectionFactory; @@ -58,8 +60,6 @@ import eu.hansolo.tilesfx.colors.Bright; import eu.hansolo.tilesfx.colors.Dark; import eu.hansolo.tilesfx.tools.FlowGridPane; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.animation.KeyFrame; import javafx.animation.Timeline; import javafx.geometry.Insets; diff --git a/com.osgifx.console.ui.overview/src/main/java/com/osgifx/console/ui/overview/ViewRefreshDelayDialog.java b/com.osgifx.console.ui.overview/src/main/java/com/osgifx/console/ui/overview/ViewRefreshDelayDialog.java index bbe98b7c..5b306a9c 100644 --- a/com.osgifx.console.ui.overview/src/main/java/com/osgifx/console/ui/overview/ViewRefreshDelayDialog.java +++ b/com.osgifx.console.ui.overview/src/main/java/com/osgifx/console/ui/overview/ViewRefreshDelayDialog.java @@ -19,6 +19,8 @@ import static com.osgifx.console.constants.FxConstants.STANDARD_CSS; import static org.controlsfx.validation.Validator.createPredicateValidator; +import javax.inject.Inject; + import org.controlsfx.control.textfield.CustomTextField; import org.controlsfx.control.textfield.TextFields; import org.controlsfx.validation.ValidationSupport; @@ -30,7 +32,6 @@ import com.google.common.primitives.Ints; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; import javafx.scene.control.Button; import javafx.scene.control.ButtonBar.ButtonData; import javafx.scene.control.ButtonType; diff --git a/com.osgifx.console.ui.packages/src/main/java/com/osgifx/console/ui/packages/PackageDetailsFxController.java b/com.osgifx.console.ui.packages/src/main/java/com/osgifx/console/ui/packages/PackageDetailsFxController.java index 367701d8..8466988f 100644 --- a/com.osgifx.console.ui.packages/src/main/java/com/osgifx/console/ui/packages/PackageDetailsFxController.java +++ b/com.osgifx.console.ui.packages/src/main/java/com/osgifx/console/ui/packages/PackageDetailsFxController.java @@ -15,6 +15,8 @@ ******************************************************************************/ package com.osgifx.console.ui.packages; +import javax.inject.Inject; + import org.controlsfx.control.ToggleSwitch; import org.controlsfx.control.table.TableFilter; import org.eclipse.fx.core.log.FluentLogger; @@ -25,7 +27,6 @@ import com.osgifx.console.util.fx.DTOCellValueFactory; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; import javafx.collections.FXCollections; import javafx.fxml.FXML; import javafx.scene.control.Label; diff --git a/com.osgifx.console.ui.packages/src/main/java/com/osgifx/console/ui/packages/PackagesFxController.java b/com.osgifx.console.ui.packages/src/main/java/com/osgifx/console/ui/packages/PackagesFxController.java index e92a65df..d26b5471 100644 --- a/com.osgifx.console.ui.packages/src/main/java/com/osgifx/console/ui/packages/PackagesFxController.java +++ b/com.osgifx.console.ui.packages/src/main/java/com/osgifx/console/ui/packages/PackagesFxController.java @@ -19,6 +19,9 @@ import java.util.function.Predicate; +import javax.inject.Inject; +import javax.inject.Named; + import org.controlsfx.control.table.TableFilter; import org.controlsfx.control.table.TableRowExpanderColumn; import org.controlsfx.control.table.TableRowExpanderColumn.TableRowDataFeatures; @@ -36,8 +39,6 @@ import com.osgifx.console.util.fx.DTOCellValueFactory; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.collections.transformation.FilteredList; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; diff --git a/com.osgifx.console.ui.packages/src/main/java/com/osgifx/console/ui/packages/PackagesFxUI.java b/com.osgifx.console.ui.packages/src/main/java/com/osgifx/console/ui/packages/PackagesFxUI.java index 551b8bd0..9954885b 100644 --- a/com.osgifx.console.ui.packages/src/main/java/com/osgifx/console/ui/packages/PackagesFxUI.java +++ b/com.osgifx.console.ui.packages/src/main/java/com/osgifx/console/ui/packages/PackagesFxUI.java @@ -22,6 +22,8 @@ import static javafx.geometry.Orientation.VERTICAL; import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.core.di.extensions.OSGiBundle; @@ -41,8 +43,6 @@ import com.osgifx.console.util.fx.Fx; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; import javafx.fxml.FXMLLoader; import javafx.scene.Node; diff --git a/com.osgifx.console.ui.properties/src/main/java/com/osgifx/console/ui/properties/PropertiesFxController.java b/com.osgifx.console.ui.properties/src/main/java/com/osgifx/console/ui/properties/PropertiesFxController.java index 05116877..26728e66 100644 --- a/com.osgifx.console.ui.properties/src/main/java/com/osgifx/console/ui/properties/PropertiesFxController.java +++ b/com.osgifx.console.ui.properties/src/main/java/com/osgifx/console/ui/properties/PropertiesFxController.java @@ -15,6 +15,9 @@ ******************************************************************************/ package com.osgifx.console.ui.properties; +import javax.inject.Inject; +import javax.inject.Named; + import org.controlsfx.control.table.TableFilter; import org.eclipse.fx.core.log.FluentLogger; import org.eclipse.fx.core.log.Log; @@ -24,8 +27,6 @@ import com.osgifx.console.util.fx.DTOCellValueFactory; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.fxml.FXML; import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; diff --git a/com.osgifx.console.ui.properties/src/main/java/com/osgifx/console/ui/properties/PropertiesFxUI.java b/com.osgifx.console.ui.properties/src/main/java/com/osgifx/console/ui/properties/PropertiesFxUI.java index e6641740..d608320d 100644 --- a/com.osgifx.console.ui.properties/src/main/java/com/osgifx/console/ui/properties/PropertiesFxUI.java +++ b/com.osgifx.console.ui.properties/src/main/java/com/osgifx/console/ui/properties/PropertiesFxUI.java @@ -20,6 +20,8 @@ import static com.osgifx.console.supervisor.Supervisor.AGENT_DISCONNECTED_EVENT_TOPIC; import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.core.di.extensions.OSGiBundle; @@ -36,8 +38,6 @@ import com.osgifx.console.ui.ConsoleStatusBar; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; import javafx.fxml.FXMLLoader; import javafx.scene.Node; diff --git a/com.osgifx.console.ui.roles/src/main/java/com/osgifx/console/ui/roles/RoleEditorFxController.java b/com.osgifx.console.ui.roles/src/main/java/com/osgifx/console/ui/roles/RoleEditorFxController.java index 7842edb9..1e553192 100644 --- a/com.osgifx.console.ui.roles/src/main/java/com/osgifx/console/ui/roles/RoleEditorFxController.java +++ b/com.osgifx.console.ui.roles/src/main/java/com/osgifx/console/ui/roles/RoleEditorFxController.java @@ -25,6 +25,9 @@ import java.util.List; import java.util.Map; +import javax.inject.Inject; +import javax.inject.Named; + import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.ui.services.internal.events.EventBroker; import org.eclipse.fx.core.log.FluentLogger; @@ -47,8 +50,6 @@ import com.osgifx.console.util.fx.Fx; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.fxml.FXML; import javafx.geometry.Insets; import javafx.scene.control.Button; diff --git a/com.osgifx.console.ui.roles/src/main/java/com/osgifx/console/ui/roles/RolesFxController.java b/com.osgifx.console.ui.roles/src/main/java/com/osgifx/console/ui/roles/RolesFxController.java index cfe3a7d2..141ab6cb 100644 --- a/com.osgifx.console.ui.roles/src/main/java/com/osgifx/console/ui/roles/RolesFxController.java +++ b/com.osgifx.console.ui.roles/src/main/java/com/osgifx/console/ui/roles/RolesFxController.java @@ -15,6 +15,9 @@ ******************************************************************************/ package com.osgifx.console.ui.roles; +import javax.inject.Inject; +import javax.inject.Named; + import org.controlsfx.control.table.TableFilter; import org.controlsfx.control.table.TableRowExpanderColumn; import org.controlsfx.control.table.TableRowExpanderColumn.TableRowDataFeatures; @@ -29,8 +32,6 @@ import com.osgifx.console.util.fx.DTOCellValueFactory; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.scene.control.TableColumn; diff --git a/com.osgifx.console.ui.roles/src/main/java/com/osgifx/console/ui/roles/RolesFxUI.java b/com.osgifx.console.ui.roles/src/main/java/com/osgifx/console/ui/roles/RolesFxUI.java index ae2f3faf..33bafab0 100644 --- a/com.osgifx.console.ui.roles/src/main/java/com/osgifx/console/ui/roles/RolesFxUI.java +++ b/com.osgifx.console.ui.roles/src/main/java/com/osgifx/console/ui/roles/RolesFxUI.java @@ -20,6 +20,8 @@ import static com.osgifx.console.supervisor.Supervisor.AGENT_DISCONNECTED_EVENT_TOPIC; import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.core.di.extensions.OSGiBundle; @@ -36,8 +38,6 @@ import com.osgifx.console.ui.ConsoleStatusBar; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; import javafx.fxml.FXMLLoader; import javafx.scene.Node; diff --git a/com.osgifx.console.ui.roles/src/main/java/com/osgifx/console/ui/roles/dialog/RoleCreateDialog.java b/com.osgifx.console.ui.roles/src/main/java/com/osgifx/console/ui/roles/dialog/RoleCreateDialog.java index ffbff8c0..1ed542d0 100644 --- a/com.osgifx.console.ui.roles/src/main/java/com/osgifx/console/ui/roles/dialog/RoleCreateDialog.java +++ b/com.osgifx.console.ui.roles/src/main/java/com/osgifx/console/ui/roles/dialog/RoleCreateDialog.java @@ -18,6 +18,8 @@ import static com.google.common.base.Verify.verify; import static com.osgifx.console.constants.FxConstants.STANDARD_CSS; +import javax.inject.Inject; + import org.apache.commons.lang3.EnumUtils; import org.controlsfx.control.textfield.CustomTextField; import org.controlsfx.control.textfield.TextFields; @@ -31,7 +33,6 @@ import com.osgifx.console.ui.roles.dialog.RoleCreateDialog.RoleDTO; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; import javafx.collections.FXCollections; import javafx.scene.control.Button; import javafx.scene.control.ButtonBar.ButtonData; diff --git a/com.osgifx.console.ui.roles/src/main/java/com/osgifx/console/ui/roles/handler/RoleCreateHandler.java b/com.osgifx.console.ui.roles/src/main/java/com/osgifx/console/ui/roles/handler/RoleCreateHandler.java index 3e4cc035..ff4f8218 100644 --- a/com.osgifx.console.ui.roles/src/main/java/com/osgifx/console/ui/roles/handler/RoleCreateHandler.java +++ b/com.osgifx.console.ui.roles/src/main/java/com/osgifx/console/ui/roles/handler/RoleCreateHandler.java @@ -17,6 +17,9 @@ import static com.osgifx.console.event.topics.RoleActionEventTopics.ROLE_CREATED_EVENT_TOPIC; +import javax.inject.Inject; +import javax.inject.Named; + import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.core.di.annotations.CanExecute; @@ -34,8 +37,6 @@ import com.osgifx.console.util.fx.Fx; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; public final class RoleCreateHandler { diff --git a/com.osgifx.console.ui.search/src/main/java/com/osgifx/console/ui/search/dialog/SearchDialog.java b/com.osgifx.console.ui.search/src/main/java/com/osgifx/console/ui/search/dialog/SearchDialog.java index 7fb6ef31..7322db24 100644 --- a/com.osgifx.console.ui.search/src/main/java/com/osgifx/console/ui/search/dialog/SearchDialog.java +++ b/com.osgifx.console.ui.search/src/main/java/com/osgifx/console/ui/search/dialog/SearchDialog.java @@ -25,6 +25,8 @@ import java.util.Comparator; import java.util.List; +import javax.inject.Inject; + import org.eclipse.fx.core.log.FluentLogger; import org.eclipse.fx.core.log.Log; @@ -41,7 +43,6 @@ import com.osgifx.console.ui.search.filter.SearchOperation; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; import javafx.geometry.Insets; import javafx.scene.control.ButtonBar.ButtonData; import javafx.scene.control.ButtonType; diff --git a/com.osgifx.console.ui.search/src/main/java/com/osgifx/console/ui/search/handler/SearchHandler.java b/com.osgifx.console.ui.search/src/main/java/com/osgifx/console/ui/search/handler/SearchHandler.java index 206cd8c0..e354c3dd 100644 --- a/com.osgifx.console.ui.search/src/main/java/com/osgifx/console/ui/search/handler/SearchHandler.java +++ b/com.osgifx.console.ui.search/src/main/java/com/osgifx/console/ui/search/handler/SearchHandler.java @@ -22,6 +22,9 @@ import static com.osgifx.console.event.topics.TableFilterUpdateTopics.UPDATE_SERVICE_FILTER_EVENT_TOPIC; import static org.eclipse.e4.ui.workbench.modeling.EPartService.PartState.ACTIVATE; +import javax.inject.Inject; +import javax.inject.Named; + import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.core.di.annotations.CanExecute; @@ -34,9 +37,6 @@ import com.osgifx.console.ui.search.dialog.SearchDialog; -import jakarta.inject.Inject; -import jakarta.inject.Named; - public final class SearchHandler { private static final String TAB_ID_PREFIX = "com.osgifx.console.application.tab."; diff --git a/com.osgifx.console.ui.services/src/main/java/com/osgifx/console/ui/services/ServiceDetailsFxController.java b/com.osgifx.console.ui.services/src/main/java/com/osgifx/console/ui/services/ServiceDetailsFxController.java index 9217bda4..c2a8f54b 100644 --- a/com.osgifx.console.ui.services/src/main/java/com/osgifx/console/ui/services/ServiceDetailsFxController.java +++ b/com.osgifx.console.ui.services/src/main/java/com/osgifx/console/ui/services/ServiceDetailsFxController.java @@ -17,6 +17,8 @@ import java.util.Map.Entry; +import javax.inject.Inject; + import org.controlsfx.control.table.TableFilter; import org.eclipse.fx.core.log.FluentLogger; import org.eclipse.fx.core.log.Log; @@ -24,7 +26,6 @@ import com.osgifx.console.agent.dto.XServiceDTO; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; import javafx.beans.property.SimpleStringProperty; import javafx.collections.FXCollections; import javafx.fxml.FXML; diff --git a/com.osgifx.console.ui.services/src/main/java/com/osgifx/console/ui/services/ServicesFxController.java b/com.osgifx.console.ui.services/src/main/java/com/osgifx/console/ui/services/ServicesFxController.java index d0f93cd8..be0ca0a9 100644 --- a/com.osgifx.console.ui.services/src/main/java/com/osgifx/console/ui/services/ServicesFxController.java +++ b/com.osgifx.console.ui.services/src/main/java/com/osgifx/console/ui/services/ServicesFxController.java @@ -20,6 +20,9 @@ import java.util.function.Predicate; +import javax.inject.Inject; +import javax.inject.Named; + import org.controlsfx.control.table.TableFilter; import org.controlsfx.control.table.TableRowExpanderColumn; import org.controlsfx.control.table.TableRowExpanderColumn.TableRowDataFeatures; @@ -37,8 +40,6 @@ import com.osgifx.console.util.fx.DTOCellValueFactory; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.collections.transformation.FilteredList; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; diff --git a/com.osgifx.console.ui.services/src/main/java/com/osgifx/console/ui/services/ServicesFxUI.java b/com.osgifx.console.ui.services/src/main/java/com/osgifx/console/ui/services/ServicesFxUI.java index 7940d7d7..c4f75821 100644 --- a/com.osgifx.console.ui.services/src/main/java/com/osgifx/console/ui/services/ServicesFxUI.java +++ b/com.osgifx.console.ui.services/src/main/java/com/osgifx/console/ui/services/ServicesFxUI.java @@ -22,6 +22,8 @@ import static javafx.geometry.Orientation.VERTICAL; import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.core.di.extensions.OSGiBundle; @@ -41,8 +43,6 @@ import com.osgifx.console.util.fx.Fx; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; import javafx.fxml.FXMLLoader; import javafx.scene.Node; diff --git a/com.osgifx.console.ui.snapshot/src/main/java/com/osgifx/console/ui/snapshot/handler/SnapshotCaptureHandler.java b/com.osgifx.console.ui.snapshot/src/main/java/com/osgifx/console/ui/snapshot/handler/SnapshotCaptureHandler.java index 77033108..d0c4d80a 100644 --- a/com.osgifx.console.ui.snapshot/src/main/java/com/osgifx/console/ui/snapshot/handler/SnapshotCaptureHandler.java +++ b/com.osgifx.console.ui.snapshot/src/main/java/com/osgifx/console/ui/snapshot/handler/SnapshotCaptureHandler.java @@ -19,6 +19,9 @@ import java.io.IOException; import java.nio.file.Files; +import javax.inject.Inject; +import javax.inject.Named; + import org.controlsfx.dialog.ProgressDialog; import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; @@ -36,8 +39,6 @@ import com.osgifx.console.util.fx.FxDialog; import com.osgifx.console.util.io.IO; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.beans.value.ChangeListener; import javafx.concurrent.Task; import javafx.stage.DirectoryChooser; diff --git a/com.osgifx.console.ui.snapshot/src/main/java/com/osgifx/console/ui/snapshot/handler/SnapshotImportHandler.java b/com.osgifx.console.ui.snapshot/src/main/java/com/osgifx/console/ui/snapshot/handler/SnapshotImportHandler.java index 523a9998..c77060e9 100644 --- a/com.osgifx.console.ui.snapshot/src/main/java/com/osgifx/console/ui/snapshot/handler/SnapshotImportHandler.java +++ b/com.osgifx.console.ui.snapshot/src/main/java/com/osgifx/console/ui/snapshot/handler/SnapshotImportHandler.java @@ -16,8 +16,8 @@ package com.osgifx.console.ui.snapshot.handler; import static com.osgifx.console.supervisor.Supervisor.AGENT_CONNECTED_EVENT_TOPIC; -import static com.osgifx.console.supervisor.factory.SupervisorFactory.SupervisorType.REMOTE_RPC; import static com.osgifx.console.supervisor.factory.SupervisorFactory.SupervisorType.SNAPSHOT; +import static com.osgifx.console.supervisor.factory.SupervisorFactory.SupervisorType.REMOTE_RPC; import java.io.File; import java.io.FileInputStream; @@ -25,6 +25,8 @@ import java.util.Dictionary; import java.util.Map; +import javax.inject.Inject; + import org.controlsfx.dialog.ProgressDialog; import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; @@ -43,7 +45,6 @@ import com.osgifx.console.supervisor.factory.SupervisorFactory; import com.osgifx.console.util.fx.FxDialog; -import jakarta.inject.Inject; import javafx.concurrent.Task; import javafx.stage.FileChooser; diff --git a/com.osgifx.console.ui.terminal/src/main/java/com/osgifx/console/ui/terminal/TerminalFxController.java b/com.osgifx.console.ui.terminal/src/main/java/com/osgifx/console/ui/terminal/TerminalFxController.java index 2b3b6af1..3e4f795a 100644 --- a/com.osgifx.console.ui.terminal/src/main/java/com/osgifx/console/ui/terminal/TerminalFxController.java +++ b/com.osgifx.console.ui.terminal/src/main/java/com/osgifx/console/ui/terminal/TerminalFxController.java @@ -15,6 +15,9 @@ ******************************************************************************/ package com.osgifx.console.ui.terminal; +import javax.inject.Inject; +import javax.inject.Named; + import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.fx.core.log.FluentLogger; import org.eclipse.fx.core.log.Log; @@ -24,8 +27,6 @@ import com.osgifx.console.executor.Executor; import com.osgifx.console.supervisor.Supervisor; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; import javafx.fxml.FXML; import javafx.scene.control.TextArea; diff --git a/com.osgifx.console.ui.terminal/src/main/java/com/osgifx/console/ui/terminal/TerminalFxUI.java b/com.osgifx.console.ui.terminal/src/main/java/com/osgifx/console/ui/terminal/TerminalFxUI.java index e0b4f816..2136aef5 100644 --- a/com.osgifx.console.ui.terminal/src/main/java/com/osgifx/console/ui/terminal/TerminalFxUI.java +++ b/com.osgifx.console.ui.terminal/src/main/java/com/osgifx/console/ui/terminal/TerminalFxUI.java @@ -20,6 +20,7 @@ import static com.osgifx.console.supervisor.Supervisor.AGENT_DISCONNECTED_EVENT_TOPIC; import javax.annotation.PostConstruct; +import javax.inject.Inject; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.core.di.extensions.OSGiBundle; @@ -34,7 +35,6 @@ import com.osgifx.console.ui.ConsoleStatusBar; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; import javafx.concurrent.Task; import javafx.fxml.FXMLLoader; import javafx.scene.Node; diff --git a/com.osgifx.console.ui.threads/src/main/java/com/osgifx/console/ui/threads/ThreadsFxController.java b/com.osgifx.console.ui.threads/src/main/java/com/osgifx/console/ui/threads/ThreadsFxController.java index a6b7c3e6..54a38556 100644 --- a/com.osgifx.console.ui.threads/src/main/java/com/osgifx/console/ui/threads/ThreadsFxController.java +++ b/com.osgifx.console.ui.threads/src/main/java/com/osgifx/console/ui/threads/ThreadsFxController.java @@ -15,6 +15,9 @@ ******************************************************************************/ package com.osgifx.console.ui.threads; +import javax.inject.Inject; +import javax.inject.Named; + import org.controlsfx.control.table.TableFilter; import org.eclipse.fx.core.log.FluentLogger; import org.eclipse.fx.core.log.Log; @@ -24,8 +27,6 @@ import com.osgifx.console.util.fx.DTOCellValueFactory; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.fxml.FXML; import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; diff --git a/com.osgifx.console.ui.threads/src/main/java/com/osgifx/console/ui/threads/ThreadsFxUI.java b/com.osgifx.console.ui.threads/src/main/java/com/osgifx/console/ui/threads/ThreadsFxUI.java index 8d33f36a..20d4363a 100644 --- a/com.osgifx.console.ui.threads/src/main/java/com/osgifx/console/ui/threads/ThreadsFxUI.java +++ b/com.osgifx.console.ui.threads/src/main/java/com/osgifx/console/ui/threads/ThreadsFxUI.java @@ -20,6 +20,8 @@ import static com.osgifx.console.supervisor.Supervisor.AGENT_DISCONNECTED_EVENT_TOPIC; import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.core.di.extensions.OSGiBundle; @@ -36,8 +38,6 @@ import com.osgifx.console.ui.ConsoleStatusBar; import com.osgifx.console.util.fx.Fx; -import jakarta.inject.Inject; -import jakarta.inject.Named; import javafx.concurrent.Task; import javafx.fxml.FXMLLoader; import javafx.scene.Node;