diff --git a/build.gradle b/build.gradle index 3510a5e6fa5..0add72e5b36 100644 --- a/build.gradle +++ b/build.gradle @@ -161,6 +161,7 @@ dependencies { } implementation group: 'jakarta.annotation', name: 'jakarta.annotation-api', version: '1.3.5' + implementation 'jakarta.inject:jakarta.inject-api:2.0.1' // JavaFX stuff implementation 'org.kordamp.ikonli:ikonli-javafx:12.3.1' @@ -170,7 +171,6 @@ dependencies { implementation 'com.tobiasdiez:easybind:2.2.1-SNAPSHOT' implementation 'org.fxmisc.flowless:flowless:0.6.10' implementation 'org.fxmisc.richtext:richtextfx:0.10.9' - implementation group: 'org.glassfish.hk2.external', name: 'jakarta.inject', version: '2.6.1' implementation 'com.jfoenix:jfoenix:9.0.10' implementation 'org.controlsfx:controlsfx:11.1.1' diff --git a/lib/afterburner.fx.jar b/lib/afterburner.fx.jar index 816b3e27f5d..16e780b695b 100644 Binary files a/lib/afterburner.fx.jar and b/lib/afterburner.fx.jar differ diff --git a/src/main/java/org/jabref/gui/EntryTypeView.java b/src/main/java/org/jabref/gui/EntryTypeView.java index 7db73467529..c126019e22e 100644 --- a/src/main/java/org/jabref/gui/EntryTypeView.java +++ b/src/main/java/org/jabref/gui/EntryTypeView.java @@ -5,8 +5,6 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; - import javafx.application.Platform; import javafx.event.Event; import javafx.fxml.FXML; @@ -42,6 +40,7 @@ import com.airhacks.afterburner.views.ViewLoader; import com.tobiasdiez.easybind.EasyBind; import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer; +import jakarta.inject.Inject; /** * Dialog that prompts the user to choose a type for an entry. diff --git a/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java b/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java index bb5dd512a2d..399a2d1f053 100644 --- a/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java +++ b/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java @@ -2,8 +2,6 @@ import java.nio.file.Path; -import javax.inject.Inject; - import javafx.fxml.FXML; import javafx.scene.control.Button; import javafx.scene.control.ButtonType; @@ -27,6 +25,7 @@ import org.jabref.preferences.PreferencesService; import com.airhacks.afterburner.views.ViewLoader; +import jakarta.inject.Inject; /** * A wizard dialog for generating a new sub database from existing TeX AUX file diff --git a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java index 3a5d0ec7a3f..95d6ba5a692 100644 --- a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java +++ b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java @@ -1,6 +1,5 @@ package org.jabref.gui.bibtexextractor; -import javax.inject.Inject; import javax.swing.undo.UndoManager; import javafx.fxml.FXML; @@ -20,6 +19,7 @@ import org.jabref.preferences.PreferencesService; import com.airhacks.afterburner.views.ViewLoader; +import jakarta.inject.Inject; /** * GUI Dialog for the feature "Extract BibTeX from plain text". diff --git a/src/main/java/org/jabref/gui/collab/ExternalChangesResolverDialog.java b/src/main/java/org/jabref/gui/collab/ExternalChangesResolverDialog.java index 744bf914f1f..f99dfab3c70 100644 --- a/src/main/java/org/jabref/gui/collab/ExternalChangesResolverDialog.java +++ b/src/main/java/org/jabref/gui/collab/ExternalChangesResolverDialog.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; import javax.swing.undo.UndoManager; import javafx.application.Platform; @@ -26,6 +25,7 @@ import com.airhacks.afterburner.views.ViewLoader; import com.tobiasdiez.easybind.EasyBind; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.java b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.java index 4d004e980c3..22384672656 100644 --- a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.java +++ b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.java @@ -2,8 +2,6 @@ import java.util.Collection; -import javax.inject.Inject; - import javafx.beans.property.ListProperty; import javafx.beans.property.ObjectProperty; import javafx.fxml.FXML; @@ -22,6 +20,7 @@ import org.jabref.preferences.PreferencesService; import com.airhacks.afterburner.views.ViewLoader; +import jakarta.inject.Inject; public class CitationKeyPatternPanel extends TableView { diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java index cd3d773f6cf..403393cacc8 100644 --- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java +++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java @@ -3,8 +3,6 @@ import java.util.Optional; import java.util.function.Supplier; -import javax.inject.Inject; - import javafx.beans.property.ListProperty; import javafx.fxml.FXML; import javafx.scene.control.Button; @@ -23,6 +21,7 @@ import com.airhacks.afterburner.views.ViewLoader; import com.tobiasdiez.easybind.EasyBind; +import jakarta.inject.Inject; public class ContentSelectorDialogView extends BaseDialog { diff --git a/src/main/java/org/jabref/gui/customentrytypes/CustomizeEntryTypeDialogView.java b/src/main/java/org/jabref/gui/customentrytypes/CustomizeEntryTypeDialogView.java index c82a3084094..56cae78cec8 100644 --- a/src/main/java/org/jabref/gui/customentrytypes/CustomizeEntryTypeDialogView.java +++ b/src/main/java/org/jabref/gui/customentrytypes/CustomizeEntryTypeDialogView.java @@ -2,8 +2,6 @@ import java.util.EnumSet; -import javax.inject.Inject; - import javafx.application.Platform; import javafx.beans.property.ReadOnlyStringWrapper; import javafx.fxml.FXML; @@ -43,6 +41,7 @@ import com.airhacks.afterburner.views.ViewLoader; import com.tobiasdiez.easybind.EasyBind; import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer; +import jakarta.inject.Inject; public class CustomizeEntryTypeDialogView extends BaseDialog { diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java index 377f158abd6..e75b607e505 100644 --- a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java +++ b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java @@ -1,7 +1,5 @@ package org.jabref.gui.documentviewer; -import javax.inject.Inject; - import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.scene.control.ButtonBar; @@ -24,6 +22,7 @@ import org.jabref.preferences.PreferencesService; import com.airhacks.afterburner.views.ViewLoader; +import jakarta.inject.Inject; public class DocumentViewerView extends BaseDialog { diff --git a/src/main/java/org/jabref/gui/edit/ManageKeywordsDialog.java b/src/main/java/org/jabref/gui/edit/ManageKeywordsDialog.java index fe8112a6829..26fad7eb613 100644 --- a/src/main/java/org/jabref/gui/edit/ManageKeywordsDialog.java +++ b/src/main/java/org/jabref/gui/edit/ManageKeywordsDialog.java @@ -2,8 +2,6 @@ import java.util.List; -import javax.inject.Inject; - import javafx.fxml.FXML; import javafx.scene.control.ButtonType; import javafx.scene.control.TableColumn; @@ -21,6 +19,7 @@ import com.airhacks.afterburner.views.ViewLoader; import com.tobiasdiez.easybind.EasyBind; +import jakarta.inject.Inject; public class ManageKeywordsDialog extends BaseDialog { private final List entries; diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java index 6e3d662bd6e..b0c8111f570 100644 --- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java +++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java @@ -12,8 +12,6 @@ import java.util.SortedSet; import java.util.stream.Collectors; -import javax.inject.Inject; - import javafx.fxml.FXML; import javafx.geometry.Side; import javafx.scene.control.Button; @@ -60,6 +58,7 @@ import com.airhacks.afterburner.views.ViewLoader; import com.tobiasdiez.easybind.EasyBind; import com.tobiasdiez.easybind.Subscription; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java index 849a6d1b0ee..24c75fe9aa0 100644 --- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java +++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java @@ -2,8 +2,6 @@ import java.nio.file.Path; -import javax.inject.Inject; - import javafx.beans.binding.Bindings; import javafx.collections.ListChangeListener; import javafx.fxml.FXML; @@ -28,6 +26,7 @@ import org.jabref.model.util.FileUpdateMonitor; import com.tobiasdiez.easybind.EasyBind; +import jakarta.inject.Inject; public class FileAnnotationTabView { diff --git a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java index fa58509d6d2..e29940c7717 100644 --- a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java +++ b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java @@ -1,7 +1,5 @@ package org.jabref.gui.errorconsole; -import javax.inject.Inject; - import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; import javafx.fxml.FXML; @@ -30,6 +28,7 @@ import org.jabref.logic.util.BuildInfo; import com.airhacks.afterburner.views.ViewLoader; +import jakarta.inject.Inject; public class ErrorConsoleView extends BaseDialog { diff --git a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java index a0b81e63505..d1370c42575 100644 --- a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java +++ b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java @@ -1,7 +1,5 @@ package org.jabref.gui.exporter; -import javax.inject.Inject; - import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.scene.control.ButtonType; @@ -14,6 +12,7 @@ import org.jabref.preferences.PreferencesService; import com.airhacks.afterburner.views.ViewLoader; +import jakarta.inject.Inject; public class CreateModifyExporterDialogView extends BaseDialog { diff --git a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java index 9ccdfa8ec82..7202751ef5e 100644 --- a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java +++ b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java @@ -1,6 +1,5 @@ package org.jabref.gui.externalfiles; -import javax.inject.Inject; import javax.swing.undo.UndoManager; import javafx.application.Platform; @@ -49,6 +48,7 @@ import com.airhacks.afterburner.views.ViewLoader; import com.tobiasdiez.easybind.EasyBind; import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer; +import jakarta.inject.Inject; import org.controlsfx.control.CheckTreeView; public class UnlinkedFilesDialogView extends BaseDialog { diff --git a/src/main/java/org/jabref/gui/help/AboutDialogView.java b/src/main/java/org/jabref/gui/help/AboutDialogView.java index 2eef63577b9..de23785d378 100644 --- a/src/main/java/org/jabref/gui/help/AboutDialogView.java +++ b/src/main/java/org/jabref/gui/help/AboutDialogView.java @@ -1,7 +1,5 @@ package org.jabref.gui.help; -import javax.inject.Inject; - import javafx.fxml.FXML; import javafx.scene.control.ButtonType; import javafx.scene.control.TextArea; @@ -14,6 +12,7 @@ import org.jabref.logic.util.BuildInfo; import com.airhacks.afterburner.views.ViewLoader; +import jakarta.inject.Inject; public class AboutDialogView extends BaseDialog { diff --git a/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialog.java b/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialog.java index e88d9878820..a99f090628f 100644 --- a/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialog.java +++ b/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialog.java @@ -2,8 +2,6 @@ import java.util.List; -import javax.inject.Inject; - import javafx.beans.binding.Bindings; import javafx.fxml.FXML; import javafx.scene.control.ButtonType; @@ -17,6 +15,7 @@ import org.jabref.preferences.PreferencesService; import com.airhacks.afterburner.views.ViewLoader; +import jakarta.inject.Inject; import org.controlsfx.control.CheckListView; public class ImportCustomEntryTypesDialog extends BaseDialog { diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java index 770d0792659..14406dd642f 100644 --- a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java +++ b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java @@ -2,7 +2,6 @@ import java.util.EnumSet; -import javax.inject.Inject; import javax.swing.undo.UndoManager; import javafx.beans.binding.Bindings; @@ -44,6 +43,7 @@ import com.airhacks.afterburner.views.ViewLoader; import com.tobiasdiez.easybind.EasyBind; +import jakarta.inject.Inject; import org.controlsfx.control.CheckListView; public class ImportEntriesDialog extends BaseDialog { diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java index 384d49e8887..b6fb218d2f6 100644 --- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java +++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java @@ -2,8 +2,6 @@ import java.util.List; -import javax.inject.Inject; - import javafx.beans.property.ReadOnlyStringWrapper; import javafx.collections.ListChangeListener; import javafx.fxml.FXML; @@ -21,6 +19,7 @@ import org.jabref.logic.l10n.Localization; import com.airhacks.afterburner.views.ViewLoader; +import jakarta.inject.Inject; import org.controlsfx.control.table.TableFilter; public class IntegrityCheckDialog extends BaseDialog { diff --git a/src/main/java/org/jabref/gui/libraryproperties/AbstractPropertiesTabView.java b/src/main/java/org/jabref/gui/libraryproperties/AbstractPropertiesTabView.java index b69dd997a4b..f967733b32c 100644 --- a/src/main/java/org/jabref/gui/libraryproperties/AbstractPropertiesTabView.java +++ b/src/main/java/org/jabref/gui/libraryproperties/AbstractPropertiesTabView.java @@ -1,13 +1,13 @@ package org.jabref.gui.libraryproperties; -import javax.inject.Inject; - import javafx.scene.Node; import javafx.scene.layout.VBox; import org.jabref.gui.DialogService; import org.jabref.model.database.BibDatabaseContext; +import jakarta.inject.Inject; + public abstract class AbstractPropertiesTabView extends VBox implements PropertiesTab { @Inject protected DialogService dialogService; diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesView.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesView.java index 78b3b3d2a0a..5286d4fbfbf 100644 --- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesView.java +++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesView.java @@ -1,7 +1,5 @@ package org.jabref.gui.libraryproperties; -import javax.inject.Inject; - import javafx.fxml.FXML; import javafx.scene.control.ButtonType; import javafx.scene.control.ScrollPane; @@ -15,6 +13,7 @@ import org.jabref.model.database.BibDatabaseContext; import com.airhacks.afterburner.views.ViewLoader; +import jakarta.inject.Inject; public class LibraryPropertiesView extends BaseDialog { diff --git a/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesView.java b/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesView.java index 0e83f999963..a6fec6aa7ab 100644 --- a/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesView.java +++ b/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesView.java @@ -2,8 +2,6 @@ import java.util.Optional; -import javax.inject.Inject; - import javafx.fxml.FXML; import javafx.scene.control.Button; import javafx.scene.control.ButtonType; @@ -23,6 +21,7 @@ import org.jabref.preferences.PreferencesService; import com.airhacks.afterburner.views.ViewLoader; +import jakarta.inject.Inject; public class ConstantsPropertiesView extends AbstractPropertiesTabView implements PropertiesTab { diff --git a/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesView.java b/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesView.java index 382ca0adf83..6eab2dbee1a 100644 --- a/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesView.java +++ b/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesView.java @@ -2,7 +2,6 @@ import java.nio.charset.Charset; -import javax.inject.Inject; import javax.swing.undo.UndoManager; import javafx.fxml.FXML; @@ -19,6 +18,7 @@ import org.jabref.preferences.PreferencesService; import com.airhacks.afterburner.views.ViewLoader; +import jakarta.inject.Inject; public class GeneralPropertiesView extends AbstractPropertiesTabView implements PropertiesTab { @FXML private ComboBox encoding; diff --git a/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesView.java b/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesView.java index 74035d4cd03..4d915d5099c 100644 --- a/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesView.java +++ b/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesView.java @@ -1,7 +1,5 @@ package org.jabref.gui.libraryproperties.keypattern; -import javax.inject.Inject; - import javafx.fxml.FXML; import javafx.scene.control.Button; @@ -19,6 +17,7 @@ import org.jabref.preferences.PreferencesService; import com.airhacks.afterburner.views.ViewLoader; +import jakarta.inject.Inject; public class KeyPatternPropertiesView extends AbstractPropertiesTabView implements PropertiesTab { diff --git a/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesView.java b/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesView.java index b479ee23cf6..524a051e20b 100644 --- a/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesView.java +++ b/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesView.java @@ -1,7 +1,5 @@ package org.jabref.gui.libraryproperties.saving; -import javax.inject.Inject; - import javafx.fxml.FXML; import javafx.scene.control.CheckBox; @@ -14,6 +12,7 @@ import org.jabref.preferences.PreferencesService; import com.airhacks.afterburner.views.ViewLoader; +import jakarta.inject.Inject; public class SavingPropertiesView extends AbstractPropertiesTabView implements PropertiesTab { diff --git a/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java b/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java index 3d6149a203b..7a9c333d0a2 100644 --- a/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java +++ b/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java @@ -1,7 +1,5 @@ package org.jabref.gui.linkedfile; -import javax.inject.Inject; - import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.scene.control.ButtonType; @@ -18,6 +16,7 @@ import org.jabref.preferences.PreferencesService; import com.airhacks.afterburner.views.ViewLoader; +import jakarta.inject.Inject; public class LinkedFileEditDialogView extends BaseDialog { diff --git a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java index f0453231015..15bc0def40a 100644 --- a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java +++ b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java @@ -1,7 +1,5 @@ package org.jabref.gui.openoffice; -import javax.inject.Inject; - import javafx.fxml.FXML; import javafx.scene.Node; import javafx.scene.control.ButtonType; @@ -19,6 +17,7 @@ import org.jabref.model.strings.StringUtil; import com.airhacks.afterburner.views.ViewLoader; +import jakarta.inject.Inject; public class ManageCitationsDialogView extends BaseDialog { diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java index 2b66e0f6013..77870845ba8 100644 --- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java +++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java @@ -1,7 +1,5 @@ package org.jabref.gui.openoffice; -import javax.inject.Inject; - import javafx.fxml.FXML; import javafx.scene.control.Button; import javafx.scene.control.ButtonType; @@ -30,6 +28,7 @@ import com.airhacks.afterburner.views.ViewLoader; import com.tobiasdiez.easybind.EasyBind; +import jakarta.inject.Inject; public class StyleSelectDialogView extends BaseDialog { diff --git a/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java b/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java index 354d6a5457a..61ea82243fa 100644 --- a/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java +++ b/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java @@ -2,8 +2,6 @@ import java.util.List; -import javax.inject.Inject; - import javafx.scene.Node; import javafx.scene.layout.VBox; @@ -11,6 +9,8 @@ import org.jabref.gui.util.TaskExecutor; import org.jabref.preferences.PreferencesService; +import jakarta.inject.Inject; + public abstract class AbstractPreferenceTabView extends VBox implements PreferencesTab { @Inject protected TaskExecutor taskExecutor; diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java index 4615300d502..a4bb0baab0c 100644 --- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java +++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java @@ -2,8 +2,6 @@ import java.util.Locale; -import javax.inject.Inject; - import javafx.fxml.FXML; import javafx.scene.control.ButtonType; import javafx.scene.control.ListView; @@ -21,6 +19,7 @@ import com.airhacks.afterburner.views.ViewLoader; import com.tobiasdiez.easybind.EasyBind; +import jakarta.inject.Inject; import org.controlsfx.control.textfield.CustomTextField; /** diff --git a/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.java b/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.java index 6021a2c5a51..7d5f40b6e49 100644 --- a/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.java +++ b/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.java @@ -1,7 +1,5 @@ package org.jabref.gui.preferences.customexporter; -import javax.inject.Inject; - import javafx.fxml.FXML; import javafx.scene.control.SelectionMode; import javafx.scene.control.TableColumn; @@ -15,6 +13,7 @@ import com.airhacks.afterburner.views.ViewLoader; import com.tobiasdiez.easybind.EasyBind; +import jakarta.inject.Inject; public class CustomExporterTab extends AbstractPreferenceTabView implements PreferencesTab { diff --git a/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java index 377291e96e4..e18ed5a4e83 100644 --- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java +++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java @@ -1,7 +1,5 @@ package org.jabref.gui.preferences.externalfiletypes; -import javax.inject.Inject; - import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.scene.control.Button; @@ -18,6 +16,7 @@ import org.jabref.gui.util.FileDialogConfiguration; import com.airhacks.afterburner.views.ViewLoader; +import jakarta.inject.Inject; public class EditExternalFileTypeEntryDialog extends BaseDialog { diff --git a/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.java b/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.java index 32733480c77..37bda9ad270 100644 --- a/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.java +++ b/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.java @@ -1,7 +1,5 @@ package org.jabref.gui.preferences.journals; -import javax.inject.Inject; - import javafx.animation.Interpolator; import javafx.animation.KeyFrame; import javafx.animation.KeyValue; @@ -34,6 +32,7 @@ import com.airhacks.afterburner.views.ViewLoader; import com.tobiasdiez.easybind.EasyBind; +import jakarta.inject.Inject; import org.controlsfx.control.textfield.CustomTextField; /** diff --git a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java index eaa7f68ac5e..c4c04fe86c8 100644 --- a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java +++ b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java @@ -1,7 +1,5 @@ package org.jabref.gui.preferences.keybindings; -import javax.inject.Inject; - import javafx.fxml.FXML; import javafx.scene.control.MenuButton; import javafx.scene.control.MenuItem; @@ -22,6 +20,7 @@ import com.airhacks.afterburner.views.ViewLoader; import com.tobiasdiez.easybind.EasyBind; +import jakarta.inject.Inject; public class KeyBindingsTab extends AbstractPreferenceTabView implements PreferencesTab { diff --git a/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java b/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java index cb9c897455c..fa7d3995d0e 100644 --- a/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java +++ b/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java @@ -3,8 +3,6 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; - import javafx.application.Platform; import javafx.beans.property.ListProperty; import javafx.fxml.FXML; @@ -42,6 +40,7 @@ import com.airhacks.afterburner.views.ViewLoader; import com.tobiasdiez.easybind.EasyBind; import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer; +import jakarta.inject.Inject; import org.controlsfx.control.textfield.CustomTextField; import org.fxmisc.richtext.CodeArea; import org.fxmisc.richtext.LineNumberFactory; diff --git a/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.java b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.java index b5285f5e07c..c5d1aa5b2c5 100644 --- a/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.java +++ b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.java @@ -1,7 +1,5 @@ package org.jabref.gui.preferences.protectedterms; -import javax.inject.Inject; - import javafx.beans.property.ReadOnlyBooleanWrapper; import javafx.fxml.FXML; import javafx.scene.control.ContextMenu; @@ -24,6 +22,7 @@ import org.jabref.logic.protectedterms.ProtectedTermsLoader; import com.airhacks.afterburner.views.ViewLoader; +import jakarta.inject.Inject; /** * Dialog for managing term list files. diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java index b23dc8ab2df..1b330015949 100644 --- a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java +++ b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java @@ -1,6 +1,5 @@ package org.jabref.gui.search; -import javax.inject.Inject; import javax.swing.undo.UndoManager; import javafx.fxml.FXML; @@ -21,6 +20,7 @@ import com.airhacks.afterburner.views.ViewLoader; import com.tobiasdiez.easybind.EasyBind; +import jakarta.inject.Inject; public class GlobalSearchResultDialog extends BaseDialog { diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java index 52e9280f2e7..992ed0482b0 100644 --- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java +++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java @@ -1,7 +1,5 @@ package org.jabref.gui.shared; -import javax.inject.Inject; - import javafx.application.Platform; import javafx.event.ActionEvent; import javafx.fxml.FXML; @@ -24,6 +22,7 @@ import com.airhacks.afterburner.views.ViewLoader; import com.tobiasdiez.easybind.EasyBind; import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer; +import jakarta.inject.Inject; public class SharedDatabaseLoginDialogView extends BaseDialog { diff --git a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java index 5040015fa3d..db9e074a596 100644 --- a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java +++ b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java @@ -5,8 +5,6 @@ import java.util.StringJoiner; import java.util.function.Consumer; -import javax.inject.Inject; - import javafx.beans.binding.Bindings; import javafx.beans.property.SimpleStringProperty; import javafx.fxml.FXML; @@ -35,6 +33,7 @@ import org.jabref.preferences.PreferencesService; import com.airhacks.afterburner.views.ViewLoader; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/jabref/gui/texparser/ParseLatexDialogView.java b/src/main/java/org/jabref/gui/texparser/ParseLatexDialogView.java index ce8dfd215f1..6f95e828754 100644 --- a/src/main/java/org/jabref/gui/texparser/ParseLatexDialogView.java +++ b/src/main/java/org/jabref/gui/texparser/ParseLatexDialogView.java @@ -1,7 +1,5 @@ package org.jabref.gui.texparser; -import javax.inject.Inject; - import javafx.beans.binding.Bindings; import javafx.fxml.FXML; import javafx.scene.control.Button; @@ -28,6 +26,7 @@ import com.airhacks.afterburner.views.ViewLoader; import com.tobiasdiez.easybind.EasyBind; import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer; +import jakarta.inject.Inject; import org.controlsfx.control.CheckTreeView; public class ParseLatexDialogView extends BaseDialog { diff --git a/src/main/java/org/jabref/gui/texparser/ParseLatexResultView.java b/src/main/java/org/jabref/gui/texparser/ParseLatexResultView.java index 6a56fbcfe47..7fc00e8b7eb 100644 --- a/src/main/java/org/jabref/gui/texparser/ParseLatexResultView.java +++ b/src/main/java/org/jabref/gui/texparser/ParseLatexResultView.java @@ -2,8 +2,6 @@ import java.nio.file.Path; -import javax.inject.Inject; - import javafx.fxml.FXML; import javafx.scene.control.Button; import javafx.scene.control.ButtonType; @@ -20,6 +18,7 @@ import com.airhacks.afterburner.views.ViewLoader; import com.tobiasdiez.easybind.EasyBind; +import jakarta.inject.Inject; public class ParseLatexResultView extends BaseDialog {