From ba4e6fc27ff92ad85cd47dc96abcd0c23ffa0ff4 Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Mon, 27 Jul 2020 17:29:06 +0200 Subject: [PATCH] Move OS to logic util to fix architecture test Fixes #6697 --- src/main/java/org/jabref/JabRefMain.java | 2 +- src/main/java/org/jabref/cli/ArgumentProcessor.java | 2 +- src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java | 2 +- src/main/java/org/jabref/gui/desktop/JabRefDesktop.java | 2 +- src/main/java/org/jabref/gui/edit/CopyMoreAction.java | 2 +- .../fileannotationtab/FileAnnotationTabViewModel.java | 2 +- .../org/jabref/gui/errorconsole/ErrorConsoleViewModel.java | 2 +- .../java/org/jabref/gui/errorconsole/LogEventViewModel.java | 2 +- .../java/org/jabref/gui/exporter/ExportToClipboardAction.java | 2 +- .../org/jabref/gui/fieldeditors/AbstractEditorViewModel.java | 2 +- .../org/jabref/gui/fieldeditors/TextInputControlBehavior.java | 2 +- .../java/org/jabref/gui/keyboard/KeyBindingRepository.java | 2 +- .../jabref/gui/openoffice/DetectOpenOfficeInstallation.java | 2 +- .../org/jabref/gui/openoffice/ManualConnectDialogView.java | 2 +- .../jabref/gui/openoffice/ManualConnectDialogViewModel.java | 2 +- src/main/java/org/jabref/gui/preview/CopyCitationAction.java | 2 +- .../java/org/jabref/gui/push/AbstractPushToApplication.java | 2 +- src/main/java/org/jabref/gui/push/PushToEmacs.java | 2 +- src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java | 2 +- .../java/org/jabref/logic/bibtex/FieldContentFormatter.java | 2 +- src/main/java/org/jabref/logic/bibtex/FieldWriter.java | 2 +- .../jabref/logic/citationstyle/CitationStyleOutputFormat.java | 2 +- .../java/org/jabref/logic/exporter/BibtexDatabaseWriter.java | 2 +- .../java/org/jabref/logic/exporter/MetaDataSerializer.java | 2 +- src/main/java/org/jabref/logic/importer/fetcher/CiteSeer.java | 2 +- .../java/org/jabref/logic/importer/fetcher/DOAJFetcher.java | 2 +- src/main/java/org/jabref/logic/importer/fetcher/IEEE.java | 2 +- .../java/org/jabref/logic/importer/fetcher/MathSciNet.java | 2 +- .../org/jabref/logic/importer/fetcher/SpringerFetcher.java | 2 +- .../java/org/jabref/logic/importer/fileformat/CoinsParser.java | 2 +- .../jabref/logic/importer/fileformat/MedlinePlainImporter.java | 2 +- .../jabref/logic/importer/fileformat/PdfContentImporter.java | 2 +- .../java/org/jabref/logic/importer/fileformat/RisImporter.java | 2 +- src/main/java/org/jabref/logic/layout/format/RisAuthors.java | 2 +- src/main/java/org/jabref/logic/layout/format/RisKeywords.java | 2 +- .../java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java | 2 +- .../org/jabref/logic/protectedterms/ProtectedTermsList.java | 2 +- .../org/jabref/model/cleanup/NormalizeNewlinesFormatter.java | 2 +- src/main/java/org/jabref/{logic => model}/util/OS.java | 3 ++- src/main/java/org/jabref/preferences/JabRefPreferences.java | 2 +- ...ageJournalAbbreviationsViewModelMixedAbbreviationsTest.java | 2 +- ...bbreviationsViewModelNoShortestUniqueAbbreviationsTest.java | 2 +- ...reviationsViewModelWithShortestUniqueAbbreviationsTest.java | 2 +- .../jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java | 2 +- .../java/org/jabref/gui/preview/CopyCitationActionTest.java | 2 +- src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java | 2 +- .../org/jabref/logic/bibtex/FieldContentFormatterTest.java | 2 +- src/test/java/org/jabref/logic/bibtex/FieldWriterTests.java | 2 +- .../org/jabref/logic/exporter/BibtexDatabaseWriterTest.java | 2 +- .../java/org/jabref/logic/exporter/MetaDataSerializerTest.java | 2 +- .../org/jabref/logic/importer/fileformat/BibtexParserTest.java | 2 +- .../java/org/jabref/logic/layout/format/RisKeywordsTest.java | 2 +- src/test/java/org/jabref/logic/remote/RemoteSetupTest.java | 2 +- 53 files changed, 54 insertions(+), 53 deletions(-) rename src/main/java/org/jabref/{logic => model}/util/OS.java (96%) diff --git a/src/main/java/org/jabref/JabRefMain.java b/src/main/java/org/jabref/JabRefMain.java index e004d0e1627..ed2b480a8a0 100644 --- a/src/main/java/org/jabref/JabRefMain.java +++ b/src/main/java/org/jabref/JabRefMain.java @@ -21,9 +21,9 @@ import org.jabref.logic.remote.client.RemoteClient; import org.jabref.logic.util.BuildInfo; import org.jabref.logic.util.JavaVersion; -import org.jabref.logic.util.OS; import org.jabref.migrations.PreferencesMigrations; import org.jabref.model.database.BibDatabaseMode; +import org.jabref.model.util.OS; import org.jabref.preferences.JabRefPreferences; import org.apache.commons.cli.ParseException; diff --git a/src/main/java/org/jabref/cli/ArgumentProcessor.java b/src/main/java/org/jabref/cli/ArgumentProcessor.java index a5d723cfcdb..bfa500974e5 100644 --- a/src/main/java/org/jabref/cli/ArgumentProcessor.java +++ b/src/main/java/org/jabref/cli/ArgumentProcessor.java @@ -41,13 +41,13 @@ import org.jabref.logic.search.DatabaseSearcher; import org.jabref.logic.search.SearchQuery; import org.jabref.logic.shared.prefs.SharedDatabasePreferences; -import org.jabref.logic.util.OS; import org.jabref.logic.xmp.XmpPreferences; import org.jabref.model.database.BibDatabase; import org.jabref.model.database.BibDatabaseContext; import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.entry.BibEntry; import org.jabref.model.strings.StringUtil; +import org.jabref.model.util.OS; import org.jabref.preferences.SearchPreferences; import com.google.common.base.Throwables; diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java index a9cf049c565..e2a01f79969 100644 --- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java +++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java @@ -16,11 +16,11 @@ import org.jabref.Globals; import org.jabref.logic.l10n.Localization; -import org.jabref.logic.util.OS; import org.jabref.logic.util.io.FileUtil; import org.jabref.model.database.BibDatabaseContext; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.LinkedFile; +import org.jabref.model.util.OS; import org.jabref.model.util.OptionalUtil; import org.slf4j.Logger; diff --git a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java b/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java index fee12ffa38e..7d85a811ea6 100644 --- a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java +++ b/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java @@ -20,13 +20,13 @@ import org.jabref.gui.externalfiletype.ExternalFileType; import org.jabref.gui.externalfiletype.ExternalFileTypes; import org.jabref.logic.l10n.Localization; -import org.jabref.logic.util.OS; import org.jabref.model.database.BibDatabaseContext; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.identifier.DOI; import org.jabref.model.entry.identifier.Eprint; import org.jabref.model.util.FileHelper; +import org.jabref.model.util.OS; import org.jabref.preferences.JabRefPreferences; import org.slf4j.Logger; diff --git a/src/main/java/org/jabref/gui/edit/CopyMoreAction.java b/src/main/java/org/jabref/gui/edit/CopyMoreAction.java index 5f982b01da3..1b93b75e3c0 100644 --- a/src/main/java/org/jabref/gui/edit/CopyMoreAction.java +++ b/src/main/java/org/jabref/gui/edit/CopyMoreAction.java @@ -17,9 +17,9 @@ import org.jabref.logic.l10n.Localization; import org.jabref.logic.layout.Layout; import org.jabref.logic.layout.LayoutHelper; -import org.jabref.logic.util.OS; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.util.OS; import org.jabref.preferences.JabRefPreferences; import org.jabref.preferences.PreferencesService; diff --git a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabViewModel.java b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabViewModel.java index 5ae41bd4c24..18a15e0f85e 100644 --- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabViewModel.java +++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabViewModel.java @@ -21,11 +21,11 @@ import org.jabref.gui.util.DefaultTaskExecutor; import org.jabref.logic.l10n.Localization; import org.jabref.logic.pdf.FileAnnotationCache; -import org.jabref.logic.util.OS; import org.jabref.model.entry.BibEntry; import org.jabref.model.pdf.FileAnnotation; import org.jabref.model.util.FileUpdateListener; import org.jabref.model.util.FileUpdateMonitor; +import org.jabref.model.util.OS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java index 4ba3b30eccf..d229be7e314 100644 --- a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java +++ b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java @@ -20,7 +20,7 @@ import org.jabref.logic.l10n.Localization; import org.jabref.logic.logging.LogMessages; import org.jabref.logic.util.BuildInfo; -import org.jabref.logic.util.OS; +import org.jabref.model.util.OS; import com.tobiasdiez.easybind.EasyBind; import org.apache.http.client.utils.URIBuilder; diff --git a/src/main/java/org/jabref/gui/errorconsole/LogEventViewModel.java b/src/main/java/org/jabref/gui/errorconsole/LogEventViewModel.java index 5edc148a72a..9e1028603f1 100644 --- a/src/main/java/org/jabref/gui/errorconsole/LogEventViewModel.java +++ b/src/main/java/org/jabref/gui/errorconsole/LogEventViewModel.java @@ -5,7 +5,7 @@ import org.jabref.gui.icon.IconTheme; import org.jabref.gui.icon.JabRefIcon; -import org.jabref.logic.util.OS; +import org.jabref.model.util.OS; import com.google.common.base.Throwables; import org.apache.logging.log4j.core.LogEvent; diff --git a/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java b/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java index 02ade4ac4bc..263cc6b4850 100644 --- a/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java +++ b/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java @@ -25,9 +25,9 @@ import org.jabref.logic.exporter.ExporterFactory; import org.jabref.logic.l10n.Localization; import org.jabref.logic.util.FileType; -import org.jabref.logic.util.OS; import org.jabref.logic.util.StandardFileType; import org.jabref.model.entry.BibEntry; +import org.jabref.model.util.OS; import org.jabref.preferences.JabRefPreferences; import org.slf4j.Logger; diff --git a/src/main/java/org/jabref/gui/fieldeditors/AbstractEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/AbstractEditorViewModel.java index 064b8808bdf..ba9fea0995f 100644 --- a/src/main/java/org/jabref/gui/fieldeditors/AbstractEditorViewModel.java +++ b/src/main/java/org/jabref/gui/fieldeditors/AbstractEditorViewModel.java @@ -14,9 +14,9 @@ import org.jabref.gui.util.BindingsHelper; import org.jabref.logic.integrity.FieldCheckers; import org.jabref.logic.integrity.ValueChecker; -import org.jabref.logic.util.OS; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.field.Field; +import org.jabref.model.util.OS; import com.tobiasdiez.easybind.EasyObservableValue; import de.saxsys.mvvmfx.utils.validation.CompositeValidator; diff --git a/src/main/java/org/jabref/gui/fieldeditors/TextInputControlBehavior.java b/src/main/java/org/jabref/gui/fieldeditors/TextInputControlBehavior.java index bbe745e8de9..482310f0e7a 100644 --- a/src/main/java/org/jabref/gui/fieldeditors/TextInputControlBehavior.java +++ b/src/main/java/org/jabref/gui/fieldeditors/TextInputControlBehavior.java @@ -23,7 +23,7 @@ import javafx.stage.Window; import org.jabref.logic.l10n.Localization; -import org.jabref.logic.util.OS; +import org.jabref.model.util.OS; import com.sun.javafx.scene.control.Properties; diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java b/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java index de219527ed5..1a12d85bea6 100644 --- a/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java +++ b/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java @@ -14,7 +14,7 @@ import javafx.scene.input.KeyCombination; import javafx.scene.input.KeyEvent; -import org.jabref.logic.util.OS; +import org.jabref.model.util.OS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java b/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java index 9a13cd160bc..ba30efc1e46 100644 --- a/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java +++ b/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java @@ -12,9 +12,9 @@ import org.jabref.logic.l10n.Localization; import org.jabref.logic.openoffice.OpenOfficeFileSearch; import org.jabref.logic.openoffice.OpenOfficePreferences; -import org.jabref.logic.util.OS; import org.jabref.logic.util.io.FileUtil; import org.jabref.model.strings.StringUtil; +import org.jabref.model.util.OS; import org.jabref.preferences.JabRefPreferences; /** diff --git a/src/main/java/org/jabref/gui/openoffice/ManualConnectDialogView.java b/src/main/java/org/jabref/gui/openoffice/ManualConnectDialogView.java index 5e7a2e7649a..a68922a642b 100644 --- a/src/main/java/org/jabref/gui/openoffice/ManualConnectDialogView.java +++ b/src/main/java/org/jabref/gui/openoffice/ManualConnectDialogView.java @@ -12,7 +12,7 @@ import org.jabref.gui.DialogService; import org.jabref.gui.util.BaseDialog; import org.jabref.logic.l10n.Localization; -import org.jabref.logic.util.OS; +import org.jabref.model.util.OS; import org.jabref.preferences.PreferencesService; import com.airhacks.afterburner.views.ViewLoader; diff --git a/src/main/java/org/jabref/gui/openoffice/ManualConnectDialogViewModel.java b/src/main/java/org/jabref/gui/openoffice/ManualConnectDialogViewModel.java index 9789b717978..0c808961795 100644 --- a/src/main/java/org/jabref/gui/openoffice/ManualConnectDialogViewModel.java +++ b/src/main/java/org/jabref/gui/openoffice/ManualConnectDialogViewModel.java @@ -9,7 +9,7 @@ import org.jabref.gui.util.DirectoryDialogConfiguration; import org.jabref.gui.util.FileDialogConfiguration; import org.jabref.logic.openoffice.OpenOfficePreferences; -import org.jabref.logic.util.OS; +import org.jabref.model.util.OS; import org.jabref.preferences.PreferencesService; public class ManualConnectDialogViewModel { diff --git a/src/main/java/org/jabref/gui/preview/CopyCitationAction.java b/src/main/java/org/jabref/gui/preview/CopyCitationAction.java index 2ccbae9798e..c78ccbb66de 100644 --- a/src/main/java/org/jabref/gui/preview/CopyCitationAction.java +++ b/src/main/java/org/jabref/gui/preview/CopyCitationAction.java @@ -23,8 +23,8 @@ import org.jabref.logic.layout.LayoutFormatterPreferences; import org.jabref.logic.layout.LayoutHelper; import org.jabref.logic.preview.PreviewLayout; -import org.jabref.logic.util.OS; import org.jabref.model.entry.BibEntry; +import org.jabref.model.util.OS; import org.jabref.preferences.PreviewPreferences; import org.slf4j.Logger; diff --git a/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java b/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java index a8fe0b7c52c..a82e21441ae 100644 --- a/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java +++ b/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java @@ -6,9 +6,9 @@ import org.jabref.Globals; import org.jabref.gui.DialogService; import org.jabref.logic.l10n.Localization; -import org.jabref.logic.util.OS; import org.jabref.model.database.BibDatabaseContext; import org.jabref.model.entry.BibEntry; +import org.jabref.model.util.OS; import org.jabref.preferences.JabRefPreferences; import org.slf4j.Logger; diff --git a/src/main/java/org/jabref/gui/push/PushToEmacs.java b/src/main/java/org/jabref/gui/push/PushToEmacs.java index 42527f17c5c..f941a67fa5d 100644 --- a/src/main/java/org/jabref/gui/push/PushToEmacs.java +++ b/src/main/java/org/jabref/gui/push/PushToEmacs.java @@ -10,9 +10,9 @@ import org.jabref.gui.icon.IconTheme; import org.jabref.gui.icon.JabRefIcon; import org.jabref.logic.l10n.Localization; -import org.jabref.logic.util.OS; import org.jabref.model.database.BibDatabaseContext; import org.jabref.model.entry.BibEntry; +import org.jabref.model.util.OS; import org.jabref.preferences.JabRefPreferences; import org.slf4j.Logger; diff --git a/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java b/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java index e145883a24f..f29f10f2e99 100644 --- a/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java +++ b/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java @@ -13,7 +13,6 @@ import java.util.stream.Collectors; import org.jabref.logic.TypedBibEntry; -import org.jabref.logic.util.OS; import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.BibEntryType; @@ -23,6 +22,7 @@ import org.jabref.model.entry.field.InternalField; import org.jabref.model.entry.field.OrFields; import org.jabref.model.strings.StringUtil; +import org.jabref.model.util.OS; public class BibEntryWriter { diff --git a/src/main/java/org/jabref/logic/bibtex/FieldContentFormatter.java b/src/main/java/org/jabref/logic/bibtex/FieldContentFormatter.java index f6b55bfc2d5..6224d14a733 100644 --- a/src/main/java/org/jabref/logic/bibtex/FieldContentFormatter.java +++ b/src/main/java/org/jabref/logic/bibtex/FieldContentFormatter.java @@ -5,10 +5,10 @@ import java.util.Set; import java.util.regex.Pattern; -import org.jabref.logic.util.OS; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.StandardField; import org.jabref.model.strings.StringUtil; +import org.jabref.model.util.OS; /** * This class provides the reformatting needed when reading BibTeX fields formatted diff --git a/src/main/java/org/jabref/logic/bibtex/FieldWriter.java b/src/main/java/org/jabref/logic/bibtex/FieldWriter.java index 4e826ccd5dc..f52053ee213 100644 --- a/src/main/java/org/jabref/logic/bibtex/FieldWriter.java +++ b/src/main/java/org/jabref/logic/bibtex/FieldWriter.java @@ -1,10 +1,10 @@ package org.jabref.logic.bibtex; -import org.jabref.logic.util.OS; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.InternalField; import org.jabref.model.entry.field.StandardField; import org.jabref.model.strings.StringUtil; +import org.jabref.model.util.OS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/jabref/logic/citationstyle/CitationStyleOutputFormat.java b/src/main/java/org/jabref/logic/citationstyle/CitationStyleOutputFormat.java index 9596bb140f5..bbc9b8e06eb 100644 --- a/src/main/java/org/jabref/logic/citationstyle/CitationStyleOutputFormat.java +++ b/src/main/java/org/jabref/logic/citationstyle/CitationStyleOutputFormat.java @@ -1,6 +1,6 @@ package org.jabref.logic.citationstyle; -import org.jabref.logic.util.OS; +import org.jabref.model.util.OS; public enum CitationStyleOutputFormat { diff --git a/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java b/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java index e120cf44327..66cbaff7871 100644 --- a/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java +++ b/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java @@ -8,7 +8,6 @@ import org.jabref.logic.bibtex.BibEntryWriter; import org.jabref.logic.bibtex.FieldWriter; import org.jabref.logic.bibtex.InvalidFieldValueException; -import org.jabref.logic.util.OS; import org.jabref.model.database.BibDatabaseContext; import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.entry.BibEntry; @@ -18,6 +17,7 @@ import org.jabref.model.entry.field.InternalField; import org.jabref.model.metadata.MetaData; import org.jabref.model.strings.StringUtil; +import org.jabref.model.util.OS; public class BibtexDatabaseWriter extends BibDatabaseWriter { diff --git a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java b/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java index befd11f3648..b133780ee99 100644 --- a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java +++ b/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java @@ -7,7 +7,6 @@ import java.util.Map; import java.util.TreeMap; -import org.jabref.logic.util.OS; import org.jabref.model.bibtexkeypattern.AbstractCitationKeyPattern; import org.jabref.model.bibtexkeypattern.GlobalCitationKeyPattern; import org.jabref.model.cleanup.FieldFormatterCleanups; @@ -16,6 +15,7 @@ import org.jabref.model.metadata.ContentSelector; import org.jabref.model.metadata.MetaData; import org.jabref.model.strings.StringUtil; +import org.jabref.model.util.OS; public class MetaDataSerializer { diff --git a/src/main/java/org/jabref/logic/importer/fetcher/CiteSeer.java b/src/main/java/org/jabref/logic/importer/fetcher/CiteSeer.java index 9586fb6c519..1d150eaf464 100644 --- a/src/main/java/org/jabref/logic/importer/fetcher/CiteSeer.java +++ b/src/main/java/org/jabref/logic/importer/fetcher/CiteSeer.java @@ -19,12 +19,12 @@ import org.jabref.logic.importer.Parser; import org.jabref.logic.importer.SearchBasedParserFetcher; import org.jabref.logic.importer.fileformat.CoinsParser; -import org.jabref.logic.util.OS; import org.jabref.model.cleanup.FieldFormatterCleanup; import org.jabref.model.cleanup.Formatter; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.field.InternalField; import org.jabref.model.entry.field.StandardField; +import org.jabref.model.util.OS; import org.apache.http.client.utils.URIBuilder; diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DOAJFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/DOAJFetcher.java index 39146f3f120..4ab8db4a524 100644 --- a/src/main/java/org/jabref/logic/importer/fetcher/DOAJFetcher.java +++ b/src/main/java/org/jabref/logic/importer/fetcher/DOAJFetcher.java @@ -16,12 +16,12 @@ import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.logic.importer.Parser; import org.jabref.logic.importer.SearchBasedParserFetcher; -import org.jabref.logic.util.OS; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.types.StandardEntryType; import org.jabref.model.strings.StringUtil; +import org.jabref.model.util.OS; import kong.unirest.json.JSONArray; import kong.unirest.json.JSONObject; diff --git a/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java b/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java index 92074712488..8612c91238f 100644 --- a/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java +++ b/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java @@ -22,12 +22,12 @@ import org.jabref.logic.importer.SearchBasedParserFetcher; import org.jabref.logic.net.URLDownload; import org.jabref.logic.util.BuildInfo; -import org.jabref.logic.util.OS; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.LinkedFile; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.identifier.DOI; import org.jabref.model.entry.types.StandardEntryType; +import org.jabref.model.util.OS; import kong.unirest.json.JSONArray; import kong.unirest.json.JSONObject; diff --git a/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java b/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java index f8085c6afe9..f93e0eb72fa 100644 --- a/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java +++ b/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java @@ -23,12 +23,12 @@ import org.jabref.logic.importer.Parser; import org.jabref.logic.importer.SearchBasedParserFetcher; import org.jabref.logic.importer.fileformat.BibtexParser; -import org.jabref.logic.util.OS; import org.jabref.model.cleanup.FieldFormatterCleanup; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; import org.jabref.model.util.DummyFileUpdateMonitor; +import org.jabref.model.util.OS; import org.apache.http.client.utils.URIBuilder; diff --git a/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java index d27ec8998e7..e8952f6cf6e 100644 --- a/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java +++ b/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java @@ -15,13 +15,13 @@ import org.jabref.logic.importer.Parser; import org.jabref.logic.importer.SearchBasedParserFetcher; import org.jabref.logic.util.BuildInfo; -import org.jabref.logic.util.OS; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.LinkedFile; import org.jabref.model.entry.Month; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.types.StandardEntryType; +import org.jabref.model.util.OS; import kong.unirest.json.JSONArray; import kong.unirest.json.JSONObject; diff --git a/src/main/java/org/jabref/logic/importer/fileformat/CoinsParser.java b/src/main/java/org/jabref/logic/importer/fileformat/CoinsParser.java index 9763529fb85..7cb602b14d3 100644 --- a/src/main/java/org/jabref/logic/importer/fileformat/CoinsParser.java +++ b/src/main/java/org/jabref/logic/importer/fileformat/CoinsParser.java @@ -12,11 +12,11 @@ import org.jabref.logic.importer.ParseException; import org.jabref.logic.importer.Parser; -import org.jabref.logic.util.OS; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.field.Field; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.types.StandardEntryType; +import org.jabref.model.util.OS; /** * @implNote implemented by reverse-engineering the implementation by CiteSeerX diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java index e71032b6cda..e2cff7a385b 100644 --- a/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java +++ b/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java @@ -11,7 +11,6 @@ import org.jabref.logic.importer.Importer; import org.jabref.logic.importer.ParserResult; -import org.jabref.logic.util.OS; import org.jabref.logic.util.StandardFileType; import org.jabref.model.entry.AuthorList; import org.jabref.model.entry.BibEntry; @@ -20,6 +19,7 @@ import org.jabref.model.entry.field.UnknownField; import org.jabref.model.entry.types.EntryType; import org.jabref.model.entry.types.StandardEntryType; +import org.jabref.model.util.OS; /** * Importer for the MEDLINE Plain format. diff --git a/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java index baf91641ef8..5711137b130 100644 --- a/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java +++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java @@ -18,7 +18,6 @@ import org.jabref.logic.importer.ParserResult; import org.jabref.logic.importer.fetcher.DoiFetcher; import org.jabref.logic.l10n.Localization; -import org.jabref.logic.util.OS; import org.jabref.logic.util.StandardFileType; import org.jabref.logic.xmp.EncryptedPdfsNotSupportedException; import org.jabref.logic.xmp.XmpUtilReader; @@ -29,6 +28,7 @@ import org.jabref.model.entry.types.EntryType; import org.jabref.model.entry.types.StandardEntryType; import org.jabref.model.strings.StringUtil; +import org.jabref.model.util.OS; import com.google.common.base.Strings; import org.apache.pdfbox.pdmodel.PDDocument; diff --git a/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java index 015dc378bfe..861bee9ace5 100644 --- a/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java +++ b/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java @@ -15,7 +15,6 @@ import org.jabref.logic.importer.Importer; import org.jabref.logic.importer.ParserResult; -import org.jabref.logic.util.OS; import org.jabref.logic.util.StandardFileType; import org.jabref.model.entry.AuthorList; import org.jabref.model.entry.BibEntry; @@ -27,6 +26,7 @@ import org.jabref.model.entry.types.EntryType; import org.jabref.model.entry.types.IEEETranEntryType; import org.jabref.model.entry.types.StandardEntryType; +import org.jabref.model.util.OS; public class RisImporter extends Importer { diff --git a/src/main/java/org/jabref/logic/layout/format/RisAuthors.java b/src/main/java/org/jabref/logic/layout/format/RisAuthors.java index b1f9439dc11..4c0aed42af9 100644 --- a/src/main/java/org/jabref/logic/layout/format/RisAuthors.java +++ b/src/main/java/org/jabref/logic/layout/format/RisAuthors.java @@ -1,8 +1,8 @@ package org.jabref.logic.layout.format; import org.jabref.logic.layout.ParamLayoutFormatter; -import org.jabref.logic.util.OS; import org.jabref.model.entry.AuthorList; +import org.jabref.model.util.OS; public class RisAuthors implements ParamLayoutFormatter { diff --git a/src/main/java/org/jabref/logic/layout/format/RisKeywords.java b/src/main/java/org/jabref/logic/layout/format/RisKeywords.java index e3f38f18c4c..53629cbd02f 100644 --- a/src/main/java/org/jabref/logic/layout/format/RisKeywords.java +++ b/src/main/java/org/jabref/logic/layout/format/RisKeywords.java @@ -1,9 +1,9 @@ package org.jabref.logic.layout.format; import org.jabref.logic.layout.LayoutFormatter; -import org.jabref.logic.util.OS; import org.jabref.model.entry.Keyword; import org.jabref.model.entry.KeywordList; +import org.jabref.model.util.OS; public class RisKeywords implements LayoutFormatter { diff --git a/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java b/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java index e9369087c4a..a8137f77155 100644 --- a/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java +++ b/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java @@ -9,8 +9,8 @@ import java.util.Locale; import java.util.stream.Collectors; -import org.jabref.logic.util.OS; import org.jabref.logic.util.io.FileUtil; +import org.jabref.model.util.OS; public class OpenOfficeFileSearch { /** diff --git a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java index 4b4c09347e5..1e6c99389f1 100644 --- a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java +++ b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Objects; -import org.jabref.logic.util.OS; +import org.jabref.model.util.OS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/jabref/model/cleanup/NormalizeNewlinesFormatter.java b/src/main/java/org/jabref/model/cleanup/NormalizeNewlinesFormatter.java index 80c620fcd4e..e877dc33366 100644 --- a/src/main/java/org/jabref/model/cleanup/NormalizeNewlinesFormatter.java +++ b/src/main/java/org/jabref/model/cleanup/NormalizeNewlinesFormatter.java @@ -3,7 +3,7 @@ import java.util.Objects; import org.jabref.logic.l10n.Localization; -import org.jabref.logic.util.OS; +import org.jabref.model.util.OS; /** * Trim all whitespace characters (defined in java) in the string. diff --git a/src/main/java/org/jabref/logic/util/OS.java b/src/main/java/org/jabref/model/util/OS.java similarity index 96% rename from src/main/java/org/jabref/logic/util/OS.java rename to src/main/java/org/jabref/model/util/OS.java index 2f97a16de20..e925371ffd1 100644 --- a/src/main/java/org/jabref/logic/util/OS.java +++ b/src/main/java/org/jabref/model/util/OS.java @@ -1,4 +1,4 @@ -package org.jabref.logic.util; +package org.jabref.model.util; import java.util.Locale; @@ -6,6 +6,7 @@ * Operating system (OS) detection */ public class OS { + // File separator obtained from system public static final String FILE_SEPARATOR = System.getProperty("file.separator"); diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java index b01505755b6..9cc443ad0f5 100644 --- a/src/main/java/org/jabref/preferences/JabRefPreferences.java +++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java @@ -88,7 +88,6 @@ import org.jabref.logic.protectedterms.ProtectedTermsPreferences; import org.jabref.logic.remote.RemotePreferences; import org.jabref.logic.shared.prefs.SharedDatabasePreferences; -import org.jabref.logic.util.OS; import org.jabref.logic.util.Version; import org.jabref.logic.util.io.AutoLinkPreferences; import org.jabref.logic.util.io.FileHistory; @@ -107,6 +106,7 @@ import org.jabref.model.metadata.FilePreferences; import org.jabref.model.metadata.SaveOrderConfig; import org.jabref.model.strings.StringUtil; +import org.jabref.model.util.OS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelMixedAbbreviationsTest.java b/src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelMixedAbbreviationsTest.java index 8834b1b3c56..bf310733cc8 100644 --- a/src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelMixedAbbreviationsTest.java +++ b/src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelMixedAbbreviationsTest.java @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import static org.jabref.logic.util.OS.NEWLINE; +import static org.jabref.model.util.OS.NEWLINE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelNoShortestUniqueAbbreviationsTest.java b/src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelNoShortestUniqueAbbreviationsTest.java index 22705f86720..d825589e81e 100644 --- a/src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelNoShortestUniqueAbbreviationsTest.java +++ b/src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelNoShortestUniqueAbbreviationsTest.java @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import static org.jabref.logic.util.OS.NEWLINE; +import static org.jabref.model.util.OS.NEWLINE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelWithShortestUniqueAbbreviationsTest.java b/src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelWithShortestUniqueAbbreviationsTest.java index 50b3810c54d..989e52608d4 100644 --- a/src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelWithShortestUniqueAbbreviationsTest.java +++ b/src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelWithShortestUniqueAbbreviationsTest.java @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import static org.jabref.logic.util.OS.NEWLINE; +import static org.jabref.model.util.OS.NEWLINE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/src/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java b/src/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java index 748a6554157..c33e6e5a4bd 100644 --- a/src/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java +++ b/src/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java @@ -7,7 +7,7 @@ import javafx.scene.input.KeyEvent; import org.jabref.gui.DialogService; -import org.jabref.logic.util.OS; +import org.jabref.model.util.OS; import org.jabref.preferences.PreferencesService; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/org/jabref/gui/preview/CopyCitationActionTest.java b/src/test/java/org/jabref/gui/preview/CopyCitationActionTest.java index 7dec89193c5..ca862addca3 100644 --- a/src/test/java/org/jabref/gui/preview/CopyCitationActionTest.java +++ b/src/test/java/org/jabref/gui/preview/CopyCitationActionTest.java @@ -5,7 +5,7 @@ import javafx.scene.input.ClipboardContent; import org.jabref.gui.ClipBoardManager; -import org.jabref.logic.util.OS; +import org.jabref.model.util.OS; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java b/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java index 5f402dc9b87..689d79c0c55 100644 --- a/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java +++ b/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java @@ -9,7 +9,6 @@ import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.logic.importer.ParserResult; import org.jabref.logic.importer.fileformat.BibtexParser; -import org.jabref.logic.util.OS; import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.BibEntryTypesManager; @@ -20,6 +19,7 @@ import org.jabref.model.entry.types.UnknownEntryType; import org.jabref.model.util.DummyFileUpdateMonitor; import org.jabref.model.util.FileUpdateMonitor; +import org.jabref.model.util.OS; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; diff --git a/src/test/java/org/jabref/logic/bibtex/FieldContentFormatterTest.java b/src/test/java/org/jabref/logic/bibtex/FieldContentFormatterTest.java index cf0402421bd..73ab0f83fe0 100644 --- a/src/test/java/org/jabref/logic/bibtex/FieldContentFormatterTest.java +++ b/src/test/java/org/jabref/logic/bibtex/FieldContentFormatterTest.java @@ -2,9 +2,9 @@ import java.util.Collections; -import org.jabref.logic.util.OS; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.util.OS; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/jabref/logic/bibtex/FieldWriterTests.java b/src/test/java/org/jabref/logic/bibtex/FieldWriterTests.java index 9480c8c500b..5a6334cf7da 100644 --- a/src/test/java/org/jabref/logic/bibtex/FieldWriterTests.java +++ b/src/test/java/org/jabref/logic/bibtex/FieldWriterTests.java @@ -2,9 +2,9 @@ import java.util.Collections; -import org.jabref.logic.util.OS; import org.jabref.model.entry.field.StandardField; import org.jabref.model.entry.field.UnknownField; +import org.jabref.model.util.OS; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java index 1e63213a582..ba7a3994af5 100644 --- a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java +++ b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java @@ -18,7 +18,6 @@ import org.jabref.logic.importer.Importer; import org.jabref.logic.importer.ParserResult; import org.jabref.logic.importer.fileformat.BibtexParser; -import org.jabref.logic.util.OS; import org.jabref.model.bibtexkeypattern.AbstractCitationKeyPattern; import org.jabref.model.bibtexkeypattern.DatabaseCitationKeyPattern; import org.jabref.model.bibtexkeypattern.GlobalCitationKeyPattern; @@ -46,6 +45,7 @@ import org.jabref.model.metadata.SaveOrderConfig; import org.jabref.model.util.DummyFileUpdateMonitor; import org.jabref.model.util.FileUpdateMonitor; +import org.jabref.model.util.OS; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java b/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java index 51200ddc429..bb94328d292 100644 --- a/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java +++ b/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java @@ -7,13 +7,13 @@ import java.util.TreeMap; import org.jabref.logic.formatter.casechanger.LowerCaseFormatter; -import org.jabref.logic.util.OS; import org.jabref.model.bibtexkeypattern.GlobalCitationKeyPattern; import org.jabref.model.cleanup.FieldFormatterCleanup; import org.jabref.model.cleanup.FieldFormatterCleanups; import org.jabref.model.entry.field.StandardField; import org.jabref.model.metadata.ContentSelector; import org.jabref.model.metadata.MetaData; +import org.jabref.model.util.OS; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java index d988b03bce4..eb1ddb09553 100644 --- a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java +++ b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java @@ -16,7 +16,6 @@ import org.jabref.logic.importer.ImportFormatPreferences; import org.jabref.logic.importer.ParseException; import org.jabref.logic.importer.ParserResult; -import org.jabref.logic.util.OS; import org.jabref.model.bibtexkeypattern.AbstractCitationKeyPattern; import org.jabref.model.bibtexkeypattern.DatabaseCitationKeyPattern; import org.jabref.model.bibtexkeypattern.GlobalCitationKeyPattern; @@ -46,6 +45,7 @@ import org.jabref.model.metadata.SaveOrderConfig; import org.jabref.model.util.DummyFileUpdateMonitor; import org.jabref.model.util.FileUpdateMonitor; +import org.jabref.model.util.OS; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/jabref/logic/layout/format/RisKeywordsTest.java b/src/test/java/org/jabref/logic/layout/format/RisKeywordsTest.java index 863683620fa..eef72829513 100644 --- a/src/test/java/org/jabref/logic/layout/format/RisKeywordsTest.java +++ b/src/test/java/org/jabref/logic/layout/format/RisKeywordsTest.java @@ -1,6 +1,6 @@ package org.jabref.logic.layout.format; -import org.jabref.logic.util.OS; +import org.jabref.model.util.OS; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/jabref/logic/remote/RemoteSetupTest.java b/src/test/java/org/jabref/logic/remote/RemoteSetupTest.java index 366f1a34334..0e92938ba35 100644 --- a/src/test/java/org/jabref/logic/remote/RemoteSetupTest.java +++ b/src/test/java/org/jabref/logic/remote/RemoteSetupTest.java @@ -9,7 +9,7 @@ import org.jabref.logic.remote.client.RemoteClient; import org.jabref.logic.remote.server.MessageHandler; import org.jabref.logic.remote.server.RemoteListenerServerLifecycle; -import org.jabref.logic.util.OS; +import org.jabref.model.util.OS; import org.jabref.support.DisabledOnCIServer; import org.junit.jupiter.api.BeforeEach;