From 5e5b72bd54c4a201f7b8bbf33750a3776fa31ac4 Mon Sep 17 00:00:00 2001 From: Christoph Date: Fri, 23 Sep 2022 22:48:03 +0200 Subject: [PATCH] Update afterburner to jakarta (#9168) --- build.gradle | 2 +- lib/afterburner.fx.jar | Bin 18245 -> 17998 bytes .../java/org/jabref/gui/EntryTypeView.java | 3 +-- .../jabref/gui/auximport/FromAuxDialog.java | 3 +-- .../bibtexextractor/ExtractBibtexDialog.java | 2 +- .../collab/ExternalChangesResolverDialog.java | 2 +- .../CitationKeyPatternPanel.java | 3 +-- .../ContentSelectorDialogView.java | 3 +-- .../CustomizeEntryTypeDialogView.java | 3 +-- .../documentviewer/DocumentViewerView.java | 3 +-- .../jabref/gui/edit/ManageKeywordsDialog.java | 3 +-- .../jabref/gui/entryeditor/EntryEditor.java | 3 +-- .../FileAnnotationTabView.java | 3 +-- .../gui/errorconsole/ErrorConsoleView.java | 3 +-- .../CreateModifyExporterDialogView.java | 3 +-- .../UnlinkedFilesDialogView.java | 2 +- .../org/jabref/gui/help/AboutDialogView.java | 3 +-- .../ImportCustomEntryTypesDialog.java | 3 +-- .../gui/importer/ImportEntriesDialog.java | 2 +- .../gui/integrity/IntegrityCheckDialog.java | 3 +-- .../AbstractPropertiesTabView.java | 4 ++-- .../LibraryPropertiesView.java | 3 +-- .../constants/ConstantsPropertiesView.java | 3 +-- .../general/GeneralPropertiesView.java | 2 +- .../keypattern/KeyPatternPropertiesView.java | 3 +-- .../saving/SavingPropertiesView.java | 3 +-- .../linkedfile/LinkedFileEditDialogView.java | 3 +-- .../openoffice/ManageCitationsDialogView.java | 3 +-- .../gui/openoffice/StyleSelectDialogView.java | 3 +-- .../AbstractPreferenceTabView.java | 4 ++-- .../preferences/PreferencesDialogView.java | 3 +-- .../customexporter/CustomExporterTab.java | 3 +-- .../EditExternalFileTypeEntryDialog.java | 3 +-- .../journals/JournalAbbreviationsTab.java | 3 +-- .../keybindings/KeyBindingsTab.java | 3 +-- .../gui/preferences/preview/PreviewTab.java | 3 +-- .../protectedterms/ProtectedTermsTab.java | 3 +-- .../gui/search/GlobalSearchResultDialog.java | 2 +- .../shared/SharedDatabaseLoginDialogView.java | 3 +-- .../gui/slr/ManageStudyDefinitionView.java | 3 +-- .../gui/texparser/ParseLatexDialogView.java | 3 +-- .../gui/texparser/ParseLatexResultView.java | 3 +-- 42 files changed, 43 insertions(+), 75 deletions(-) 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 816b3e27f5d649d6b0c44d69c7a2578d0136a473..16e780b695b4a45ad34cf214fb8d58373ce63803 100644 GIT binary patch literal 17998 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 literal 18245 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 { 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 {